kernel-pfroute: Provide name of interfaces on which virtual IPs are installed

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
index 020b36a0b322729247c96d3f59343d03dc9261c0..c29aff43315ab523ae1539a33a69b7d81e2b6549 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
@@ -1266,7 +1266,7 @@ METHOD(kernel_net_t, get_interface_name, bool,
                if (name)
                {
                        *name = strdup(entry->iface->ifname);
-                       DBG2(DBG_KNL, "virtual %H is on interface %s", ip, *name);
+                       DBG2(DBG_KNL, "virtual IP %H is on interface %s", ip, *name);
                }
                this->lock->unlock(this->lock);
                return TRUE;

diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
index d4a5957622d4619e36281472d72b86fa9a0ca2ac..ca9e0697550854a227abff9ea448ea9725d926d5 100644 (file)
--- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
+++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
@@ -173,6 +173,15 @@ static bool addr_map_entry_match_up_and_usable(addr_map_entry_t *a,
                        a->ip->ip_equals(a->ip, b->ip);
 }
 
+/**
+ * Used with get_match this finds an address entry if it is installed as virtual
+ * IP address
+ */
+static bool addr_map_entry_match_virtual(addr_map_entry_t *a, addr_map_entry_t *b)
+{
+       return b->addr->virtual && a->ip->ip_equals(a->ip, b->ip);
+}
+
 /**
  * Used with get_match this finds an address entry if it is installed on
  * any active local interface
@@ -1060,6 +1069,19 @@ METHOD(kernel_net_t, get_interface_name, bool,
                this->lock->unlock(this->lock);
                return TRUE;
        }
+       /* check if it is a virtual IP */
+       entry = this->addrs->get_match(this->addrs, &lookup,
+                                                                 (void*)addr_map_entry_match_virtual);
+       if (entry)
+       {
+               if (name)
+               {
+                       *name = strdup(entry->iface->ifname);
+                       DBG2(DBG_KNL, "virtual IP %H is on interface %s", ip, *name);
+               }
+               this->lock->unlock(this->lock);
+               return TRUE;
+       }
        /* maybe it is installed on an ignored interface */
        entry = this->addrs->get_match(this->addrs, &lookup,
                                                                  (void*)addr_map_entry_match_up);