fix unannotated fall-through warnings

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 51f6e51174341416278a6cb2bfae5a4ac3cad4c4..2a8f604207c3fdd1e47348274fce0428727906bf 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -34,6 +34,7 @@ enum {
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,
        IFACE_ATTR_JAIL,
+       IFACE_ATTR_JAIL_IFNAME,
        IFACE_ATTR_DEFAULTROUTE,
        IFACE_ATTR_PEERDNS,
        IFACE_ATTR_DNS,
@@ -58,6 +59,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [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_IFNAME] = { .name = "jail_ifname", .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 },
@@ -243,7 +245,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);
@@ -317,6 +319,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;
@@ -686,6 +689,8 @@ interface_do_free(struct interface *iface)
        avl_delete(&interfaces.avl, &iface->node.avl);
        if (iface->jail)
                free(iface->jail);
+       if (iface->jail_ifname)
+               free(iface->jail_ifname);
 
        free(iface);
 }
@@ -900,6 +905,10 @@ interface_alloc(const char *name, struct blob_attr *config, bool dynamic)
                iface->autostart = false;
        }
 
+       iface->jail_ifname = NULL;
+       if ((cur = tb[IFACE_ATTR_JAIL_IFNAME]))
+               iface->jail_ifname = strdup(blobmsg_get_string(cur));
+
        return iface;
 }
 
@@ -1030,7 +1039,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;
 
@@ -1042,7 +1052,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;
        }
@@ -1056,7 +1066,8 @@ 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;
@@ -1071,9 +1082,10 @@ interface_handle_link(struct interface *iface, const char *name, bool add, bool
 
        if (add) {
                interface_set_device_config(iface, dev);
-               device_set_present(dev, true);
+               if (!link_ext)
+                       device_set_present(dev, true);
 
-               ret = interface_add_link(iface, dev, link_ext);
+               ret = interface_add_link(iface, dev, vlan, link_ext);
        } else {
                ret = interface_remove_link(iface, dev);
        }
@@ -1163,24 +1175,43 @@ interface_start_jail(const char *jail, const pid_t netns_pid)
                if (!iface->jail || strcmp(iface->jail, jail))
                        continue;
 
-               system_link_netns_move(iface->ifname, netns_fd);
+               system_link_netns_move(iface->main_dev.dev, netns_fd, iface->jail_ifname);
        }
 
+       close(netns_fd);
+
        pr = fork();
        if (pr) {
                waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
-               close(netns_fd);
                return;
        }
 
+       /* child process */
+       netns_fd = system_netns_open(netns_pid);
+       if (netns_fd < 0)
+               return;
+
        system_netns_set(netns_fd);
        system_init();
        vlist_for_each_element(&interfaces, iface, node) {
                if (!iface->jail || strcmp(iface->jail, jail))
                        continue;
 
+               /*
+                * The interface has already been renamed and is inside target
+                * namespace, hence overwrite ifname with jail_ifname for
+                * interface_set_up().
+                * We are inside a fork which got it's own copy of the interfaces
+                * list, so we can mess with it :)
+                */
+               if (iface->jail_ifname)
+                       iface->ifname = iface->jail_ifname;
+
+               interface_do_reload(iface);
                interface_set_up(iface);
        }
+
+       close(netns_fd);
        _exit(0);
 }
 
@@ -1190,23 +1221,24 @@ interface_stop_jail(const char *jail, const pid_t netns_pid)
        struct interface *iface;
        int netns_fd, root_netns;
        int wstatus;
+       pid_t parent_pid = getpid();
        pid_t pr = 0;
+       const char *orig_ifname;
 
-       netns_fd = system_netns_open(netns_pid);
-       if (netns_fd < 0)
+       pr = fork();
+       if (pr) {
+               waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
                return;
+       }
 
-       root_netns = system_netns_open(getpid());
+       /* child process */
+       root_netns = system_netns_open(parent_pid);
        if (root_netns < 0)
                return;
 
-       pr = fork();
-       if (pr) {
-               waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
-               close(netns_fd);
-               close(root_netns);
+       netns_fd = system_netns_open(netns_pid);
+       if (netns_fd < 0)
                return;
-       }
 
        system_netns_set(netns_fd);
        system_init();
@@ -1214,9 +1246,17 @@ interface_stop_jail(const char *jail, const pid_t netns_pid)
                if (!iface->jail || strcmp(iface->jail, jail))
                        continue;
 
+               orig_ifname = iface->ifname;
+               if (iface->jail_ifname)
+                       iface->ifname = iface->jail_ifname;
+
+               interface_do_reload(iface);
                interface_set_down(iface);
-               system_link_netns_move(iface->ifname, root_netns);
+               system_link_netns_move(iface->main_dev.dev, root_netns, orig_ifname);
        }
+
+       close(root_netns);
+       close(netns_fd);
        _exit(0);
 }
 
@@ -1335,6 +1375,11 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if (if_old->jail)
                if_old->autostart = false;
 
+       if (if_old->jail_ifname)
+               free(if_old->jail_ifname);
+
+       if_old->jail_ifname = if_new->jail_ifname;
+
        if_old->ifname = if_new->ifname;
        if_old->parent_ifname = if_new->parent_ifname;
        if_old->dynamic = if_new->dynamic;