interface-ip: unify host and proto route handling

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index b8c4ae23a2f1cadbc48541f929763860f7ff3d43..b3bb60121306006b21c917dee4f446bb2d5b20e3 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -14,6 +14,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "netifd.h"
 #include "device.h"
@@ -28,9 +30,14 @@ struct vlist_tree interfaces;
 static LIST_HEAD(iface_all_users);
 
 enum {
-       IFACE_ATTR_IFNAME,
+       IFACE_ATTR_DEVICE,
+       IFACE_ATTR_IFNAME, /* Backward compatibility */
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,
+       IFACE_ATTR_JAIL,
+       IFACE_ATTR_JAIL_DEVICE,
+       IFACE_ATTR_JAIL_IFNAME,
+       IFACE_ATTR_HOST_DEVICE,
        IFACE_ATTR_DEFAULTROUTE,
        IFACE_ATTR_PEERDNS,
        IFACE_ATTR_DNS,
@@ -51,9 +58,14 @@ enum {
 };
 
 static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
+       [IFACE_ATTR_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
+       [IFACE_ATTR_JAIL] = { .name = "jail", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_JAIL_DEVICE] = { .name = "jail_device", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_JAIL_IFNAME] = { .name = "jail_ifname", .type = BLOBMSG_TYPE_STRING },
+       [IFACE_ATTR_HOST_DEVICE] = { .name = "host_device", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_PEERDNS] = { .name = "peerdns", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 },
@@ -93,6 +105,17 @@ interface_error_flush(struct interface *iface)
        }
 }
 
