X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket_device.c;h=eb38be267bc066367fdd90479f3e857f59406c78;hp=57df5b7a0ee25a9a616ea9160db31a812a5ec9ed;hb=706d855e507980de3845556989d7de7a3b9c76e8;hpb=41583d5dcfc1277b1a203478de4cce2cd0cda1b1

diff --git a/src/raw_socket_device.c b/src/raw_socket_device.c
index 57df5b7a..eb38be26 100644
--- 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) {
-	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;
 
-	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;
@@ -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);
 
-	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;