]> git.meshlink.io Git - meshlink/commitdiff
Fix some more compiler warnings.
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 25 Mar 2012 13:46:50 +0000 (14:46 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 25 Mar 2012 13:46:50 +0000 (14:46 +0100)
src/multicast_device.c
src/net.c

index 08d44d4173ffe4b18ed5997f95fe05b8056f1ff7..0b232dbb6f0238d260a8f658f6c7a69d19374b9b 100644 (file)
@@ -35,7 +35,7 @@ static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
 
 static struct addrinfo *ai = NULL;
-static mac_t ignore_src = {0};
+static mac_t ignore_src = {{0}};
 
 static bool setup_device(void) {
        char *host;
index 327bdd307a7c551f50151cd10da41517e52352ea..9799feabdf73952f3dc709434210f6014dee31d4 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -234,7 +234,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, 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) {
@@ -263,7 +263,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, 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);
                        }