Fix issues found by Coverity.

[oweals/tinc.git] / src / raw_socket_device.c

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index 90ccedfc317544a43eae5c3390def2c13ae2e1e2..c61e43c9c810153337d43fbc141da5caed1d7ede 100644 (file)
--- a/src/raw_socket_device.c
+++ b/src/raw_socket_device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
     Copyright (C) 2002-2005 Ivo Timmermans,
 /*
     device.c -- raw socket
     Copyright (C) 2002-2005 Ivo Timmermans,

-                  2002-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2012 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
 
     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


@@ -20,7 +20,9 @@
 
 #include "system.h"
 
 
 #include "system.h"
 

+#ifdef HAVE_NETPACKET_PACKET_H

 #include <netpacket/packet.h>
 #include <netpacket/packet.h>

+#endif

 
 #include "conf.h"
 #include "device.h"
 
 #include "conf.h"
 #include "device.h"


@@ -30,6 +32,7 @@
 #include "route.h"
 #include "xalloc.h"
 
 #include "route.h"
 #include "xalloc.h"
 

+#if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET) && defined(SIOCGIFINDEX)

 static char *device_info;
 
 static uint64_t device_total_in = 0;
 static char *device_info;
 
 static uint64_t device_total_in = 0;


@@ -53,6 +56,10 @@ static bool setup_device(void) {
                return false;
        }
 
                return false;
        }
 

+#ifdef FD_CLOEXEC
+       fcntl(device_fd, F_SETFD, FD_CLOEXEC);
+#endif
+

        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
        memset(&ifr, 0, sizeof(ifr));
        strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
        if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {


@@ -62,7 +69,7 @@ static bool setup_device(void) {
                return false;
        }
 
                return false;
        }
 

-       memset(&sa, '0', sizeof(sa));
+       memset(&sa, 0, sizeof(sa));

        sa.sll_family = AF_PACKET;
        sa.sll_protocol = htons(ETH_P_ALL);
        sa.sll_ifindex = ifr.ifr_ifindex;
        sa.sll_family = AF_PACKET;
        sa.sll_protocol = htons(ETH_P_ALL);
        sa.sll_ifindex = ifr.ifr_ifindex;


@@ -131,3 +138,19 @@ const devops_t raw_socket_devops = {
        .write = write_packet,
        .dump_stats = dump_device_stats,
 };
        .write = write_packet,
        .dump_stats = dump_device_stats,
 };

+
+#else
+
+static bool not_supported(void) {
+       logger(LOG_ERR, "Raw socket device not supported on this platform");
+       return false;
+}
+
+const devops_t raw_socket_devops = {
+       .setup = not_supported,
+       .close = NULL,
+       .read = NULL,
+       .write = NULL,
+       .dump_stats = NULL,
+};
+#endif