Reformat all code using astyle.

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 8a536e3..c08a0d1 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -1,7 +1,7 @@
 /*
     protocol_misc.c -- handle the meta-protocol, miscellaneous functions
     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
@@ -34,8 +34,9 @@ int maxoutbufsize = 0;
 /* Status and error notification routines */
 
 bool send_status(connection_t *c, int statusno, const char *statusstring) {
-       if(!statusstring)
+       if(!statusstring) {
                statusstring = "Status";
+       }
 
        return send_request(c, "%d %d %s", STATUS, statusno, statusstring);
 }
@@ -45,20 +46,21 @@ bool status_h(connection_t *c) {
        char statusstring[MAX_STRING_SIZE];
 
        if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
-                          c->name, c->hostname);
+               logger(LOG_ERR, "Got bad %s from %s (%s)", "STATUS",
+                      c->name, c->hostname);
                return false;
        }
 
-       ifdebug(STATUS) logger(LOG_NOTICE, _("Status message from %s (%s): %d: %s"),
-                          c->name, c->hostname, statusno, statusstring);
+       ifdebug(STATUS) logger(LOG_NOTICE, "Status message from %s (%s): %d: %s",
+                              c->name, c->hostname, statusno, statusstring);
 
        return true;
 }
 
 bool send_error(connection_t *c, int err, const char *errstring) {
-       if(!errstring)
+       if(!errstring) {
                errstring = "Error";
+       }
 
        return send_request(c, "%d %d %s", ERROR, err, errstring);
 }
@@ -68,13 +70,13 @@ bool error_h(connection_t *c) {
        char errorstring[MAX_STRING_SIZE];
 
        if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
-                          c->name, c->hostname);
+               logger(LOG_ERR, "Got bad %s from %s (%s)", "ERROR",
+                      c->name, c->hostname);
                return false;
        }
 
-       ifdebug(ERROR) logger(LOG_NOTICE, _("Error message from %s (%s): %d: %s"),
-                          c->name, c->hostname, err, errorstring);
+       ifdebug(ERROR) logger(LOG_NOTICE, "Error message from %s (%s): %d: %s",
+                             c->name, c->hostname, err, errorstring);
 
        terminate_connection(c, c->status.active);
 
@@ -111,33 +113,44 @@ bool pong_h(connection_t *c) {
 
        /* Succesful connection, reset timeout if this is an outgoing connection. */
 
-       if(c->outgoing)
+       if(c->outgoing) {
                c->outgoing->timeout = 0;
+               c->outgoing->cfg = NULL;
+
+               if(c->outgoing->ai) {
+                       freeaddrinfo(c->outgoing->ai);
+               }
+
+               c->outgoing->ai = NULL;
+               c->outgoing->aip = NULL;
+       }
 
        return true;
 }
 
 /* Sending and receiving packets via TCP */
 
-bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
+bool send_tcppacket(connection_t *c, const vpn_packet_t *packet) {
        /* If there already is a lot of data in the outbuf buffer, discard this packet.
-           We use a very simple Random Early Drop algorithm. */
+          We use a very simple Random Early Drop algorithm. */
 
-       if(2.0 * c->outbuflen / (float)maxoutbufsize - 1 > (float)rand()/(float)RAND_MAX)
+       if(2.0 * c->outbuflen / (float)maxoutbufsize - 1 > (float)rand() / (float)RAND_MAX) {
                return true;
+       }
 
-       if(!send_request(c, "%d %hd", PACKET, packet->len))
+       if(!send_request(c, "%d %hd", PACKET, packet->len)) {
                return false;
+       }
 
-       return send_meta(c, (char *)packet->data, packet->len);
+       return send_meta(c, (char *)packet->data, packet->len) && flush_meta(c);
 }
 
 bool tcppacket_h(connection_t *c) {
        short int len;
 
        if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
-                          c->hostname);
+               logger(LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name,
+                      c->hostname);
                return false;
        }