projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'dechamps/windevice' into 1.1
[tinc]
/
src
/
raw_socket_device.c
diff --git
a/src/raw_socket_device.c
b/src/raw_socket_device.c
index
3785dcf
..
eb38be2
100644
(file)
--- a/
src/raw_socket_device.c
+++ b/
src/raw_socket_device.c
@@
-32,12
+32,9
@@
#include "route.h"
#include "xalloc.h"
#include "route.h"
#include "xalloc.h"
-#if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET)
+#if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET)
&& defined(SIOCGIFINDEX)
static char *device_info;
static char *device_info;
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
-
static bool setup_device(void) {
struct ifreq ifr;
struct sockaddr_ll sa;
static bool setup_device(void) {
struct ifreq ifr;
struct sockaddr_ll sa;
@@
-51,7
+48,7
@@
static bool setup_device(void) {
device_info = "raw socket";
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
device_info = "raw socket";
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
- logger(LOG_ERR, "Could not open %s: %s", device_info,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not open %s: %s", device_info,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-65,7
+62,7
@@
static bool setup_device(void) {
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
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", iface,
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Can't find interface %s: %s", iface,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-76,74
+73,64
@@
static bool setup_device(void) {
sa.sll_ifindex = ifr.ifr_ifindex;
if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof sa)) {
sa.sll_ifindex = ifr.ifr_ifindex;
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));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not bind %s to %s: %s", device, iface, strerror(errno));
return false;
}
return false;
}
- logger(LOG_INFO, "%s is a %s", device, device_info);
+ logger(
DEBUG_ALWAYS,
LOG_INFO, "%s is a %s", device, device_info);
return true;
}
static void close_device(void) {
return true;
}
static void close_device(void) {
- close(device_fd);
+ close(device_fd);
device_fd = -1;
- free(device);
- free(iface);
+ free(device); device = NULL;
+ free(iface); iface = NULL;
+ device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
int inlen;
}
static bool read_packet(vpn_packet_t *packet) {
int inlen;
- if((inlen = read(device_fd,
packet->data
, MTU)) <= 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+ if((inlen = read(device_fd,
DATA(packet)
, MTU)) <= 0) {
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
return false;
}
packet->len = inlen;
device, strerror(errno));
return false;
}
packet->len = inlen;
- device_total_in += packet->len;
-
- ifdebug(TRAFFIC) logger(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 true;
}
static bool write_packet(vpn_packet_t *packet) {
device_info);
return true;
}
static bool write_packet(vpn_packet_t *packet) {
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Writing packet of %d bytes to %s",
+
logger(DEBUG_TRAFFIC,
LOG_DEBUG, "Writing packet of %d bytes to %s",
packet->len, device_info);
packet->len, device_info);
- if(write(device_fd,
packet->data
, packet->len) < 0) {
- logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
+ if(write(device_fd,
DATA(packet)
, packet->len) < 0) {
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
- device_total_out += packet->len;
-
return true;
}
return true;
}
-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,
const devops_t raw_socket_devops = {
.setup = setup_device,
.close = close_device,
.read = read_packet,
.write = write_packet,
- .dump_stats = dump_device_stats,
};
#else
static bool not_supported(void) {
};
#else
static bool not_supported(void) {
- logger(LOG_ERR, "Raw socket device not supported on this platform");
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Raw socket device not supported on this platform");
return false;
}
return false;
}
@@
-152,6
+139,5
@@
const devops_t raw_socket_devops = {
.close = NULL,
.read = NULL,
.write = NULL,
.close = NULL,
.read = NULL,
.write = NULL,
- .dump_stats = NULL,
};
#endif
};
#endif