Convert sizeof foo to sizeof(foo).
[tinc] / src / net.c
index 06351bf..cac15f9 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -246,7 +246,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                if(c->status.pinged) {
                                        ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
-                                                          c->name, c->hostname, (long)now - c->last_ping_time);
+                                                          c->name, c->hostname, (long)(now - c->last_ping_time));
                                        c->status.timeout = true;
                                        terminate_connection(c, true);
                                } else if(c->last_ping_time + pinginterval <= now) {
@@ -255,7 +255,7 @@ static void check_dead_connections(void) {
                        } else {
                                if(c->status.remove) {
                                        logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...",
-                                                  c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status));
+                                                  c->name, c->hostname, bitfield_to_int(&c->status, sizeof(c->status)));
                                        connection_del(c);
                                        continue;
                                }
@@ -275,7 +275,7 @@ static void check_dead_connections(void) {
                        if(c->status.active) {
                                ifdebug(CONNECTIONS) logger(LOG_INFO,
                                                "%s (%s) could not flush for %ld seconds (%d bytes remaining)",
-                                               c->name, c->hostname, (long)now - c->last_flushed_time, c->outbuflen);
+                                               c->name, c->hostname, (long)(now - c->last_flushed_time), c->outbuflen);
                                c->status.timeout = true;
                                terminate_connection(c, true);
                        }