projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make more variables safe for use in invitations.
[tinc]
/
src
/
raw_socket_device.c
diff --git
a/src/raw_socket_device.c
b/src/raw_socket_device.c
index
e2692ec
..
02f6afa
100644
(file)
--- a/
src/raw_socket_device.c
+++ b/
src/raw_socket_device.c
@@
-20,7
+20,9
@@
#include "system.h"
#include "system.h"
+#ifdef HAVE_NETPACKET_PACKET_H
#include <netpacket/packet.h>
#include <netpacket/packet.h>
+#endif
#include "conf.h"
#include "device.h"
#include "conf.h"
#include "device.h"
@@
-30,39
+32,40
@@
#include "route.h"
#include "xalloc.h"
#include "route.h"
#include "xalloc.h"
-static char *device_info;
-
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
+#if defined(PF_PACKET) && defined(ETH_P_ALL) && defined(AF_PACKET) && defined(SIOCGIFINDEX)
+static const char *device_info = "raw_socket";
static bool setup_device(void) {
struct ifreq ifr;
struct sockaddr_ll sa;
static bool setup_device(void) {
struct ifreq ifr;
struct sockaddr_ll sa;
- if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+ if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
{
iface = xstrdup("eth0");
iface = xstrdup("eth0");
+ }
- if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+ if(!get_config_string(lookup_config(config_tree, "Device"), &device))
{
device = xstrdup(iface);
device = xstrdup(iface);
-
- device_info = "raw socket";
+ }
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
if((device_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
- logger(LOG_ERR, "Could not open %s: %s", device_info,
-
strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Could not open %s: %s", device_info,
+ strerror(errno));
return false;
}
return false;
}
+ memset(&ifr, 0, sizeof(ifr));
+
#ifdef FD_CLOEXEC
fcntl(device_fd, F_SETFD, FD_CLOEXEC);
#endif
#ifdef FD_CLOEXEC
fcntl(device_fd, F_SETFD, FD_CLOEXEC);
#endif
- memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
+ ifr.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = 0;
+
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
close(device_fd);
- logger(LOG_ERR, "Can't find interface %s: %s", iface,
-
strerror(errno));
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Can't find interface %s: %s", iface,
+ strerror(errno));
return false;
}
return false;
}
@@
-72,66
+75,74
@@
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) {
close(device_fd);
return true;
}
static void close_device(void) {
close(device_fd);
+ device_fd = -1;
free(device);
free(device);
+ device = NULL;
free(iface);
free(iface);
+ iface = NULL;
+ device_info = NULL;
}
static bool read_packet(vpn_packet_t *packet) {
}
static bool read_packet(vpn_packet_t *packet) {
- int
leni
n;
+ int
inle
n;
- if((
lenin = read(device_fd, packet->data
, MTU)) <= 0) {
- logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
-
device, strerror(errno));
+ 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;
}
return false;
}
- packet->len = lenin;
-
- device_total_in += packet->len;
+ packet->len = inlen;
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
-
device_info);
+
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) {
return true;
}
static bool write_packet(vpn_packet_t *packet) {
-
ifdebug(TRAFFIC) logger(
LOG_DEBUG, "Writing packet of %d bytes to %s",
-
packet->len, device_info);
+
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) {
- logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-
strerror(errno));
+ 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;
}
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) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Raw socket device not supported on this platform");
+ return false;
+}
+
+const devops_t raw_socket_devops = {
+ .setup = not_supported,
+ .close = NULL,
+ .read = NULL,
+ .write = NULL,
+};
+#endif