Code

network plugin: Fixed incorrect collectd warning when configuring network plugin.
authorGerrie Roos <groos@xiplink.com>
Tue, 20 Dec 2011 04:30:59 +0000 (06:30 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 17 Feb 2012 13:59:25 +0000 (14:59 +0100)
Cosmetic only

Change-Id: I4c4c8fe19c23e9aa31b35e61eba31aa686429c10
Signed-off-by: Florian Forster <octo@collectd.org>
src/network.c

index 8de557d27a17a1cb979b4c807d1857b9b1517f40..700b27f09c0613e45b3d01e46c3847eb98da3af6 100644 (file)
@@ -1683,9 +1683,9 @@ static int network_set_interface (const sockent_t *se, const struct addrinfo *ai
        }
 
        /* else: Not a multicast interface. */
-#if defined(HAVE_IF_INDEXTONAME) && HAVE_IF_INDEXTONAME && defined(SO_BINDTODEVICE)
        if (se->interface != 0)
        {
+#if defined(HAVE_IF_INDEXTONAME) && HAVE_IF_INDEXTONAME && defined(SO_BINDTODEVICE)
                char interface_name[IFNAMSIZ];
 
                if (if_indextoname (se->interface, interface_name) == NULL)
@@ -1702,20 +1702,21 @@ static int network_set_interface (const sockent_t *se, const struct addrinfo *ai
                                        sstrerror (errno, errbuf, sizeof (errbuf)));
                        return (-1);
                }
-       }
 /* #endif HAVE_IF_INDEXTONAME && SO_BINDTODEVICE */
 
 #else
-       WARNING ("network plugin: Cannot set the interface on a unicast "
+               WARNING ("network plugin: Cannot set the interface on a unicast "
                        "socket because "
 # if !defined(SO_BINDTODEVICE)
-                       "the the \"SO_BINDTODEVICE\" socket option "
+                       "the \"SO_BINDTODEVICE\" socket option "
 # else
                        "the \"if_indextoname\" function "
 # endif
                        "is not available on your system.");
 #endif
 
+       }
+
        return (0);
 } /* }}} network_set_interface */