X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=proto-shell.c;h=c4039ed6a486169f86931d8d075d9e037b2be566;hb=c9dadceeba2faa311e4a086f1c6a5eb0d5577c9f;hp=629f43bb95ed9a9fda171e3d8a2920721bd5e1a9;hpb=f80b9e4acc47cf454768b44142495fdb8a68a39f;p=project%2Fnetifd.git

diff --git a/proto-shell.c b/proto-shell.c
index 629f43b..c4039ed 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -41,22 +41,22 @@ enum proto_shell_sm {
 struct proto_shell_handler {
 	struct list_head list;
 	struct proto_handler proto;
-	struct uci_blob_param_list config;
 	char *config_buf;
+	char *script_name;
 	bool init_available;
-	char script_name[];
+
+	struct uci_blob_param_list config;
 };
 
 struct proto_shell_dependency {
 	struct list_head list;
 
+	char *interface;
 	struct proto_shell_state *proto;
 	struct interface_user dep;
 
 	union if_addr host;
 	bool v6;
-
-	char interface[];
 };
 
 struct proto_shell_state {
@@ -158,6 +158,11 @@ proto_shell_handler(struct interface_proto_state *proto,
 		action = "setup";
 		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;
@@ -440,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);
 
@@ -479,15 +483,15 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data,
 	if ((cur = tb[NOTIFY_DNS_SEARCH]))
 		interface_add_dns_search_list(&iface->proto_ip, cur);
 
+	if ((cur = tb[NOTIFY_DATA]))
+		proto_shell_parse_data(state->proto.iface, cur);
+
 	interface_update_complete(state->proto.iface);
 
 	if (!keep)
 		state->proto.proto_event(&state->proto, IFPEV_UP);
 	state->sm = S_IDLE;
 
-	if ((cur = tb[NOTIFY_DATA]))
-		proto_shell_parse_data(state->proto.iface, cur);
-
 	return 0;
 }
 
@@ -618,13 +622,14 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 {
 	struct proto_shell_dependency *dep;
 	struct blob_attr *host = tb[NOTIFY_HOST];
-	struct blob_attr *ifname = tb[NOTIFY_IFNAME];
-	size_t ifnamelen = (ifname) ? blobmsg_data_len(ifname) : 1;
+	struct blob_attr *ifname_a = tb[NOTIFY_IFNAME];
+	const char *ifname_str = ifname_a ? blobmsg_data(ifname_a) : "";
+	char *ifname;
 
 	if (!host)
 		return UBUS_STATUS_INVALID_ARGUMENT;
 
-	dep = calloc(1, sizeof(*dep) + ifnamelen);
+	dep = calloc_a(sizeof(*dep), &ifname, strlen(ifname_str) + 1);
 	if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) {
 		if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) {
 			free(dep);
@@ -635,10 +640,7 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
 	}
 
 	dep->proto = state;
-	if (ifname)
-		memcpy(dep->interface, blobmsg_data(ifname), ifnamelen);
-	else
-		dep->interface[0] = 0;
+	dep->interface = strcpy(ifname, ifname_str);
 
 	dep->dep.cb = proto_shell_if_up_cb;
 	interface_add_user(&dep->dep, NULL);
@@ -739,18 +741,18 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj)
 	struct proto_shell_handler *handler;
 	struct proto_handler *proto;
 	json_object *config, *tmp;
-	char *str;
+	char *proto_name, *script_name;
 
-	handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
-			   &str, strlen(name) + 1);
+	handler = calloc_a(sizeof(*handler),
+			   &proto_name, strlen(name) + 1,
+			   &script_name, strlen(script) + 1);
 	if (!handler)
 		return;
 
-	strcpy(handler->script_name, script);
-	strcpy(str, name);
+	handler->script_name = strcpy(script_name, script);
 
 	proto = &handler->proto;
-	proto->name = str;
+	proto->name = strcpy(proto_name, name);
 	proto->config_params = &handler->config;
 	proto->attach = proto_shell_attach;
 
@@ -762,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);
@@ -770,7 +776,7 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj)
 	add_proto_handler(proto);
 }
 
-static void __init proto_shell_init(void)
+void proto_shell_init(void)
 {
 	proto_fd = netifd_open_subdir("proto");
 	if (proto_fd < 0)