Use conditional compilation for device.c.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 61785ad..3b3b439 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-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
@@ -18,19 +18,20 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <linux/if_tun.h>
 #define DEFAULT_DEVICE "/dev/net/tun"
 
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
-#include "device.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../names.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
+#include "../device.h"
 
 typedef enum device_type_t {
        DEVICE_TYPE_TUN,
@@ -120,7 +121,7 @@ static void close_device(void) {
 
 static bool read_packet(vpn_packet_t *packet) {
        int inlen;
-       
+
        switch(device_type) {
                case DEVICE_TYPE_TUN:
                        inlen = read(device_fd, packet->data + 10, MTU - 10);
@@ -131,6 +132,7 @@ static bool read_packet(vpn_packet_t *packet) {
                                return false;
                        }
 
+                       memset(packet->data, 0, 12);
                        packet->len = inlen + 10;
                        break;
                case DEVICE_TYPE_TAP: