X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=33857ba11ac5c37bb1ad35ce2568219dbd096e0a;hb=4a1740ede7c1992f7f3da5e197db9975c0344ac3;hp=0de3fd6731b3358ba909575676e824248e87e945;hpb=7926a156e5b118d06295228e57de0cc9de0433b4;p=tinc

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 0de3fd67..33857ba1 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2002-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2002-2005 Ivo Timmermans,
+                  2002-2006 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
@@ -20,36 +20,24 @@
     $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
+#include "system.h"
+
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 
-#include <utils.h>
 #include "conf.h"
 #include "net.h"
 #include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "route.h"
 
 int device_fd = -1;
 char *device;
-char *interface;
+char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
@@ -59,11 +47,11 @@ bool setup_device(void)
 	cp();
 
 	if(!get_config_string
-		  (lookup_config(config_tree, "Interface"), &interface))
-		interface = "eth0";
+		  (lookup_config(config_tree, "Interface"), &iface))
+		iface = "eth0";
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		device = interface;
+		device = iface;
 
 	device_info = _("raw socket");
 
@@ -74,10 +62,10 @@ bool setup_device(void)
 	}
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
-		logger(LOG_ERR, _("Can't find interface %s: %s"), interface,
+		logger(LOG_ERR, _("Can't find interface %s: %s"), iface,
 			   strerror(errno));
 		return false;
 	}
@@ -88,7 +76,7 @@ bool setup_device(void)
 	sa.sll_ifindex = ifr.ifr_ifindex;
 
 	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-		logger(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
+		logger(LOG_ERR, _("Could not bind %s to %s: %s"), device, iface, strerror(errno));
 		return false;
 	}