Only log errors sending UDP packets when debug level >= 5.

[tinc] / src / protocol_misc.c

diff --git a/src/protocol_misc.c b/src/protocol_misc.c
index 5499b34..3d405bc 100644 (file)
--- a/src/protocol_misc.c
+++ b/src/protocol_misc.c
@@ -34,8 +34,6 @@ int maxoutbufsize = 0;
 /* Status and error notification routines */
 
 bool send_status(connection_t *c, int statusno, const char *statusstring) {
-       cp();
-
        if(!statusstring)
                statusstring = "Status";
 
@@ -46,23 +44,19 @@ bool status_h(connection_t *c) {
        int statusno;
        char statusstring[MAX_STRING_SIZE];
 
-       cp();
-
        if(sscanf(c->buffer, "%*d %d " MAX_STRING, &statusno, statusstring) != 2) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "STATUS",
+               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"),
+       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) {
-       cp();
-
        if(!errstring)
                errstring = "Error";
 
@@ -73,15 +67,13 @@ bool error_h(connection_t *c) {
        int err;
        char errorstring[MAX_STRING_SIZE];
 
-       cp();
-
        if(sscanf(c->buffer, "%*d %d " MAX_STRING, &err, errorstring) != 2) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ERROR",
+               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"),
+       ifdebug(ERROR) logger(LOG_NOTICE, "Error message from %s (%s): %d: %s",
                           c->name, c->hostname, err, errorstring);
 
        terminate_connection(c, c->status.active);
@@ -90,22 +82,16 @@ bool error_h(connection_t *c) {
 }
 
 bool send_termreq(connection_t *c) {
-       cp();
-
        return send_request(c, "%d", TERMREQ);
 }
 
 bool termreq_h(connection_t *c) {
-       cp();
-
        terminate_connection(c, c->status.active);
 
        return true;
 }
 
 bool send_ping(connection_t *c) {
-       cp();
-
        c->status.pinged = true;
        c->last_ping_time = now;
 
@@ -113,20 +99,14 @@ bool send_ping(connection_t *c) {
 }
 
 bool ping_h(connection_t *c) {
-       cp();
-
        return send_pong(c);
 }
 
 bool send_pong(connection_t *c) {
-       cp();
-
        return send_request(c, "%d", PONG);
 }
 
 bool pong_h(connection_t *c) {
-       cp();
-
        c->status.pinged = false;
 
        /* Succesful connection, reset timeout if this is an outgoing connection. */
@@ -139,9 +119,7 @@ bool pong_h(connection_t *c) {
 
 /* Sending and receiving packets via TCP */
 
-bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
-       cp();
-
+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. */
 
@@ -151,16 +129,14 @@ bool send_tcppacket(connection_t *c, vpn_packet_t *packet) {
        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;
 
-       cp();
-
        if(sscanf(c->buffer, "%*d %hd", &len) != 1) {
-               logger(LOG_ERR, _("Got bad %s from %s (%s)"), "PACKET", c->name,
+               logger(LOG_ERR, "Got bad %s from %s (%s)", "PACKET", c->name,
                           c->hostname);
                return false;
        }