Fix compiler warnings.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 4707dce..6988068 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -109,15 +109,13 @@ bool id_h(connection_t *c) {
 }
 
 bool send_metakey(connection_t *c) {
-       char *buffer;
-       int len;
        bool x;
 
-       len = RSA_size(c->rsa_key);
+       int len = RSA_size(c->rsa_key);
 
        /* Allocate buffers for the meta key */
 
-       buffer = alloca(2 * len + 1);
+       char buffer[2 * len + 1];
        
        c->outkey = xrealloc(c->outkey, len);
 
@@ -287,16 +285,13 @@ bool metakey_h(connection_t *c) {
 }
 
 bool send_challenge(connection_t *c) {
-       char *buffer;
-       int len;
-
        /* CHECKME: what is most reasonable value for len? */
 
-       len = RSA_size(c->rsa_key);
+       int len = RSA_size(c->rsa_key);
 
        /* Allocate buffers for the challenge */
 
-       buffer = alloca(2 * len + 1);
+       char buffer[2 * len + 1];
 
        c->hischallenge = xrealloc(c->hischallenge, len);
 
@@ -497,7 +492,7 @@ static void send_everything(connection_t *c) {
 
 bool ack_h(connection_t *c) {
        char hisport[MAX_STRING_SIZE];
-       char *hisaddress, *dummy;
+       char *hisaddress;
        int weight, mtu;
        uint32_t options;
        node_t *n;
@@ -539,7 +534,7 @@ bool ack_h(connection_t *c) {
        if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
                n->mtu = mtu;
 
-       if(get_config_int(lookup_config(myself->connection->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
+       if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu)
                n->mtu = mtu;
 
        if(get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice)) {
@@ -566,10 +561,9 @@ bool ack_h(connection_t *c) {
        c->edge = new_edge();
        c->edge->from = myself;
        c->edge->to = n;
-       sockaddr2str(&c->address, &hisaddress, &dummy);
+       sockaddr2str(&c->address, &hisaddress, NULL);
        c->edge->address = str2sockaddr(hisaddress, hisport);
        free(hisaddress);
-       free(dummy);
        c->edge->weight = (weight + c->estimated_weight) / 2;
        c->edge->connection = c;
        c->edge->options = c->options;
@@ -581,7 +575,7 @@ bool ack_h(connection_t *c) {
        if(tunnelserver)
                send_add_edge(c, c->edge);
        else
-               send_add_edge(broadcast, c->edge);
+               send_add_edge(everyone, c->edge);
 
        /* Run MST and SSSP algorithms */