Use uint32_t instead of long int for connection options.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 24f591a..c2df4cd 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -455,7 +455,7 @@ bool send_ack(connection_t *c) {
 
        get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
 
 
        get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
 

-       return send_request(c, "%d %s %d %lx", ACK, myport, c->estimated_weight, c->options);
+       return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, c->options);

 }
 
 static void send_everything(connection_t *c) {
 }
 
 static void send_everything(connection_t *c) {


@@ -494,10 +494,10 @@ bool ack_h(connection_t *c) {
        char hisport[MAX_STRING_SIZE];
        char *hisaddress, *dummy;
        int weight, mtu;
        char hisport[MAX_STRING_SIZE];
        char *hisaddress, *dummy;
        int weight, mtu;

-       long int options;
+       uint32_t options;

        node_t *n;
 
        node_t *n;
 

-       if(sscanf(c->buffer, "%*d " MAX_STRING " %d %lx", hisport, &weight, &options) != 3) {
+       if(sscanf(c->buffer, "%*d " MAX_STRING " %d %x", hisport, &weight, &options) != 3) {

                logger(LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
                           c->hostname);
                return false;
                logger(LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name,
                           c->hostname);
                return false;