From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 25 Mar 2012 13:46:50 +0000 (+0100)
Subject: Fix some more compiler warnings.
X-Git-Tag: import-tinc-1.1~385^2~5
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=399835385380d485416d6d59a8f27ce71f1db644;p=meshlink

Fix some more compiler warnings.
---

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 08d44d41..0b232dbb 100644
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -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;
diff --git a/src/net.c b/src/net.c
index 327bdd30..9799feab 100644
--- 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);
 			}