+static bool
+interface_force_link(struct interface *iface)
+{
+       struct device *dev = iface->main_dev.dev;
+
+       if (dev && dev->settings.auth)
+               return false;
+
+       return iface->force_link;
+}
+
 static void
 interface_clear_errors(struct interface *iface)
 {
@@ -239,7 +262,7 @@ interface_event(struct interface *iface, enum interface_event ev)
        case IFEV_UP:
                interface_error_flush(iface);
                adev = iface->l3_dev.dev;
-               /* fall through */
+               fallthrough;
        case IFEV_DOWN:
        case IFEV_UP_FAILED:
                alias_notify_device(iface->name, adev);
@@ -269,6 +292,7 @@ mark_interface_down(struct interface *iface)
        iface->state = IFS_DOWN;
        switch (state) {
        case IFS_UP:
+       case IFS_TEARDOWN:
                interface_event(iface, IFEV_DOWN);
                break;
        case IFS_SETUP:
@@ -312,6 +336,7 @@ __interface_set_down(struct interface *iface, bool force)
        case IFS_DOWN:
                if (iface->main_dev.dev)
                        device_release(&iface->main_dev);
+               break;
        case IFS_TEARDOWN:
        default:
                break;
@@ -336,17 +361,17 @@ __interface_set_up(struct interface *iface)
 static void
 interface_check_state(struct interface *iface)
 {
-       bool link_state = iface->link_state || iface->force_link;
+       bool link_state = iface->link_state || interface_force_link(iface);
 
        switch (iface->state) {
        case IFS_UP:
        case IFS_SETUP:
                if (!iface->enabled || !link_state) {
-                       interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
+                       iface->state = IFS_TEARDOWN;
                        if (iface->dynamic)
                                __set_config_state(iface, IFC_REMOVE);
 
-                       mark_interface_down(iface);
+                       interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
                }
                break;
        case IFS_DOWN:
@@ -382,7 +407,8 @@ interface_set_link_state(struct interface *iface, bool new_state)
        iface->link_state = new_state;
        interface_check_state(iface);
 
-       if (new_state && iface->force_link && iface->state == IFS_UP && !iface->link_up_event) {
+       if (new_state && interface_force_link(iface) &&
+           iface->state == IFS_UP && !iface->link_up_event) {
                interface_event(iface, IFEV_LINK_UP);
                iface->link_up_event = true;
        }
@@ -416,11 +442,10 @@ interface_main_dev_cb(struct device_user *dep, enum device_event ev)
        case DEV_EVENT_DOWN:
                interface_set_enabled(iface, false);
                break;
+       case DEV_EVENT_AUTH_UP:
        case DEV_EVENT_LINK_UP:
-               interface_set_link_state(iface, true);
-               break;
        case DEV_EVENT_LINK_DOWN:
-               interface_set_link_state(iface, false);
+               interface_set_link_state(iface, device_link_active(dep->dev));
                break;
        case DEV_EVENT_TOPO_CHANGE:
                interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
@@ -496,7 +521,7 @@ interface_add_assignment_classes(struct interface *iface, struct blob_attr *list
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
                        continue;
 
-               if (!blobmsg_check_attr(cur, NULL))
+               if (!blobmsg_check_attr(cur, false))
                        continue;
 
                struct interface_assignment_class *c = malloc(sizeof(*c) + blobmsg_data_len(cur));
@@ -616,15 +641,13 @@ interface_claim_device(struct interface *iface)
        if (iface->parent_iface.iface)
                interface_remove_user(&iface->parent_iface);
 
-       device_lock();
-
        if (iface->parent_ifname) {
                parent = vlist_find(&interfaces, iface->parent_ifname, parent, node);
                iface->parent_iface.cb = interface_alias_cb;
                interface_add_user(&iface->parent_iface, parent);
-       } else if (iface->ifname &&
+       } else if (iface->device &&
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
-               dev = device_get(iface->ifname, true);
+               dev = device_get(iface->device, true);
                interface_set_device_config(iface, dev);
        } else {
                dev = iface->ext_dev.dev;
@@ -633,8 +656,6 @@ interface_claim_device(struct interface *iface)
        if (dev)
                interface_set_main_dev(iface, dev);
 
-       device_unlock();
-
        if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE)
                interface_set_available(iface, true);
 }
@@ -679,6 +700,13 @@ interface_do_free(struct interface *iface)
        free(iface->config);
        netifd_ubus_remove_interface(iface);
        avl_delete(&interfaces.avl, &iface->node.avl);
+       if (iface->jail)
+               free(iface->jail);
+       if (iface->jail_device)
+               free(iface->jail_device);
+       if (iface->host_device)
+               free(iface->host_device);
+
        free(iface);
 }
 
@@ -759,7 +787,7 @@ interface_proto_event_cb(struct interface_proto_state *state, enum interface_pro
                return;
        }
 
-       interface_write_resolv_conf();
+       interface_write_resolv_conf(iface->jail);
 }
 
 void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
@@ -885,6 +913,23 @@ interface_alloc(const char *name, struct blob_attr *config, bool dynamic)
        iface->proto_ip.no_delegation = !blobmsg_get_bool_default(tb[IFACE_ATTR_DELEGATE], true);
 
        iface->config_autostart = iface->autostart;
+       iface->jail = NULL;
+
+       if ((cur = tb[IFACE_ATTR_JAIL])) {
+               iface->jail = strdup(blobmsg_get_string(cur));
+               iface->autostart = false;
+       }
+
+       iface->jail_device = NULL;
+       if ((cur = tb[IFACE_ATTR_JAIL_DEVICE]))
+               iface->jail_device = strdup(blobmsg_get_string(cur));
+       else if ((cur = tb[IFACE_ATTR_JAIL_IFNAME]))
+               iface->jail_device = strdup(blobmsg_get_string(cur));
+
+       iface->host_device = NULL;
+       if ((cur = tb[IFACE_ATTR_HOST_DEVICE]))
+               iface->host_device = strdup(blobmsg_get_string(cur));
+
        return iface;
 }
 
@@ -904,8 +949,11 @@ static bool __interface_add(struct interface *iface, struct blob_attr *config, b
                if (!iface->parent_ifname)
                        return false;
        } else {
-               if ((cur = tb[IFACE_ATTR_IFNAME]))
-                       iface->ifname = blobmsg_data(cur);
+               cur = tb[IFACE_ATTR_DEVICE];
+               if (!cur)
+                       cur = tb[IFACE_ATTR_IFNAME];
+               if (cur)
+                       iface->device = blobmsg_data(cur);
        }
 
        if (iface->dynamic) {
@@ -994,12 +1042,13 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
 }
 
 static int
-interface_remove_link(struct interface *iface, struct device *dev)
+interface_remove_link(struct interface *iface, struct device *dev,
+                     struct blob_attr *vlan)
 {
        struct device *mdev = iface->main_dev.dev;
 
        if (mdev && mdev->hotplug_ops)
-               return mdev->hotplug_ops->del(mdev, dev);
+               return mdev->hotplug_ops->del(mdev, dev, vlan);
 
        if (dev == iface->ext_dev.dev)
                device_remove_user(&iface->ext_dev);
@@ -1015,7 +1064,8 @@ interface_remove_link(struct interface *iface, struct device *dev)
 }
 
 static int
-interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
+interface_add_link(struct interface *iface, struct device *dev,
+                  struct blob_attr *vlan, bool link_ext)
 {
        struct device *mdev = iface->main_dev.dev;
 
@@ -1027,7 +1077,7 @@ interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
 
        if (mdev) {
                if (mdev->hotplug_ops)
-                       return mdev->hotplug_ops->add(mdev, dev);
+                       return mdev->hotplug_ops->add(mdev, dev, vlan);
                else
                        return UBUS_STATUS_NOT_SUPPORTED;
        }
@@ -1041,32 +1091,23 @@ interface_add_link(struct interface *iface, struct device *dev, bool link_ext)
 }
 
 int
-interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext)
+interface_handle_link(struct interface *iface, const char *name,
+                     struct blob_attr *vlan, bool add, bool link_ext)
 {
        struct device *dev;
-       int ret;
-
-       device_lock();
 
        dev = device_get(name, add ? (link_ext ? 2 : 1) : 0);
-       if (!dev) {
-               ret = UBUS_STATUS_NOT_FOUND;
-               goto out;
-       }
-
-       if (add) {
-               interface_set_device_config(iface, dev);
-               device_set_present(dev, true);
+       if (!dev)
+               return UBUS_STATUS_NOT_FOUND;
 
-               ret = interface_add_link(iface, dev, link_ext);
-       } else {
-               ret = interface_remove_link(iface, dev);
-       }
+       if (!add)
+               return interface_remove_link(iface, dev, vlan);
 
-out:
-       device_unlock();
+       interface_set_device_config(iface, dev);
+       if (!link_ext)
+               device_set_present(dev, true);
 
-       return ret;
+       return interface_add_link(iface, dev, vlan, link_ext);
 }
 
 void
@@ -1132,6 +1173,32 @@ interface_start_pending(void)
        }
 }
 
