X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=c4039ed6a486169f86931d8d075d9e037b2be566;hp=904104551a1ce794eeecf5a036278cc98bfd6634;hb=d5452cb41927b580df46f3ac81ed9e77a7c83a51;hpb=8aabd47c6f4fefc8fbd70c34a738f7c26956d8cd

diff --git a/proto-shell.c b/proto-shell.c
index 9041045..c4039ed 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -159,6 +159,10 @@ proto_shell_handler(struct interface_proto_state *proto,
 		state->last_error = -1;
 		proto_shell_clear_host_dep(state);
 		state->sm = S_SETUP;
+	} else if (cmd == PROTO_CMD_RENEW) {
+		if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE))
+			return 0;
+		action = "renew";
 	} else {
 		if (state->sm == S_TEARDOWN)
 			return 0;
@@ -441,30 +445,29 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 			dev_create = 2;
 	}
 
-	if (!tb[NOTIFY_IFNAME]) {
-		if (!iface->main_dev.dev)
-			return UBUS_STATUS_INVALID_ARGUMENT;
-	} else if (!keep || iface->state != IFS_UP) {
+	if (iface->state != IFS_UP || !iface->l3_dev.dev)
 		keep = false;
-		devname = blobmsg_data(tb[NOTIFY_IFNAME]);
-		if (tb[NOTIFY_TUNNEL]) {
-			dev = proto_shell_create_tunnel(devname,
-				tb[NOTIFY_TUNNEL]);
-			if (!dev)
-				return UBUS_STATUS_INVALID_ARGUMENT;
-		} else {
-			dev = device_get(devname, dev_create);
-			if (!dev)
-				return UBUS_STATUS_NOT_FOUND;
+
+	if (!keep) {
+		dev = iface->main_dev.dev;
+		if (tb[NOTIFY_IFNAME]) {
+			keep = false;
+			devname = blobmsg_data(tb[NOTIFY_IFNAME]);
+			if (tb[NOTIFY_TUNNEL])
+				dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]);
+			else
+				dev = device_get(devname, dev_create);
 		}
 
+		if (!dev)
+			return UBUS_STATUS_INVALID_ARGUMENT;
+
 		interface_set_l3_dev(iface, dev);
 		device_claim(&iface->l3_dev);
 		device_set_present(dev, true);
-	}
 
-	if (!keep)
 		interface_update_start(iface);
+	}
 
 	proto_apply_ip_settings(iface, data, addr_ext);
 
@@ -761,6 +764,10 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj)
 	if (tmp && json_object_get_boolean(tmp))
 		handler->proto.flags |= PROTO_FLAG_INIT_AVAILABLE;
 
+	tmp = json_get_field(obj, "renew-handler", json_type_boolean);
+	if (tmp && json_object_get_boolean(tmp))
+		handler->proto.flags |= PROTO_FLAG_RENEW_AVAILABLE;
+
 	config = json_get_field(obj, "config", json_type_array);
 	if (config)
 		handler->config_buf = netifd_handler_parse_config(&handler->config, config);