Add an optional kernel-interface parameter to install IPs with a custom prefix

diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_net.c b/src/frontends/android/jni/libandroidbridge/kernel/android_net.c
index 032fe208649f73bcb56e0f730ed8c4ce7c0d2bbe..8dc32e62296c2c2d50e86cc5384d77b56c8f94ea 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/kernel/android_net.c
+++ b/src/frontends/android/jni/libandroidbridge/kernel/android_net.c
@@ -92,7 +92,8 @@ METHOD(kernel_net_t, get_source_addr, host_t*,
 }
 
 METHOD(kernel_net_t, add_ip, status_t,
-       private_kernel_android_net_t *this, host_t *virtual_ip, host_t *iface_ip)
+       private_kernel_android_net_t *this, host_t *virtual_ip, int prefix,
+       host_t *iface_ip)
 {
        /* we get the IP from the IKE_SA once the CHILD_SA is established */
        return SUCCESS;

diff --git a/src/libcharon/sa/child_sa.c b/src/libcharon/sa/child_sa.c
index 1245734c93dda36fddae1eb14b2441ba1bb84115..e1f244e7ba94af42b393d233ec32767e0f49e3a1 100644 (file)
--- a/src/libcharon/sa/child_sa.c
+++ b/src/libcharon/sa/child_sa.c
@@ -824,8 +824,8 @@ METHOD(child_sa_t, add_policies, status_t,
  */
 static void reinstall_vip(host_t *vip, host_t *me)
 {
-       hydra->kernel_interface->del_ip(hydra->kernel_interface, vip);
-       hydra->kernel_interface->add_ip(hydra->kernel_interface, vip, me);
+       hydra->kernel_interface->del_ip(hydra->kernel_interface, vip, -1);
+       hydra->kernel_interface->add_ip(hydra->kernel_interface, vip, -1, me);
 }
 
 METHOD(child_sa_t, update, status_t,

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 0005188ad5dd4e970e43368919c51e71674365f0..63c34c3a52dc1bc9529b8d5ae9275b73bbee2ab9 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -742,8 +742,8 @@ METHOD(ike_sa_t, add_virtual_ip, void,
        if (local)
        {
                DBG1(DBG_IKE, "installing new virtual IP %H", ip);
-               if (hydra->kernel_interface->add_ip(hydra->kernel_interface, ip,
-                                                                                       this->my_host) == SUCCESS)
+               if (hydra->kernel_interface->add_ip(hydra->kernel_interface,
+                                                                                       ip, -1, this->my_host) == SUCCESS)
                {
                        this->my_vips->insert_last(this->my_vips, ip->clone(ip));
                }
@@ -769,7 +769,7 @@ METHOD(ike_sa_t, clear_virtual_ips, void,
        {
                if (local)
                {
-                       hydra->kernel_interface->del_ip(hydra->kernel_interface, vip);
+                       hydra->kernel_interface->del_ip(hydra->kernel_interface, vip, -1);
                }
                vip->destroy(vip);
        }
@@ -2076,7 +2076,7 @@ METHOD(ike_sa_t, destroy, void,
 
        while (this->my_vips->remove_last(this->my_vips, (void**)&vip) == SUCCESS)
        {
-               hydra->kernel_interface->del_ip(hydra->kernel_interface, vip);
+               hydra->kernel_interface->del_ip(hydra->kernel_interface, vip, -1);
                vip->destroy(vip);
        }
        this->my_vips->destroy(this->my_vips);

diff --git a/src/libhydra/kernel/kernel_interface.c b/src/libhydra/kernel/kernel_interface.c
index 5425861155f0fbd19924a10809c3bf45a1aa5f60..2fbe84818ce89b7f78a8851a95f85f48bee5d4a4 100644 (file)
--- a/src/libhydra/kernel/kernel_interface.c
+++ b/src/libhydra/kernel/kernel_interface.c
@@ -312,23 +312,24 @@ METHOD(kernel_interface_t, create_address_enumerator, enumerator_t*,
 }
 
 METHOD(kernel_interface_t, add_ip, status_t,
-       private_kernel_interface_t *this, host_t *virtual_ip, host_t *iface_ip)
+       private_kernel_interface_t *this, host_t *virtual_ip, int prefix,
+       host_t *iface_ip)
 {
        if (!this->net)
        {
                return NOT_SUPPORTED;
        }
-       return this->net->add_ip(this->net, virtual_ip, iface_ip);
+       return this->net->add_ip(this->net, virtual_ip, prefix, iface_ip);
 }
 
 METHOD(kernel_interface_t, del_ip, status_t,
-       private_kernel_interface_t *this, host_t *virtual_ip)
+       private_kernel_interface_t *this, host_t *virtual_ip, int prefix)
 {
        if (!this->net)
        {
                return NOT_SUPPORTED;
        }
-       return this->net->del_ip(this->net, virtual_ip);
+       return this->net->del_ip(this->net, virtual_ip, prefix);
 }
 
 METHOD(kernel_interface_t, add_route, status_t,

diff --git a/src/libhydra/kernel/kernel_interface.h b/src/libhydra/kernel/kernel_interface.h
index 7058466b18bb9da7515c599b63344717e52794e9..e3ebce8ee5f5fb1f0d63d5d256fa96ebe8e55c7c 100644 (file)
--- a/src/libhydra/kernel/kernel_interface.h
+++ b/src/libhydra/kernel/kernel_interface.h
@@ -336,10 +336,11 @@ struct kernel_interface_t {
         * The virtual IP is attached to the interface where the iface_ip is found.
         *
         * @param virtual_ip    virtual ip address to assign
+        * @param prefix                prefix length to install IP with, -1 for auto
         * @param iface_ip              IP of an interface to attach virtual IP
         * @return                              SUCCESS if operation completed
         */
-       status_t (*add_ip) (kernel_interface_t *this, host_t *virtual_ip,
+       status_t (*add_ip) (kernel_interface_t *this, host_t *virtual_ip, int prefix,
                                                host_t *iface_ip);
 
        /**
@@ -348,9 +349,10 @@ struct kernel_interface_t {
         * The kernel interface uses refcounting, see add_ip().
         *
         * @param virtual_ip    virtual ip address to assign
+        * @param prefix                prefix length of the IP to uninstall, -1 for auto
         * @return                              SUCCESS if operation completed
         */
-       status_t (*del_ip) (kernel_interface_t *this, host_t *virtual_ip);
+       status_t (*del_ip) (kernel_interface_t *this, host_t *virtual_ip, int prefix);
 
        /**
         * Add a route.

diff --git a/src/libhydra/kernel/kernel_net.h b/src/libhydra/kernel/kernel_net.h
index 0f2e31cc9b97f9c1474c6dc55e71116b48be3d01..50881ab4da5eeba92c3c7686a1d55fb7b33044cf 100644 (file)
--- a/src/libhydra/kernel/kernel_net.h
+++ b/src/libhydra/kernel/kernel_net.h
@@ -115,10 +115,11 @@ struct kernel_net_t {
         * The virtual IP is attached to the interface where the iface_ip is found.
         *
         * @param virtual_ip    virtual ip address to assign
+        * @param prefix                prefix length to install with IP address, -1 for auto
         * @param iface_ip              IP of an interface to attach virtual IP
         * @return                              SUCCESS if operation completed
         */
-       status_t (*add_ip) (kernel_net_t *this, host_t *virtual_ip,
+       status_t (*add_ip) (kernel_net_t *this, host_t *virtual_ip, int prefix,
                                                host_t *iface_ip);
 
        /**
@@ -127,9 +128,10 @@ struct kernel_net_t {
         * The kernel interface uses refcounting, see add_ip().
         *
         * @param virtual_ip    virtual ip address to assign
+        * @param prefix                prefix length of the IP to uninstall, -1 for auto
         * @return                              SUCCESS if operation completed
         */
-       status_t (*del_ip) (kernel_net_t *this, host_t *virtual_ip);
+       status_t (*del_ip) (kernel_net_t *this, host_t *virtual_ip, int prefix);
 
        /**
         * Add a route.

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
index 7653d470c6c18b824d881f9ee3070063c8cff133..7db51fc85cb051563ca0060c399608097aecfeb0 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
@@ -1634,7 +1634,7 @@ METHOD(kernel_net_t, get_nexthop, host_t*,
  * By setting the appropriate nlmsg_type, the ip will be set or unset.
  */
 static status_t manage_ipaddr(private_kernel_netlink_net_t *this, int nlmsg_type,
-                                                         int flags, int if_index, host_t *ip)
+                                                         int flags, int if_index, host_t *ip, int prefix)
 {
        netlink_buf_t request;
        struct nlmsghdr *hdr;
@@ -1653,7 +1653,7 @@ static status_t manage_ipaddr(private_kernel_netlink_net_t *this, int nlmsg_type
        msg = (struct ifaddrmsg*)NLMSG_DATA(hdr);
        msg->ifa_family = ip->get_family(ip);
        msg->ifa_flags = 0;
-       msg->ifa_prefixlen = 8 * chunk.len;
+       msg->ifa_prefixlen = prefix < 0 ? chunk.len * 8 : prefix;
        msg->ifa_scope = RT_SCOPE_UNIVERSE;
        msg->ifa_index = if_index;
 
@@ -1663,7 +1663,8 @@ static status_t manage_ipaddr(private_kernel_netlink_net_t *this, int nlmsg_type
 }
 
 METHOD(kernel_net_t, add_ip, status_t,
-       private_kernel_netlink_net_t *this, host_t *virtual_ip, host_t *iface_ip)
+       private_kernel_netlink_net_t *this, host_t *virtual_ip, int prefix,
+       host_t *iface_ip)
 {
        addr_map_entry_t *entry, lookup = {
                .ip = virtual_ip,
@@ -1738,7 +1739,7 @@ METHOD(kernel_net_t, add_ip, status_t,
                iface->addrs->insert_last(iface->addrs, addr);
                addr_map_entry_add(this->vips, addr, iface);
                if (manage_ipaddr(this, RTM_NEWADDR, NLM_F_CREATE | NLM_F_EXCL,
-                                                 iface->ifindex, virtual_ip) == SUCCESS)
+                                                 iface->ifindex, virtual_ip, prefix) == SUCCESS)
                {
                        while (!is_vip_installed_or_gone(this, virtual_ip, &entry))
                        {       /* wait until address appears */
@@ -1763,7 +1764,7 @@ METHOD(kernel_net_t, add_ip, status_t,
 }
 
 METHOD(kernel_net_t, del_ip, status_t,
-       private_kernel_netlink_net_t *this, host_t *virtual_ip)
+       private_kernel_netlink_net_t *this, host_t *virtual_ip, int prefix)
 {
        addr_map_entry_t *entry, lookup = {
                .ip = virtual_ip,
@@ -1802,7 +1803,7 @@ METHOD(kernel_net_t, del_ip, status_t,
                 * until the entry is gone, also so we can wait below */
                entry->addr->installed = FALSE;
                status = manage_ipaddr(this, RTM_DELADDR, 0, entry->iface->ifindex,
-                                                          virtual_ip);
+                                                          virtual_ip, prefix);
                if (status == SUCCESS)
                {       /* wait until the address is really gone */
                        while (is_known_vip(this, virtual_ip))

diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
index d45c5bb3fbff221db5e5e1b2f7f5a7477b9adf36..c53ec010c576d5fd788d11b26a950c5b7400c3d8 100644 (file)
--- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
+++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
@@ -640,13 +640,14 @@ METHOD(kernel_net_t, get_nexthop, host_t*,
 }
 
 METHOD(kernel_net_t, add_ip, status_t,
-       private_kernel_pfroute_net_t *this, host_t *virtual_ip, host_t *iface_ip)
+       private_kernel_pfroute_net_t *this, host_t *virtual_ip, int prefix,
+       host_t *iface_ip)
 {
        return FAILED;
 }
 
 METHOD(kernel_net_t, del_ip, status_t,
-       private_kernel_pfroute_net_t *this, host_t *virtual_ip)
+       private_kernel_pfroute_net_t *this, host_t *virtual_ip, int prefix)
 {
        return FAILED;
 }