+void
+interface_start_jail(int netns_fd, const char *jail)
+{
+       struct interface *iface;
+
+       vlist_for_each_element(&interfaces, iface, node) {
+               if (!iface->jail || strcmp(iface->jail, jail))
+                       continue;
+
+               system_link_netns_move(iface->main_dev.dev, netns_fd, iface->jail_device);
+       }
+}
+
+void
+interface_stop_jail(int netns_fd)
+{
+       struct interface *iface;
+       char *orig_ifname;
+
+       vlist_for_each_element(&interfaces, iface, node) {
+               orig_ifname = iface->host_device;
+               interface_set_down(iface);
+               system_link_netns_move(iface->main_dev.dev, netns_fd, orig_ifname);
+       }
+}
+
 static void
 set_config_state(struct interface *iface, enum interface_config_state s)
 {
@@ -1213,7 +1280,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if (!reload && interface_device_config_changed(if_old, if_new))
                reload = true;
 
-       if (FIELD_CHANGED_STR(ifname) ||
+       if (FIELD_CHANGED_STR(device) ||
            if_old->proto_handler != if_new->proto_handler)
                reload = true;
 
@@ -1240,7 +1307,24 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
 
        if_old->device_config = if_new->device_config;
        if_old->config_autostart = if_new->config_autostart;
-       if_old->ifname = if_new->ifname;
+       if (if_old->jail)
+               free(if_old->jail);
+
+       if_old->jail = if_new->jail;
+       if (if_old->jail)
+               if_old->autostart = false;
+
+       if (if_old->jail_device)
+               free(if_old->jail_device);
+
+       if_old->jail_device = if_new->jail_device;
+
+       if (if_old->host_device)
+               free(if_old->host_device);
+
+       if_old->host_device = if_new->host_device;
+
+       if_old->device = if_new->device;
        if_old->parent_ifname = if_new->parent_ifname;
        if_old->dynamic = if_new->dynamic;
        if_old->proto_handler = if_new->proto_handler;
@@ -1284,7 +1368,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if (update_prefix_delegation)
                interface_update_prefix_delegation(&if_old->proto_ip);
 
-       interface_write_resolv_conf();
+       interface_write_resolv_conf(if_old->jail);
        if (if_old->main_dev.dev)
                interface_check_state(if_old);