X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=ae0f9383f4fbea2c47843f9e161b48f5c0080f09;hp=78585df40b09957ca540adbd55561c9fb438519c;hb=6094417533d97662f693d134ab04595a292de30c;hpb=6c735bda1dbf9a0aaaa6fbae95d3dfe557e97bf8

diff --git a/proto-shell.c b/proto-shell.c
index 78585df..ae0f938 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -316,6 +316,7 @@ proto_shell_free(struct interface_proto_state *proto)
 	struct proto_shell_state *state;
 
 	state = container_of(proto, struct proto_shell_state, proto);
+	proto_shell_clear_host_dep(state);
 	netifd_kill_process(&state->script_task);
 	netifd_kill_process(&state->proto_task);
 	free(state->config);
@@ -380,6 +381,8 @@ enum {
 	NOTIFY_DATA,
 	NOTIFY_KEEP,
 	NOTIFY_HOST,
+	NOTIFY_DNS,
+	NOTIFY_DNS_SEARCH,
 	__NOTIFY_LAST
 };
 
@@ -399,6 +402,8 @@ static const struct blobmsg_policy notify_attr[__NOTIFY_LAST] = {
 	[NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
 	[NOTIFY_KEEP] = { .name = "keep", .type = BLOBMSG_TYPE_BOOL },
 	[NOTIFY_HOST] = { .name = "host", .type = BLOBMSG_TYPE_STRING },
+	[NOTIFY_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY },
+	[NOTIFY_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY },
 };
 
 static int
@@ -450,6 +455,7 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 
 		interface_set_l3_dev(iface, dev);
 		device_claim(&iface->l3_dev);
+		device_set_present(dev, true);
 	}
 
 	if (!keep)
@@ -463,6 +469,12 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 	if ((cur = tb[NOTIFY_ROUTES6]) != NULL)
 		proto_shell_parse_route_list(state->proto.iface, cur, true);
 
+	if ((cur = tb[NOTIFY_DNS]))
+		interface_add_dns_server_list(&iface->proto_ip, cur);
+
+	if ((cur = tb[NOTIFY_DNS_SEARCH]))
+		interface_add_dns_search_list(&iface->proto_ip, cur);
+
 	interface_update_complete(state->proto.iface);
 
 	if (!keep)
@@ -624,6 +636,22 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 }
 
 static int
+proto_shell_setup_failed(struct proto_shell_state *state)
+{
+	switch (state->sm) {
+	case S_IDLE:
+		state->proto.proto_event(&state->proto, IFPEV_LINK_LOST);
+		/* fall through */
+	case S_SETUP:
+		proto_shell_handler(&state->proto, PROTO_CMD_TEARDOWN, false);
+		break;
+	default:
+		break;
+	}
+	return 0;
+}
+
+static int
 proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 {
 	struct proto_shell_state *state;
@@ -650,6 +678,8 @@ proto_shell_notify(struct interface_proto_state *proto, struct blob_attr *attr)
 		return proto_shell_set_available(state, tb);
 	case 6:
 		return proto_shell_add_host_dependency(state, tb);
+	case 7:
+		return proto_shell_setup_failed(state);
 	default:
 		return UBUS_STATUS_INVALID_ARGUMENT;
 	}