projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added comments and unfold deep "if"-construct in timeout_handler
[tinc]
/
src
/
raw_socket_device.c
diff --git
a/src/raw_socket_device.c
b/src/raw_socket_device.c
index
57df5b7
..
eb38be2
100644
(file)
--- a/
src/raw_socket_device.c
+++ b/
src/raw_socket_device.c
@@
-83,16
+83,17
@@
static bool setup_device(void) {
}
static void close_device(void) {
}
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) {
+ 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;
logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
device, strerror(errno));
return false;
@@
-110,7
+111,7
@@
static bool write_packet(vpn_packet_t *packet) {
logger(DEBUG_TRAFFIC, 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) {
+ 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;
logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
strerror(errno));
return false;