convert interface event queueing to global interface notifier

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 1a260cc..e77b54f 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -12,6 +12,42 @@
 
 static struct avl_tree handlers;
 
+enum {
+       OPT_IPADDR,
+       OPT_IP6ADDR,
+       OPT_NETMASK,
+       OPT_BROADCAST,
+       OPT_GATEWAY,
+       OPT_IP6GW,
+       OPT_DNS,
+       OPT_DNS_SEARCH,
+       __OPT_MAX,
+};
+
+static const struct blobmsg_policy proto_ip_attributes[__OPT_MAX] = {
+       [OPT_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
+       [OPT_BROADCAST] = { .name = "broadcast", .type = BLOBMSG_TYPE_STRING },
+       [OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
+       [OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
+       [OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
+};
+
+static const union config_param_info proto_ip_attr_info[__OPT_MAX] = {
+       [OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
+       [OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
+       [OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
+};
+
+const struct config_param_list proto_ip_attr = {
+       .n_params = __OPT_MAX,
+       .params = proto_ip_attributes,
+       .info = proto_ip_attr_info,
+};
+
+
 unsigned int
 parse_netmask_string(const char *str, bool v6)
 {
@@ -72,7 +108,7 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
        return inet_pton(af, astr, addr);
 }
 
-struct device_addr *
+static struct device_addr *
 proto_parse_ip_addr_string(const char *str, bool v6, int mask)
 {
        struct device_addr *addr;
@@ -88,6 +124,137 @@ proto_parse_ip_addr_string(const char *str, bool v6, int mask)
        return addr;
 }
 
+static bool
+parse_addr(struct interface *iface, const char *str, bool v6, int mask,
+          bool ext, uint32_t broadcast)
+{
+       struct device_addr *addr;
+
+       addr = proto_parse_ip_addr_string(str, v6, mask);
+       if (!addr) {
+               interface_add_error(iface, "proto", "INVALID_ADDRESS", &str, 1);
+               return false;
+       }
+
+       if (broadcast)
+               addr->broadcast = broadcast;
+
+       if (ext)
+               addr->flags |= DEVADDR_EXTERNAL;
+
+       vlist_add(&iface->proto_ip.addr, &addr->node, &addr->flags);
+       return true;
+}
+
+static int
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6,
+                    int netmask, bool ext, uint32_t broadcast)
+{
+       struct blob_attr *cur;
+       int n_addr = 0;
+       int rem;
+
+       blobmsg_for_each_attr(cur, attr, rem) {
+               if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+                       return -1;
+
+               n_addr++;
+               if (!parse_addr(iface, blobmsg_data(cur), v6, netmask, ext,
+                               broadcast))
+                       return -1;
+       }
+
+       return n_addr;
+}
+
+
+static bool
+parse_gateway_option(struct interface *iface, struct blob_attr *attr, bool v6)
+{
+       struct device_route *route;
+       const char *str = blobmsg_data(attr);
+       int af = v6 ? AF_INET6 : AF_INET;
+
+       route = calloc(1, sizeof(*route));
+       if (!inet_pton(af, str, &route->nexthop)) {
+               interface_add_error(iface, "proto", "INVALID_GATEWAY", &str, 1);
+               free(route);
+               return false;
+       }
+
+       route->mask = 0;
+       route->flags = (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+       vlist_add(&iface->proto_ip.route, &route->node, &route->flags);
+
+       return true;
+}
+
+int
+proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext)
+{
+       struct blob_attr *tb[__OPT_MAX];
+       struct blob_attr *cur;
+       const char *error;
+       unsigned int netmask = 32;
+       int n_v4 = 0, n_v6 = 0;
+       struct in_addr bcast = {};
+
+       blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
+
+       if ((cur = tb[OPT_NETMASK])) {
+               netmask = parse_netmask_string(blobmsg_data(cur), false);
+               if (netmask > 32) {
+                       error = "INVALID_NETMASK";
+                       goto error;
+               }
+       }
+
+       if ((cur = tb[OPT_BROADCAST])) {
+               if (!inet_pton(AF_INET, blobmsg_data(cur), &bcast)) {
+                       error = "INVALID_BROADCAST";
+                       goto error;
+               }
+       }
+
+       if ((cur = tb[OPT_IPADDR]))
+               n_v4 = parse_address_option(iface, cur, false,
+                       netmask, ext, bcast.s_addr);
+
+       if ((cur = tb[OPT_IP6ADDR]))
+               n_v6 = parse_address_option(iface, cur, true,
+                       netmask, ext, 0);
+
+       if (!n_v4 && !n_v6) {
+               error = "NO_ADDRESS";
+               goto error;
+       }
+
+       if (n_v4 < 0 || n_v6 < 0)
+               goto out;
+
+       if ((cur = tb[OPT_GATEWAY])) {
+               if (n_v4 && !parse_gateway_option(iface, cur, false))
+                       goto out;
+       }
+
+       if ((cur = tb[OPT_IP6GW])) {
+               if (n_v6 && !parse_gateway_option(iface, cur, true))
+                       goto out;
+       }
+
+       if ((cur = tb[OPT_DNS]))
+               interface_add_dns_server_list(&iface->proto_ip, cur);
+
+       if ((cur = tb[OPT_DNS_SEARCH]))
+               interface_add_dns_search_list(&iface->proto_ip, cur);
+
+       return 0;
+
+error:
+       interface_add_error(iface, "proto", error, NULL, 0);
+out:
+       return -1;
+}
 
 void add_proto_handler(struct proto_handler *p)
 {