Fix incorrect format qualifiers.

[tinc] / src / multicast_device.c

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 48e1200..4d5f10a 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -129,7 +129,7 @@ static bool setup_device(void) {
 #endif
 
                default:
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %x unsupported", ai->ai_family);
                        goto error;
        }
 
@@ -148,13 +148,15 @@ error:
 }
 
 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;
 
-       if(ai)
-               freeaddrinfo(ai);
+       if(ai) {
+               freeaddrinfo(ai); ai = NULL;
+       }
+       device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -162,7 +164,7 @@ static bool read_packet(vpn_packet_t *packet) {
 
        if((lenin = recv(device_fd, (void *)packet->data, MTU, 0)) <= 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
-                          device, strerror(errno));
+                          device, sockstrerror(sockerrno));
                return false;
        }
 
@@ -185,7 +187,7 @@ static bool write_packet(vpn_packet_t *packet) {
 
        if(sendto(device_fd, (void *)packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-                          strerror(errno));
+                          sockstrerror(sockerrno));
                return false;
        }