Don't assume sa.sa_family is a short int.

[tinc] / src / multicast_device.c

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 4d5f10a..931a8d0 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -162,13 +162,13 @@ static void close_device(void) {
 static bool read_packet(vpn_packet_t *packet) {
        int lenin;
 
-       if((lenin = recv(device_fd, (void *)packet->data, MTU, 0)) <= 0) {
+       if((lenin = recv(device_fd, DATA(packet), MTU, 0)) <= 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, sockstrerror(sockerrno));
                return false;
        }
 
-       if(!memcmp(&ignore_src, packet->data + 6, sizeof ignore_src)) {
+       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);
                return false;
        }
@@ -185,13 +185,13 @@ 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, (void *)packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
+       if(sendto(device_fd, DATA(packet), 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,
                           sockstrerror(sockerrno));
                return false;
        }
 
-       memcpy(&ignore_src, packet->data + 6, sizeof ignore_src);
+       memcpy(&ignore_src, DATA(packet) + 6, sizeof ignore_src);
 
        return true;
 }