X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fraw_socket%2Fdevice.c;h=3cb62c0d7c3b2587df5d6d729e06754da53caeb8;hb=0b9175e998c2180e5d73ef3d644a49d620c68cad;hp=8dd00a2080f39ec541a2b7e0bc7889e201c9ba7f;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8;p=tinc

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 8dd00a20..3cb62c0d 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -17,7 +17,7 @@
     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.3 2002/09/09 22:33:31 guus Exp $
+    $Id: device.c,v 1.1.2.6 2003/07/06 22:11:37 guus Exp $
 */
 
 #include "config.h"
@@ -29,7 +29,6 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -39,7 +38,7 @@
 #include <utils.h>
 #include "conf.h"
 #include "net.h"
-#include "subnet.h"
+#include "logger.h"
 
 #include "system.h"
 
@@ -53,8 +52,6 @@ char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-extern subnet_t mymac;
-
 /*
   open the local ethertap device
 */
@@ -62,7 +59,10 @@ int setup_device(void)
 {
 	struct ifreq ifr;
 	struct sockaddr_ll sa;
-	cp if(!get_config_string
+
+	cp();
+
+	if(!get_config_string
 		  (lookup_config(config_tree, "Interface"), &interface))
 		interface = "eth0";
 
@@ -70,8 +70,9 @@ int setup_device(void)
 		device = interface;
 
 	device_info = _("raw socket");
-	cp if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
-		syslog(LOG_ERR, _("Could not open %s: %s"), device_info,
+
+	if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Could not open %s: %s"), device_info,
 			   strerror(errno));
 		return -1;
 	}
@@ -80,7 +81,7 @@ int setup_device(void)
 	strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
-		syslog(LOG_ERR, _("Can't find interface %s: %s"), interface,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Can't find interface %s: %s"), interface,
 			   strerror(errno));
 		return -1;
 	}
@@ -91,26 +92,20 @@ int setup_device(void)
 	sa.sll_ifindex = ifr.ifr_ifindex;
 
 	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-		syslog(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
 		return -1;
 	}
-	cp
-		/* Set default MAC address for ethertap devices */
-		mymac.type = SUBNET_MAC;
-	mymac.net.mac.address.x[0] = 0xfe;
-	mymac.net.mac.address.x[1] = 0xfd;
-	mymac.net.mac.address.x[2] = 0x00;
-	mymac.net.mac.address.x[3] = 0x00;
-	mymac.net.mac.address.x[4] = 0x00;
-	mymac.net.mac.address.x[5] = 0x00;
-
-	syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-	cp return 0;
+
+	logger(DEBUG_ALWAYS, LOG_INFO, _("%s is a %s"), device, device_info);
+
+	return 0;
 }
 
 void close_device(void)
 {
-	cp close(device_fd);
+	cp();
+
+	close(device_fd);
 }
 
 /*
@@ -120,8 +115,11 @@ void close_device(void)
 int read_packet(vpn_packet_t *packet)
 {
 	int lenin;
-	cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
-		syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+
+	cp();
+
+	if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
 			   device, strerror(errno));
 		return -1;
 	}
@@ -130,33 +128,36 @@ int read_packet(vpn_packet_t *packet)
 
 	device_total_in += packet->len;
 
-	if(debug_lvl >= DEBUG_TRAFFIC) {
-		syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
 			   device_info);
 	}
 
 	return 0;
-cp}
+}
 
 int write_packet(vpn_packet_t *packet)
 {
-	cp if(debug_lvl >= DEBUG_TRAFFIC)
-		syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
+	cp();
+
+	logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Writing packet of %d bytes to %s"),
 			   packet->len, device_info);
 
 	if(write(device_fd, packet->data, packet->len) < 0) {
-		syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
+		logger(DEBUG_ALWAYS, LOG_ERR, _("Can't write to %s %s: %s"), device_info, device,
 			   strerror(errno));
 		return -1;
 	}
 
 	device_total_out += packet->len;
-	cp return 0;
+
+	return 0;
 }
 
 void dump_device_stats(void)
 {
-	cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
-	syslog(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
-	syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-cp}
+	cp();
+
+	logger(DEBUG_ALWAYS, LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
+	logger(DEBUG_ALWAYS, LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
+}