X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=557e5237e44203e6541e650e3121cf523f3e9dff;hp=7acb4c62ad2d3410ba92b0cb55473732eebaf294;hb=82d2762a5ffaf67307bab6f0753dc31311e16f21;hpb=e70cc01c34a4a3faded4bbdd50b9b716bd2ca94c

diff --git a/proto-shell.c b/proto-shell.c
index 7acb4c6..557e523 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -13,7 +13,6 @@
 #include "interface-ip.h"
 #include "proto.h"
 
-static LIST_HEAD(handlers);
 static int proto_fd;
 
 struct proto_shell_handler {
@@ -125,7 +124,7 @@ proto_shell_setup_cb(struct uloop_process *p, int ret)
 	state = container_of(p, struct proto_shell_state, setup_task);
 	uloop_timeout_cancel(&state->setup_timeout);
 	if (state->teardown_pending) {
-		state->teardown_pending = 0;
+		state->teardown_pending = false;
 		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
 	}
 }
@@ -151,22 +150,57 @@ proto_shell_free(struct interface_proto_state *proto)
 	free(state);
 }
 
+static void
+proto_shell_parse_addr_list(struct interface *iface, struct blob_attr *attr,
+			    bool v6, bool external)
+{
+	struct device_addr *addr;
+	struct blob_attr *cur;
+	int rem;
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
+			DPRINTF("Ignore wrong address type: %d\n", blobmsg_type(cur));
+			continue;
+		}
+
+		addr = proto_parse_ip_addr_string(blobmsg_data(cur), v6, v6 ? 32 : 128);
+		if (!addr) {
+			DPRINTF("Failed to parse IP address string: %s\n", (char *) blobmsg_data(cur));
+			continue;
+		}
+
+		if (external)
+			addr->flags |= DEVADDR_EXTERNAL;
+
+		vlist_add(&iface->proto_addr, &addr->node);
+	}
+}
+
+
 enum {
 	NOTIFY_LINK_UP,
 	NOTIFY_IFNAME,
+	NOTIFY_ADDR_EXT,
+	NOTIFY_IPADDR,
+	NOTIFY_IP6ADDR,
 	__NOTIFY_LAST
 };
 
 static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
 	[NOTIFY_LINK_UP] = { .name = "link-up", .type = BLOBMSG_TYPE_BOOL },
 	[NOTIFY_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
+	[NOTIFY_ADDR_EXT] = { .name = "address-external", .type = BLOBMSG_TYPE_BOOL },
+	[NOTIFY_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
+	[NOTIFY_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static int
 proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 {
 	struct proto_shell_state *state;
-	struct blob_attr *tb[__NOTIFY_LAST];
+	struct blob_attr *tb[__NOTIFY_LAST], *cur;
+	bool addr_ext = false;
 	bool up;
 
 	state = container_of(proto, struct proto_shell_state, proto);
@@ -180,15 +214,26 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 		if (!tb[NOTIFY_IFNAME])
 			return UBUS_STATUS_INVALID_ARGUMENT;
 
-		device_add_user(&state->l3_dev,
-			device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
-		device_claim(&state->l3_dev);
-		state->proto.iface->l3_dev = &state->l3_dev;
+		if (!state->l3_dev.dev) {
+			device_add_user(&state->l3_dev,
+				device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
+			device_claim(&state->l3_dev);
+			state->proto.iface->l3_dev = &state->l3_dev;
+		}
 		state->proto.proto_event(&state->proto, IFPEV_UP);
 	} else {
 		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
 	}
 
+	if ((cur = tb[NOTIFY_ADDR_EXT]) != NULL)
+		addr_ext = blobmsg_get_bool(cur);
+
+	if ((cur = tb[NOTIFY_IPADDR]) != NULL)
+		proto_shell_parse_addr_list(state->proto.iface, cur, false, addr_ext);
+
+	if ((cur = tb[NOTIFY_IP6ADDR]) != NULL)
+		proto_shell_parse_addr_list(state->proto.iface, cur, true, addr_ext);
+
 	return 0;
 }