move ip address parsing code to proto.c

diff --git a/proto-static.c b/proto-static.c
index 57da77dc0ed2676c089238b0763b8843fdcefc06..17cff0aa570bf0f7d87e6e60753b8a0971b7f16f 100644 (file)
--- a/proto-static.c
+++ b/proto-static.c
@@ -45,54 +45,14 @@ struct static_proto_state {
        struct blob_attr *config;
 };
 
-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);
-}
-
 static bool
 parse_addr(struct interface *iface, 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)) {
+       addr = proto_parse_ip_addr_string(str, v6, mask);
+       if (!addr) {
                interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
-               free(addr);
                return false;
        }
        vlist_add(&iface->proto_addr, &addr->node);

diff --git a/proto.c b/proto.c
index d8f16b33e2e45c9f5003e5c9670920edf0157e3b..99f083c60025c045897387c9febd29c8249667f0 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)

diff --git a/proto.h b/proto.h
index 1662ca994d7f5edd0f744f76e4dce830f56d658b..32f4ffcb68e6e464c538bdc653387b31e308f1c3 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -52,5 +52,6 @@ void proto_init_interface(struct interface *iface, struct blob_attr *attr);
 void proto_attach_interface(struct interface *iface, const char *proto_name);
 int interface_proto_event(struct interface_proto_state *proto,
                          enum interface_proto_cmd cmd, bool force);
+struct device_addr *proto_parse_ip_addr_string(const char *str, bool v6, int mask);
 
 #endif