/*
device.c -- raw socket
Copyright (C) 2002-2005 Ivo Timmermans,
- 2002-2006 Guus Sliepen <guus@tinc-vpn.org>
+ 2002-2009 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
#include "logger.h"
#include "utils.h"
#include "route.h"
+#include "xalloc.h"
int device_fd = -1;
-char *device;
-char *iface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+char *device = NULL;
+char *iface = NULL;
+static char ifrname[IFNAMSIZ];
+static char *device_info;
static int device_total_in = 0;
static int device_total_out = 0;
cp();
- if(!get_config_string
- (lookup_config(config_tree, "Interface"), &iface))
- iface = "eth0";
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+ iface = xstrdup("eth0");
if(!get_config_string(lookup_config(config_tree, "Device"), &device))
- device = iface;
+ device = xstrdup(iface);
device_info = _("raw socket");
return false;
}
- memset(&ifr, 0, sizeof(ifr));
+ memset(&ifr, 0, sizeof ifr);
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
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))) {
+ 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;
}
cp();
close(device_fd);
+
+ free(device);
+ free(iface);
}
bool read_packet(vpn_packet_t *packet) {
- int lenin;
+ 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;