X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-static.c;h=bbe304b1a67ccec9758e81abb1f718a1771a50f8;hp=15db33081988b8a7e7075b50cc32aad419067597;hb=f505119b07b89ad23f4264e77b0bf0f0c0400399;hpb=0c823ed77d2d4aaca12d4c9504e808e4c715b8e4

diff --git a/proto-static.c b/proto-static.c
index 15db330..bbe304b 100644
--- a/proto-static.c
+++ b/proto-static.c
@@ -7,6 +7,7 @@
 
 #include "netifd.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "system.h"
 
@@ -42,7 +43,6 @@ struct static_proto_state {
 	struct interface_proto_state proto;
 
 	struct blob_attr *config;
-	struct interface *iface;
 };
 
 static bool
@@ -82,26 +82,25 @@ parse_ip_and_netmask(int af, const char *str, void *addr, unsigned int *netmask)
 }
 
 static bool
-parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
+parse_addr(struct interface_proto_state *state, 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->ctx = state;
 	addr->mask = mask;
 	if (!parse_ip_and_netmask(af, str, &addr->addr, &addr->mask)) {
 		interface_add_error(state->iface, "proto-static", "INVALID_ADDRESS", &str, 1);
 		free(addr);
 		return false;
 	}
-	interface_add_address(state->iface, addr);
+	vlist_add(&state->iface->proto_addr, &addr->node);
 	return true;
 }
 
 static int
-parse_address_option(struct static_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
+parse_address_option(struct interface_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
 {
 	struct blob_attr *cur;
 	int n_addr = 0;
@@ -117,7 +116,7 @@ parse_address_option(struct static_proto_state *state, struct blob_attr *attr, b
 }
 
 static bool
-parse_gateway_option(struct static_proto_state *state, struct blob_attr *attr, bool v6)
+parse_gateway_option(struct interface_proto_state *state, struct blob_attr *attr, bool v6)
 {
 	struct device_route *route;
 	const char *str = blobmsg_data(attr);
@@ -132,13 +131,13 @@ parse_gateway_option(struct static_proto_state *state, struct blob_attr *attr, b
 	}
 	route->mask = 0;
 	route->flags = DEVADDR_DEVICE | (v6 ? DEVADDR_INET6 : DEVADDR_INET4);
-	interface_add_route(state->iface, route);
+	vlist_add(&state->iface->proto_route, &route->node);
 
 	return true;
 }
 
-static bool
-static_proto_setup(struct static_proto_state *state)
+int
+proto_apply_static_settings(struct interface_proto_state *state, struct blob_attr *attr)
 {
 	struct blob_attr *tb[__OPT_MAX];
 	struct in_addr ina;
@@ -146,8 +145,7 @@ static_proto_setup(struct static_proto_state *state)
 	int netmask = 32;
 	int n_v4 = 0, n_v6 = 0;
 
-	blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(state->config),
-		blob_len(state->config));
+	blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(attr), blob_len(attr));
 
 	if (tb[OPT_NETMASK]) {
 		if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) {
@@ -182,12 +180,18 @@ static_proto_setup(struct static_proto_state *state)
 			goto out;
 	}
 
-	return true;
+	return 0;
 
 error:
 	interface_add_error(state->iface, "proto-static", error, NULL, 0);
 out:
-	return false;
+	return -1;
+}
+
+static bool
+static_proto_setup(struct static_proto_state *state)
+{
+	return proto_apply_static_settings(&state->proto, state->config) == 0;
 }
 
 static int
@@ -201,12 +205,11 @@ static_handler(struct interface_proto_state *proto,
 
 	switch (cmd) {
 	case PROTO_CMD_SETUP:
-		if (static_proto_setup(state))
-			break;
+		if (!static_proto_setup(state))
+			return -1;
 
-		/* fall through */
+		break;
 	case PROTO_CMD_TEARDOWN:
-		interface_del_ctx_addr(state->iface, state);
 		break;
 	}
 	return ret;
@@ -232,15 +235,13 @@ static_attach(const struct proto_handler *h, struct interface *iface,
 	if (!state)
 		return NULL;
 
-	state->iface = iface;
 	state->config = malloc(blob_pad_len(attr));
 	if (!state->config)
 		goto error;
 
 	memcpy(state->config, attr, blob_pad_len(attr));
 	state->proto.free = static_free;
-	state->proto.handler = static_handler;
-	state->proto.flags = PROTO_FLAG_IMMEDIATE;
+	state->proto.cb = static_handler;
 
 	return &state->proto;
 
@@ -251,6 +252,7 @@ error:
 
 static struct proto_handler static_proto = {
 	.name = "static",
+	.flags = PROTO_FLAG_IMMEDIATE,
 	.config_params = &static_attr_list,
 	.attach = static_attach,
 };