move ip address parsing code to proto.c

[project/netifd.git] / proto.c

diff --git a/proto.c b/proto.c
index 5126107..99f083c 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -2,12 +2,69 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 
 static struct avl_tree handlers;
 
+static bool
+split_netmask(char *str, unsigned int *netmask)
+{
+       char *delim, *err = NULL;
+
+       delim = strchr(str, '/');
+       if (delim) {
+               *(delim++) = 0;
+
+               *netmask = strtoul(delim, &err, 10);
+               if (err && *err)
+                       return false;
+       }
+       return true;
+}
+
+static int
+parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
+{
+       char *astr = alloca(strlen(str) + 1);
+
+       strcpy(astr, str);
+       if (!split_netmask(astr, netmask))
+               return 0;
+
+       if (af == AF_INET6) {
+               if (*netmask > 128)
+                       return 0;
+       } else {
+               if (*netmask > 32)
+                       return 0;
+       }
+
+       return inet_pton(af, str, addr);
+}
+
+struct device_addr *
+proto_parse_ip_addr_string(const char *str, bool v6, int mask)
+{
+       struct device_addr *addr;
+       int af = v6 ? AF_INET6 : AF_INET;
+
+       addr = calloc(1, sizeof(*addr));
+       addr->flags = v6 ? DEVADDR_INET6 : DEVADDR_INET4;
+       addr->mask = mask;
+       if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
+               free(addr);
+               return NULL;
+       }
+       return addr;
+}
+
+
 void add_proto_handler(struct proto_handler *p)
 {
        if (!handlers.comp)
@@ -35,28 +92,38 @@ invalid_proto_handler(struct interface_proto_state *proto,
 
 static int
 no_proto_handler(struct interface_proto_state *proto,
-                     enum interface_proto_cmd cmd, bool force)
+                enum interface_proto_cmd cmd, bool force)
 {
        return 0;
 }
 
 static struct interface_proto_state *
-get_default_proto(void)
+default_proto_attach(const struct proto_handler *h,
+                    struct interface *iface, struct blob_attr *attr)
 {
        struct interface_proto_state *proto;
 
        proto = calloc(1, sizeof(*proto));
        proto->free = default_proto_free;
-       proto->flags = PROTO_FLAG_IMMEDIATE;
+       proto->cb = no_proto_handler;
 
        return proto;
 }
 
-struct proto_handler *
+static const struct proto_handler no_proto = {
+       .name = "none",
+       .flags = PROTO_FLAG_IMMEDIATE,
+       .attach = default_proto_attach,
+};
+
+static const struct proto_handler *
 get_proto_handler(const char *name)
 {
        struct proto_handler *proto;
 
+       if (!strcmp(name, "none"))
+           return &no_proto;
+
        if (!handlers.comp)
                return NULL;
 
@@ -64,44 +131,39 @@ get_proto_handler(const char *name)
 }
 
 void
-proto_attach_interface(struct interface *iface, struct uci_section *s)
+proto_init_interface(struct interface *iface, struct blob_attr *attr)
 {
+       const struct proto_handler *proto = iface->proto_handler;
        struct interface_proto_state *state = NULL;
-       struct proto_handler *proto = NULL;
-       const char *proto_name;
-       const char *error = NULL;
 
-       proto_name = uci_lookup_option_string(uci_ctx, s, "proto");
-       if (!proto_name) {
-               error = "NO_PROTO";
-               goto error;
-       }
+       if (proto)
+               state = proto->attach(proto, iface, attr);
 
-       if (!strcmp(proto_name, "none")) {
-               state = get_default_proto();
-               state->handler = no_proto_handler;
-               goto out;
+       if (!state) {
+               state = no_proto.attach(&no_proto, iface, attr);
+               state->cb = invalid_proto_handler;
        }
 
-       proto = get_proto_handler(proto_name);
-       if (!proto) {
-               error = "INVALID_PROTO";
-               goto error;
-       }
+       state->handler = proto;
+       interface_set_proto_state(iface, state);
+}
 
-       state = proto->attach(proto, iface, s);
+void
+proto_attach_interface(struct interface *iface, const char *proto_name)
+{
+       const struct proto_handler *proto = NULL;
 
-error:
-       if (error) {
-               interface_add_error(iface, "proto", error, NULL, 0);
-               state = get_default_proto();
-               state->handler = invalid_proto_handler;
+       if (!proto_name) {
+               interface_add_error(iface, "proto", "NO_PROTO", NULL, 0);
+               return;
        }
 
-out:
-       interface_set_proto_state(iface, state);
-}
+       proto = get_proto_handler(proto_name);
+       if (!proto)
+               interface_add_error(iface, "proto", "INVALID_PROTO", NULL, 0);
 
+       iface->proto_handler = proto;
+}
 
 int
 interface_proto_event(struct interface_proto_state *proto,
@@ -110,8 +172,8 @@ interface_proto_event(struct interface_proto_state *proto,
        enum interface_event ev;
        int ret;
 
-       ret = proto->handler(proto, cmd, force);
-       if (ret || !(proto->flags & PROTO_FLAG_IMMEDIATE))
+       ret = proto->cb(proto, cmd, force);
+       if (ret || !(proto->handler->flags & PROTO_FLAG_IMMEDIATE))
                goto out;
 
        switch(cmd) {