#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include "netifd.h"
#include "device.h"
IFACE_ATTR_IFNAME,
IFACE_ATTR_PROTO,
IFACE_ATTR_AUTO,
+ IFACE_ATTR_JAIL,
+ IFACE_ATTR_JAIL_IFNAME,
IFACE_ATTR_DEFAULTROUTE,
IFACE_ATTR_PEERDNS,
IFACE_ATTR_DNS,
[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_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 },
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);
case IFS_DOWN:
if (iface->main_dev.dev)
device_release(&iface->main_dev);
+ break;
case IFS_TEARDOWN:
default:
break;
free(iface->config);
netifd_ubus_remove_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);
}
return;
}
- interface_write_resolv_conf();
+ interface_write_resolv_conf(iface->jail);
}
void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
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_ifname = NULL;
+ if ((cur = tb[IFACE_ATTR_JAIL_IFNAME]))
+ iface->jail_ifname = strdup(blobmsg_get_string(cur));
+
return iface;
}
}
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;
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;
}
}
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;
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);
}
}
}
+void
+interface_start_jail(const char *jail, const pid_t netns_pid)
+{
+ struct interface *iface;
+ int netns_fd;
+ int wstatus;
+ pid_t pr = 0;
+
+ netns_fd = system_netns_open(netns_pid);
+ if (netns_fd < 0)
+ return;
+
+ 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_ifname);
+ }
+
+ close(netns_fd);
+
+ pr = fork();
+ if (pr) {
+ waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
+ 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);
+}
+
+void
+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;
+
+ pr = fork();
+ if (pr) {
+ waitpid(pr, &wstatus, WUNTRACED | WCONTINUED);
+ return;
+ }
+
+ /* child process */
+ root_netns = system_netns_open(parent_pid);
+ if (root_netns < 0)
+ return;
+
+ 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;
+
+ 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->main_dev.dev, root_netns, orig_ifname);
+ }
+
+ close(root_netns);
+ close(netns_fd);
+ _exit(0);
+}
+
static void
set_config_state(struct interface *iface, enum interface_config_state s)
{
if_old->device_config = if_new->device_config;
if_old->config_autostart = if_new->config_autostart;
+ 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_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;
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);
projects / project / netifd.git / blobdiff