Use xrealloc instead of if(ptr) ptr = xmalloc().

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index af8efd1..4816610 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -130,8 +130,7 @@ bool send_metakey(connection_t *c)
 
        buffer = alloca(2 * len + 1);
        
-       if(!c->outkey)
-               c->outkey = xmalloc(len);
+       c->outkey = xrealloc(c->outkey, len);
 
        if(!c->outctx)
                c->outctx = xmalloc_and_zero(sizeof(*c->outctx));
@@ -227,8 +226,7 @@ bool metakey_h(connection_t *c)
 
        /* Allocate buffers for the meta key */
 
-       if(!c->inkey)
-               c->inkey = xmalloc(len);
+       c->inkey = xrealloc(c->inkey, len);
 
        if(!c->inctx)
                c->inctx = xmalloc_and_zero(sizeof(*c->inctx));
@@ -317,8 +315,7 @@ bool send_challenge(connection_t *c)
 
        buffer = alloca(2 * len + 1);
 
-       if(!c->hischallenge)
-               c->hischallenge = xmalloc(len);
+       c->hischallenge = xrealloc(c->hischallenge, len);
 
        /* Copy random data to the buffer */
 
@@ -359,8 +356,7 @@ bool challenge_h(connection_t *c)
 
        /* Allocate buffers for the challenge */
 
-       if(!c->mychallenge)
-               c->mychallenge = xmalloc(len);
+       c->mychallenge = xrealloc(c->mychallenge, len);
 
        /* Convert the challenge from hexadecimal back to binary */
 
@@ -483,7 +479,7 @@ bool send_ack(connection_t *c)
        if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
                c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
 
-       if((!get_config_bool(lookup_config(c->config_tree, "PMTUDiscovery"), &choice) || choice) && (myself->options & OPTION_PMTU_DISCOVERY))
+       if(myself->options & OPTION_PMTU_DISCOVERY)
                c->options |= OPTION_PMTU_DISCOVERY;
 
        get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
@@ -561,6 +557,10 @@ bool ack_h(connection_t *c)
 
        n->connection = c;
        c->node = n;
+       if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
+               c->options &= ~OPTION_PMTU_DISCOVERY;
+               options &= ~OPTION_PMTU_DISCOVERY;
+       }
        c->options |= options;
 
        if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)