do not replace proto_ip dns servers on config reload

[project/netifd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 4746c4f..a00226f 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -1,3 +1,16 @@
+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 #define _GNU_SOURCE
 
 #include <arpa/inet.h>
@@ -27,16 +40,61 @@ netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
 
 static int
 netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
+                    struct ubus_request_data *req, const char *method,
+                    struct blob_attr *msg)
+{
+       netifd_reload();
+       return 0;
+}
+
+enum {
+       HR_TARGET,
+       HR_V6,
+       __HR_MAX
+};
+
+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 },
+};
+
+static int
+netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
                      struct ubus_request_data *req, const char *method,
                      struct blob_attr *msg)
 {
-       netifd_reload();
+       struct blob_attr *tb[__HR_MAX];
+       struct interface *iface;
+       union if_addr a;
+       bool v6 = false;
+
+       blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg));
+       if (!tb[HR_TARGET])
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       if (tb[HR_V6])
+               v6 = blobmsg_get_bool(tb[HR_V6]);
+
+       memset(&a, 0, sizeof(a));
+       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);
+       if (!iface)
+               return UBUS_STATUS_NOT_FOUND;
+
+       blob_buf_init(&b, 0);
+       blobmsg_add_string(&b, "interface", iface->name);
+       ubus_send_reply(ctx, req, b.head);
+
        return 0;
 }
 
 static struct ubus_method main_object_methods[] = {
        { .name = "restart", .handler = netifd_handle_restart },
        { .name = "reload", .handler = netifd_handle_reload },
+       UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
 };
 
 static struct ubus_object_type main_object_type =
@@ -232,7 +290,7 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
 }
 
 static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
 {
        struct device_addr *addr;
        char *buf;
@@ -246,6 +304,9 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip)
                else
                        af = AF_INET6;
 
+               if (af != (v6 ? AF_INET6 : AF_INET))
+                       continue;
+
                a = blobmsg_open_table(&b, NULL);
 
                buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
@@ -318,9 +379,13 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
                blobmsg_add_string(&b, "device", dev->ifname);
 
        if (iface->state == IFS_UP) {
-               a = blobmsg_open_array(&b, "address");
-               interface_ip_dump_address_list(&iface->config_ip);
-               interface_ip_dump_address_list(&iface->proto_ip);
+               a = blobmsg_open_array(&b, "ipv4-address");
+               interface_ip_dump_address_list(&iface->config_ip, false);
+               interface_ip_dump_address_list(&iface->proto_ip, false);
+               blobmsg_close_array(&b, a);
+               a = blobmsg_open_array(&b, "ipv6-address");
+               interface_ip_dump_address_list(&iface->config_ip, true);
+               interface_ip_dump_address_list(&iface->proto_ip, true);
                blobmsg_close_array(&b, a);
                a = blobmsg_open_array(&b, "route");
                interface_ip_dump_route_list(&iface->config_ip);