X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Flinux%2Fdevice.c;h=5f925ceabbba698a712a0a5872b6948001b96bde;hb=313de46e70b249de2938b04e7fc9c3872d99474a;hp=6ed1622c08a5f1442174f459e07db4351f93fcdd;hpb=41583d5dcfc1277b1a203478de4cce2cd0cda1b1;p=tinc

diff --git a/src/linux/device.c b/src/linux/device.c
index 6ed1622c..5f925cea 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -105,15 +105,25 @@ static bool setup_device(void) {
 
 	logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
+	if(ifr.ifr_flags & IFF_TAP) {
+		struct ifreq ifr_mac = {};
+		if(!ioctl(device_fd, SIOCGIFHWADDR, &ifr_mac))
+			memcpy(mymac.x, ifr_mac.ifr_hwaddr.sa_data, ETH_ALEN);
+		else
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Could not get MAC address of %s: %s", device, strerror(errno));
+	}
+
 	return true;
 }
 
 static void close_device(void) {
 	close(device_fd);
+	device_fd = -1;
 
-	free(type);
-	free(device);
-	free(iface);
+	free(type); type = NULL;
+	free(device); device = NULL;
+	free(iface); iface = NULL;
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {