X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=3694cb128e7a95c50e03f0bd80a06bbe28b00cdc;hb=636200d1a2024982fe5b3062153daa72a8253015;hp=1bece597577c629a1fd057e6d6330d6f3fceb328;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1;p=tinc

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 1bece597..3694cb12 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2002-2003 Guus Sliepen <guus@sliepen.eu.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
@@ -17,53 +17,40 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: device.c,v 1.1.2.9 2003/07/31 11:31:51 guus Exp $
+    $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)
-{
+bool setup_device(void) {
 	struct ifreq ifr;
 	struct sockaddr_ll sa;
 
 	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");
 
@@ -73,22 +60,22 @@ bool setup_device(void)
 		return false;
 	}
 
-	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+	memset(&ifr, 0, sizeof ifr);
+	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;
 	}
 
-	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;
 
-	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-		logger(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
+	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
+		logger(LOG_ERR, _("Could not bind %s to %s: %s"), device, iface, strerror(errno));
 		return false;
 	}
 
@@ -97,26 +84,24 @@ bool setup_device(void)
 	return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
 	cp();
 
 	close(device_fd);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-	int lenin;
+bool read_packet(vpn_packet_t *packet) {
+	int inlen;
 
 	cp();
 
-	if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+	if((inlen = read(device_fd, packet->data, MTU)) <= 0) {
 		logger(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return false;
 	}
 
-	packet->len = lenin;
+	packet->len = inlen;
 
 	device_total_in += packet->len;
 
@@ -126,8 +111,7 @@ bool read_packet(vpn_packet_t *packet)
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
 	cp();
 
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
@@ -144,8 +128,7 @@ bool write_packet(vpn_packet_t *packet)
 	return true;
 }
 
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
 	cp();
 
 	logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);