Support linux aliased addresses

diff --git a/Makefile b/Makefile
index a55b1f25e80424aec710d0c0dadfce31acc969a4..b350b182167e2e05c654372061adf8c2839d91c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 3.1.0_pre1
+VERSION = 3.1.0_pre2
 CFLAGS ?= -O2 -pipe
 
 # Should work for both GNU make and BSD make

diff --git a/interface.c b/interface.c
index fe1209e49ef26ad045fc635f1c7fd4b2b53536e7..323fc9f661c55bfd21042023654dda36df4ce833 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -181,7 +181,9 @@ interface_t *read_interface (const char *ifname, int metric)
        sa_family_t family = 0;
        unsigned short mtu;
 
-#ifndef __linux__
+#ifdef __linux__
+       char *p;
+#else
        struct ifaddrs *ifap;
        struct ifaddrs *p;
 #endif
@@ -295,18 +297,24 @@ interface_t *read_interface (const char *ifname, int metric)
        mtu = ifr.ifr_mtu;
 
        strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+#ifdef __linux__
+       /* We can only bring the real interface up */
+       if ((p = strchr (ifr.ifr_name, ':')))
+               *p = '\0';
+#endif
        if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) {
                logger (LOG_ERR, "ioctl SIOCGIFFLAGS: %s", strerror (errno));
                close (s);
                return NULL;
        }
 
-       ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
-       strlcpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
-       if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
-               logger (LOG_ERR, "ioctl SIOCSIFFLAGS: %s", strerror (errno));
-               close (s);
-               return NULL;
+       if (! (ifr.ifr_flags & IFF_UP) || ! (ifr.ifr_flags & IFF_RUNNING)) {
+               ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
+               if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0) {
+                       logger (LOG_ERR, "ioctl SIOCSIFFLAGS: %s", strerror (errno));
+                       close (s);
+                       return NULL;
+               }
        }
 
        close (s);
@@ -766,6 +774,10 @@ static int do_address(const char *ifname,
        nlm.ifa.ifa_family = AF_INET;
 
        nlm.ifa.ifa_prefixlen = inet_ntocidr (netmask);
+
+       /* This creates the aliased interface */
+       add_attr_l (&nlm.hdr, sizeof (nlm), IFA_LABEL, ifname, strlen (ifname) + 1);
+
        add_attr_l (&nlm.hdr, sizeof (nlm), IFA_LOCAL, &address.s_addr,
                                sizeof (address.s_addr));
        if (! del)