X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmulticast_device.c;h=600b77cc68e679614e16f6af4d9b61f172cfd58a;hb=fe1d0043c81b26f337bdce63dd290d882b01cf21;hp=51d5c294c1c34164a58220aa185c23622e66d301;hpb=d93a37928b75b17ac5e1eae5c2d62fd0760a6608;p=tinc

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 51d5c294..600b77cc 100644
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- multicast socket
     Copyright (C) 2002-2005 Ivo Timmermans,
-                  2002-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -130,14 +130,12 @@ static bool setup_device(void) {
 #endif
 		} break;
 #endif
-	
+
 		default:
 			logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
 			goto error;
 	}
 
-	freeaddrinfo(ai);
-
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
 	return true;
@@ -165,7 +163,7 @@ static void close_device(void) {
 static bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
-	if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
+	if((lenin = recv(device_fd, (void *)packet->data, MTU, 0)) <= 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
 			   device, strerror(errno));
 		return false;
@@ -173,8 +171,7 @@ static bool read_packet(vpn_packet_t *packet) {
 
 	if(!memcmp(&ignore_src, packet->data + 6, sizeof ignore_src)) {
 		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
-		packet->len = 0;
-		return true;
+		return false;
 	}
 
 	packet->len = lenin;
@@ -191,7 +188,7 @@ static bool write_packet(vpn_packet_t *packet) {
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   packet->len, device_info);
 
-	if(sendto(device_fd, packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
+	if(sendto(device_fd, (void *)packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
 			   strerror(errno));
 		return false;