interface-ip: add support for excluding interfaces in host route lookup

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index be150626bc02c01c78443f440ee03fe58c7d7495..2876e7d173fb5fef23732171f3aa431df4ce9f29 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -54,6 +54,7 @@ enum {
        HR_TARGET,
        HR_V6,
        HR_INTERFACE,
+       HR_EXCLUDE,
        __HR_MAX
 };
 
@@ -61,6 +62,7 @@ static const struct blobmsg_policy route_policy[__HR_MAX] = {
        [HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
        [HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
        [HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+       [HR_EXCLUDE] = { .name = "exclude", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static int
@@ -72,6 +74,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        struct interface *iface = NULL;
        union if_addr a;
        bool v6 = false;
+       bool exclude = false;
 
        blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg));
        if (!tb[HR_TARGET])
@@ -80,6 +83,9 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        if (tb[HR_V6])
                v6 = blobmsg_get_bool(tb[HR_V6]);
 
+       if (tb[HR_EXCLUDE])
+               exclude = blobmsg_get_bool(tb[HR_EXCLUDE]);
+
        if (tb[HR_INTERFACE])
                iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node);
 
@@ -87,8 +93,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a))
                return UBUS_STATUS_INVALID_ARGUMENT;
 
-
-       iface = interface_ip_add_target_route(&a, v6, iface);
+       iface = interface_ip_add_target_route(&a, v6, iface, exclude);
        if (!iface)
                return UBUS_STATUS_NOT_FOUND;
 
@@ -159,14 +164,12 @@ error:
 
 enum {
        NETNS_UPDOWN_JAIL,
-       NETNS_UPDOWN_PID,
        NETNS_UPDOWN_START,
        __NETNS_UPDOWN_MAX
 };
 
 static const struct blobmsg_policy netns_updown_policy[__NETNS_UPDOWN_MAX] = {
        [NETNS_UPDOWN_JAIL] = { .name = "jail", .type = BLOBMSG_TYPE_STRING },
-       [NETNS_UPDOWN_PID] = { .name = "pid", .type = BLOBMSG_TYPE_INT32 },
        [NETNS_UPDOWN_START] = { .name = "start", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -175,23 +178,26 @@ netifd_netns_updown(struct ubus_context *ctx, struct ubus_object *obj,
                  struct ubus_request_data *req, const char *method,
                  struct blob_attr *msg)
 {
+       int target_netns_fd = ubus_request_get_caller_fd(req);
        struct blob_attr *tb[__NETNS_UPDOWN_MAX];
-       char *jail;
-       pid_t netns_pid;
        bool start;
 
-       blobmsg_parse(netns_updown_policy, __NETNS_UPDOWN_MAX, tb, blob_data(msg), blob_len(msg));
-       if (!tb[NETNS_UPDOWN_JAIL] || !tb[NETNS_UPDOWN_PID])
+       if (target_netns_fd < 0)
                return UBUS_STATUS_INVALID_ARGUMENT;
 
+       blobmsg_parse(netns_updown_policy, __NETNS_UPDOWN_MAX, tb, blob_data(msg), blob_len(msg));
+
        start = tb[NETNS_UPDOWN_START] && blobmsg_get_bool(tb[NETNS_UPDOWN_START]);
-       jail = blobmsg_get_string(tb[NETNS_UPDOWN_JAIL]);
-       netns_pid = blobmsg_get_u32(tb[NETNS_UPDOWN_PID]);
 
-       if (start)
-               interface_start_jail(jail, netns_pid);
-       else
-               interface_stop_jail(jail, netns_pid);
+       if (start) {
+               if (!tb[NETNS_UPDOWN_JAIL])
+                       return UBUS_STATUS_INVALID_ARGUMENT;
+
+               interface_start_jail(target_netns_fd, blobmsg_get_string(tb[NETNS_UPDOWN_JAIL]));
+       } else {
+               interface_stop_jail(target_netns_fd);
+       }
+       close(target_netns_fd);
 
        return UBUS_STATUS_OK;
 }
@@ -291,7 +297,7 @@ netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 
 error:
-       device_free_unused(dev);
+       device_free_unused();
        return UBUS_STATUS_INVALID_ARGUMENT;
 }
 
@@ -338,10 +344,57 @@ netifd_handle_set_state(struct ubus_context *ctx, struct ubus_object *obj,
        return 0;
 }
 
+#ifdef DUMMY_MODE
+enum {
+    DEV_HOTPLUG_ATTR_NAME,
+    DEV_HOTPLUG_ATTR_ADD,
+    __DEV_HOTPLUG_ATTR_MAX,
+};
+
+static const struct blobmsg_policy dev_hotplug_policy[__DEV_HOTPLUG_ATTR_MAX] = {
+    [DEV_HOTPLUG_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+    [DEV_HOTPLUG_ATTR_ADD] = { "add", BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_handle_dev_hotplug(struct ubus_context *ctx, struct ubus_object *obj,
+                         struct ubus_request_data *req, const char *method,
+                         struct blob_attr *msg)
+{
+       struct blob_attr *tb[__DEV_HOTPLUG_ATTR_MAX];
+       const char *name;
+
+       blobmsg_parse(dev_hotplug_policy, __DEV_HOTPLUG_ATTR_MAX, tb,
+                     blob_data(msg), blob_len(msg));
+
+       if (!tb[DEV_HOTPLUG_ATTR_NAME] || !tb[DEV_HOTPLUG_ATTR_ADD])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       name = blobmsg_get_string(tb[DEV_HOTPLUG_ATTR_NAME]);
+       device_hotplug_event(name, blobmsg_get_bool(tb[DEV_HOTPLUG_ATTR_ADD]));
+
+       return 0;
+}
+#endif
+
+static int
+netifd_handle_stp_init(struct ubus_context *ctx, struct ubus_object *obj,
+                      struct ubus_request_data *req, const char *method,
+                      struct blob_attr *msg)
+{
+       device_stp_init();
+
+       return 0;
+}
+
 static struct ubus_method dev_object_methods[] = {
        UBUS_METHOD("status", netifd_dev_status, dev_policy),
        UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
        UBUS_METHOD("set_state", netifd_handle_set_state, dev_state_policy),
+#ifdef DUMMY_MODE
+       UBUS_METHOD("hotplug_event", netifd_handle_dev_hotplug, dev_hotplug_policy),
+#endif
+       UBUS_METHOD_NOARG("stp_init", netifd_handle_stp_init)
 };
 
 static struct ubus_object_type dev_object_type =
@@ -361,6 +414,11 @@ netifd_ubus_add_fd(void)
        system_fd_set_cloexec(ubus_ctx->sock.fd);
 }
 
+void netifd_ubus_device_notify(const char *event, struct blob_attr *data, int timeout)
+{
+       ubus_notify(ubus_ctx, &dev_object, event, data, timeout);
+}
+
 static void
 netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
 {
@@ -771,8 +829,8 @@ netifd_dump_status(struct interface *iface)
        if (iface->jail)
                blobmsg_add_string(&b, "jail", iface->jail);
 
-       if (iface->jail_ifname)
-               blobmsg_add_string(&b, "jail_ifname", iface->jail_ifname);
+       if (iface->jail_device)
+               blobmsg_add_string(&b, "jail_device", iface->jail_device);
 
        if (iface->state == IFS_UP) {
                if (iface->updated) {