X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmulticast_device.c;h=79239a198139f59c6a99fc7ca1aa0d90c9b9a157;hb=28b7a53b6;hp=99f26ca9e038d18947ef3f8e7706a50bdbbe4e90;hpb=38489e37f50e807e51bfd28ebb8b20396eed1447;p=tinc

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 99f26ca9..79239a19 100644
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -26,13 +26,12 @@
 #include "logger.h"
 #include "netutl.h"
 #include "utils.h"
-#include "route.h"
 #include "xalloc.h"
 
 static const char *device_info = "multicast socket";
 
 static struct addrinfo *ai = NULL;
-static mac_t ignore_src = {{0}};
+static mac_t ignore_src = {0};
 
 static bool setup_device(void) {
 	char *host = NULL;
@@ -40,9 +39,9 @@ static bool setup_device(void) {
 	char *space;
 	int ttl = 1;
 
-	get_config_string(lookup_config(config_tree, "Interface"), &iface);
+	get_config_string(lookup_config(&config_tree, "Interface"), &iface);
 
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+	if(!get_config_string(lookup_config(&config_tree, "Device"), &device)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Device variable required for %s", device_info);
 		goto error;
 	}
@@ -180,7 +179,7 @@ static void close_device(void) {
 }
 
 static bool read_packet(vpn_packet_t *packet) {
-	int lenin;
+	ssize_t lenin;
 
 	if((lenin = recv(device_fd, (void *)DATA(packet), MTU, 0)) <= 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
@@ -189,7 +188,7 @@ static bool read_packet(vpn_packet_t *packet) {
 	}
 
 	if(!memcmp(&ignore_src, DATA(packet) + 6, sizeof(ignore_src))) {
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
+		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %ld bytes from %s", (long)lenin, device_info);
 		return false;
 	}