X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=0f239e09ad143e3e781653fc3ccadc9e183152b0;hp=054afeef5cda21848b4687a4fedb6a38e2b13bc8;hb=f75dcef72a81a337e847adf0bae54198894f65b9;hpb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 054afeef..0f239e09 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.1 2002/07/18 14:30:45 guus Exp $
+    $Id: device.c,v 1.1.2.2 2002/09/09 21:25:28 guus Exp $
 */
 
 #include "config.h"
@@ -60,115 +60,103 @@ extern subnet_t mymac;
 */
 int setup_device(void)
 {
-  struct ifreq ifr;
-  struct sockaddr_ll sa;
-cp
-  if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
-    interface = "eth0";
-
-  if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-    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, strerror(errno));
-      return -1;
-    }
-
-  memset(&ifr, 0, sizeof(ifr));
-  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, strerror(errno));
-      return -1;
-    }
-
-  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)))
-    {
-      syslog(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;
+	struct ifreq ifr;
+	struct sockaddr_ll sa;
+	cp if(!get_config_string
+		  (lookup_config(config_tree, "Interface"), &interface))
+		interface = "eth0";
+
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+		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,
+			   strerror(errno));
+		return -1;
+	}
+
+	memset(&ifr, 0, sizeof(ifr));
+	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,
+			   strerror(errno));
+		return -1;
+	}
+
+	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))) {
+		syslog(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;
 }
 
 void close_device(void)
 {
-cp
-  close(device_fd);
+	cp close(device_fd);
 }
 
 /*
   read, encrypt and send data that is
   available through the ethertap device
 */
-int read_packet(vpn_packet_t *packet)
+int read_packet(vpn_packet_t * packet)
 {
-  int lenin;
-cp
+	int lenin;
+	cp if((lenin = read(device_fd, packet->data, MTU)) <= 0) {
+		syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
+			   device, strerror(errno));
+		return -1;
+	}
 
-  if((lenin = read(device_fd, packet->data, MTU)) <= 0)
-    {
-      syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
-      return -1;
-    }
+	packet->len = lenin;
 
-  packet->len = lenin;
+	device_total_in += packet->len;
 
-  device_total_in += packet->len;
+	if(debug_lvl >= DEBUG_TRAFFIC) {
+		syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len,
+			   device_info);
+	}
 
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    {
-      syslog(LOG_DEBUG, _("Read packet of %d bytes from %s"), packet->len, device_info);
-    }
+	return 0;
+cp}
 
-  return 0;
-cp
-}
-
-int write_packet(vpn_packet_t *packet)
+int write_packet(vpn_packet_t * packet)
 {
-cp
-  if(debug_lvl >= DEBUG_TRAFFIC)
-    syslog(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, strerror(errno));
-      return -1;
-    }
-
-  device_total_out += packet->len;
-cp
-  return 0;
+	cp if(debug_lvl >= DEBUG_TRAFFIC)
+		syslog(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,
+			   strerror(errno));
+		return -1;
+	}
+
+	device_total_out += packet->len;
+	cp 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 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}