From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 26 Feb 2012 16:08:17 +0000 (+0100)
Subject: move static address setup to proto.c in preparation for unifying it with the proto... 
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=285039a8783654439d9c0e29aac16e3893e2444b;p=oweals%2Fnetifd.git

move static address setup to proto.c in preparation for unifying it with the proto-shell code doing similar things
---

diff --git a/proto-static.c b/proto-static.c
index ca39b7c..4ee4793 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -11,151 +11,16 @@
 #include "proto.h"
 #include "system.h"
 
-enum {
-	OPT_IPADDR,
-	OPT_IP6ADDR,
-	OPT_NETMASK,
-	OPT_GATEWAY,
-	OPT_IP6GW,
-	OPT_DNS,
-	__OPT_MAX,
-};
-
-static const struct blobmsg_policy static_attrs[__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_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
-	[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
-	[OPT_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-static const union config_param_info static_attr_info[__OPT_MAX] = {
-	[OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
-	[OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
-	[OPT_DNS] = { .type = BLOBMSG_TYPE_STRING },
-};
-
-static const struct config_param_list static_attr_list = {
-	.n_params = __OPT_MAX,
-	.params = static_attrs,
-	.info = static_attr_info,
-};
-
 struct static_proto_state {
 	struct interface_proto_state proto;
 
 	struct blob_attr *config;
 };
 
-static bool
-parse_addr(struct interface *iface, const char *str, bool v6, int mask)
-{
-	struct device_addr *addr;
-
-	addr = proto_parse_ip_addr_string(str, v6, mask);
-	if (!addr) {
-		interface_add_error(iface, "proto-static", "INVALID_ADDRESS", &str, 1);
-		return false;
-	}
-	vlist_add(&iface->proto_ip.addr, &addr->node);
-	return true;
-}
-
-static int
-parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask)
-{
-	struct blob_attr *cur;
-	int n_addr = 0;
-	int rem;
-
-	blobmsg_for_each_attr(cur, attr, rem) {
-		n_addr++;
-		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask))
-			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-static",
-				"INVALID_GATEWAY", &str, 1);
-		free(route);
-		return false;
-	}
-	route->mask = 0;
-	route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
-	vlist_add(&iface->proto_ip.route, &route->node);
-
-	return true;
-}
-
-static int
-proto_apply_static_settings(struct interface *iface, struct blob_attr *attr)
-{
-	struct blob_attr *tb[__OPT_MAX];
-	const char *error;
-	unsigned int netmask = 32;
-	int n_v4 = 0, n_v6 = 0;
-
-	blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
-
-	if (tb[OPT_NETMASK]) {
-		netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
-		if (netmask > 32) {
-			error = "INVALID_NETMASK";
-			goto error;
-		}
-	}
-
-	if (tb[OPT_IPADDR])
-		n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
-
-	if (tb[OPT_IP6ADDR])
-		n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask);
-
-	if (!n_v4 && !n_v6) {
-		error = "NO_ADDRESS";
-		goto error;
-	}
-
-	if (n_v4 < 0 || n_v6 < 0)
-		goto out;
-
-	if (n_v4 && tb[OPT_GATEWAY]) {
-		if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
-			goto out;
-	}
-
-	if (n_v6 && tb[OPT_IP6GW]) {
-		if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
-			goto out;
-	}
-
-	if (tb[OPT_DNS])
-		interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
-
-	return 0;
-
-error:
-	interface_add_error(iface, "proto-static", error, NULL, 0);
-out:
-	return -1;
-}
-
 static bool
 static_proto_setup(struct static_proto_state *state)
 {
-	return proto_apply_static_settings(state->proto.iface, state->config) == 0;
+	return proto_apply_ip_settings(state->proto.iface, state->config) == 0;
 }
 
 static int
@@ -217,7 +82,7 @@ error:
 static struct proto_handler static_proto = {
 	.name = "static",
 	.flags = PROTO_FLAG_IMMEDIATE,
-	.config_params = &static_attr_list,
+	.config_params = &proto_ip_attr,
 	.attach = static_attach,
 };
 
diff --git a/proto.c b/proto.c
index 1a260cc..dfdedcb 100644
--- a/proto.c
+++ b/proto.c
@@ -12,6 +12,38 @@
 
 static struct avl_tree handlers;
 
+enum {
+	OPT_IPADDR,
+	OPT_IP6ADDR,
+	OPT_NETMASK,
+	OPT_GATEWAY,
+	OPT_IP6GW,
+	OPT_DNS,
+	__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_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
+	[OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
+	[OPT_DNS] = { .name = "dns", .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)
 {
@@ -88,6 +120,110 @@ 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)
+{
+	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;
+	}
+	vlist_add(&iface->proto_ip.addr, &addr->node);
+	return true;
+}
+
+static int
+parse_address_option(struct interface *iface, struct blob_attr *attr, bool v6, int netmask)
+{
+	struct blob_attr *cur;
+	int n_addr = 0;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		n_addr++;
+		if (!parse_addr(iface, blobmsg_data(cur), v6, netmask))
+			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 = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
+	vlist_add(&iface->proto_ip.route, &route->node);
+
+	return true;
+}
+
+int
+proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr)
+{
+	struct blob_attr *tb[__OPT_MAX];
+	const char *error;
+	unsigned int netmask = 32;
+	int n_v4 = 0, n_v6 = 0;
+
+	blobmsg_parse(proto_ip_attributes, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
+
+	if (tb[OPT_NETMASK]) {
+		netmask = parse_netmask_string(blobmsg_data(tb[OPT_NETMASK]), false);
+		if (netmask > 32) {
+			error = "INVALID_NETMASK";
+			goto error;
+		}
+	}
+
+	if (tb[OPT_IPADDR])
+		n_v4 = parse_address_option(iface, tb[OPT_IPADDR], false, netmask);
+
+	if (tb[OPT_IP6ADDR])
+		n_v6 = parse_address_option(iface, tb[OPT_IP6ADDR], true, netmask);
+
+	if (!n_v4 && !n_v6) {
+		error = "NO_ADDRESS";
+		goto error;
+	}
+
+	if (n_v4 < 0 || n_v6 < 0)
+		goto out;
+
+	if (n_v4 && tb[OPT_GATEWAY]) {
+		if (!parse_gateway_option(iface, tb[OPT_GATEWAY], false))
+			goto out;
+	}
+
+	if (n_v6 && tb[OPT_IP6GW]) {
+		if (!parse_gateway_option(iface, tb[OPT_IP6GW], true))
+			goto out;
+	}
+
+	if (tb[OPT_DNS])
+		interface_add_dns_server_list(&iface->proto_ip, tb[OPT_DNS]);
+
+	return 0;
+
+error:
+	interface_add_error(iface, "proto", error, NULL, 0);
+out:
+	return -1;
+}
 
 void add_proto_handler(struct proto_handler *p)
 {
diff --git a/proto.h b/proto.h
index c401d6f..5930766 100644
--- a/proto.h
+++ b/proto.h
@@ -48,12 +48,17 @@ struct proto_handler {
 		struct interface *iface, struct blob_attr *attr);
 };
 
+extern const struct config_param_list proto_ip_attr;
+
 void add_proto_handler(struct proto_handler *p);
 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);
+
 unsigned int parse_netmask_string(const char *str, bool v6);
+int proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr);
+
 
 #endif