X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket_device.c;fp=src%2Fraw_socket%2Fdevice.c;h=90ccedfc317544a43eae5c3390def2c13ae2e1e2;hp=abe368ad9e60351541df7753561d2f044c1a89af;hb=178e52f76ef4ba40748c13ea7e518837394d6dbc;hpb=5672863e59e6a114ac6b66de98254b14266c0e61

diff --git a/src/raw_socket/device.c b/src/raw_socket_device.c
similarity index 87%
rename from src/raw_socket/device.c
rename to src/raw_socket_device.c
index abe368ad..90ccedfc 100644
--- 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,
-                  2002-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2002-2011 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
@@ -30,16 +30,12 @@
 #include "route.h"
 #include "xalloc.h"
 
-int device_fd = -1;
-char *device = NULL;
-char *iface = NULL;
-static char ifrname[IFNAMSIZ];
 static char *device_info;
 
 static uint64_t device_total_in = 0;
 static uint64_t device_total_out = 0;
 
-bool setup_device(void) {
+static bool setup_device(void) {
 	struct ifreq ifr;
 	struct sockaddr_ll sa;
 
@@ -81,14 +77,14 @@ bool setup_device(void) {
 	return true;
 }
 
-void close_device(void) {
+static void close_device(void) {
 	close(device_fd);
 
 	free(device);
 	free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet) {
+static bool read_packet(vpn_packet_t *packet) {
 	int lenin;
 
 	if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
@@ -107,7 +103,7 @@ bool read_packet(vpn_packet_t *packet) {
 	return true;
 }
 
-bool write_packet(vpn_packet_t *packet) {
+static bool write_packet(vpn_packet_t *packet) {
 	ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
 			   packet->len, device_info);
 
@@ -122,8 +118,16 @@ bool write_packet(vpn_packet_t *packet) {
 	return true;
 }
 
-void dump_device_stats(void) {
+static void dump_device_stats(void) {
 	logger(LOG_DEBUG, "Statistics for %s %s:", device_info, device);
 	logger(LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
 	logger(LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
+
+const devops_t raw_socket_devops = {
+	.setup = setup_device,
+	.close = close_device,
+	.read = read_packet,
+	.write = write_packet,
+	.dump_stats = dump_device_stats,
+};