Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / multicast_device.c

diff --git a/src/multicast_device.c b/src/multicast_device.c
index 0b232dbb6f0238d260a8f658f6c7a69d19374b9b..e5e9a3fbd4fa7a009ec0b4cd7f11bc9d09341671 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -48,14 +48,14 @@ static bool setup_device(void) {
        get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
        if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
-               logger(LOG_ERR, "Device variable required for %s", device_info);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Device variable required for %s", device_info);
                return false;
        }
 
        host = xstrdup(device);
        space = strchr(host, ' ');
        if(!space) {
-               logger(LOG_ERR, "Port number required for %s", device_info);
+               logger(DEBUG_ALWAYS, LOG_ERR, "Port number required for %s", device_info);
                return false;
        }
 
@@ -74,7 +74,7 @@ static bool setup_device(void) {
 
        device_fd = socket(ai->ai_family, SOCK_DGRAM, IPPROTO_UDP);
        if(device_fd < 0) {
-               logger(LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Creating socket failed: %s", sockstrerror(sockerrno));
                return false;
        }
 
@@ -87,7 +87,7 @@ static bool setup_device(void) {
 
        if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
                closesocket(device_fd);
-               logger(LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Can't bind to %s %s: %s", host, port, sockstrerror(sockerrno));
                return false;
        }
 
@@ -100,7 +100,7 @@ static bool setup_device(void) {
                        mreq.imr_multiaddr.s_addr = in.sin_addr.s_addr;
                        mreq.imr_interface.s_addr = htonl(INADDR_ANY);
                        if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof mreq)) {
-                               logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
                                closesocket(device_fd);
                                return false;
                        }
@@ -121,7 +121,7 @@ static bool setup_device(void) {
                        memcpy(&mreq.ipv6mr_multiaddr, &in6.sin6_addr, sizeof mreq.ipv6mr_multiaddr);
                        mreq.ipv6mr_interface = in6.sin6_scope_id;
                        if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof mreq)) {
-                               logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
+                               logger(DEBUG_ALWAYS, LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
                                closesocket(device_fd);
                                return false;
                        }
@@ -135,12 +135,12 @@ static bool setup_device(void) {
 #endif
        
                default:
-                       logger(LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family);
                        closesocket(device_fd);
                        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;
 }
@@ -159,13 +159,13 @@ static bool read_packet(vpn_packet_t *packet) {
        int lenin;
 
        if((lenin = recv(device_fd, packet->data, MTU, 0)) <= 0) {
-               logger(LOG_ERR, "Error while reading from %s %s: %s", device_info,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s", device_info,
                           device, strerror(errno));
                return false;
        }
 
        if(!memcmp(&ignore_src, packet->data + 6, sizeof ignore_src)) {
-               ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
                packet->len = 0;
                return true;
        }
@@ -174,18 +174,18 @@ static bool read_packet(vpn_packet_t *packet) {
 
        device_total_in += packet->len;
 
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
+       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) {
-       ifdebug(TRAFFIC) logger(LOG_DEBUG, "Writing packet of %d bytes to %s",
+       logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
                           packet->len, device_info);
 
        if(sendto(device_fd, packet->data, packet->len, 0, ai->ai_addr, ai->ai_addrlen) < 0) {
-               logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,
+               logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
                           strerror(errno));
                return false;
        }
@@ -198,9 +198,9 @@ static bool write_packet(vpn_packet_t *packet) {
 }
 
 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);
+       logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
+       logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
+       logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
 }
 
 const devops_t multicast_devops = {
@@ -214,7 +214,7 @@ const devops_t multicast_devops = {
 #if 0
 
 static bool not_supported(void) {
-       logger(LOG_ERR, "Raw socket device not supported on this platform");
+       logger(DEBUG_ALWAYS, LOG_ERR, "Raw socket device not supported on this platform");
        return false;
 }