[OpenWrt-Devel] [PATCH netifd 1/3] proto-shell: Model config parameter "no-proto-task" as a proto flag

[Hans Dedecker]

Export the config parameter "no-proto-task" as a proto flag so it can be checked
by other netifd modules

Signed-off-by: Hans Dedecker <dedeckeh at gmail.com>
---
 proto-shell.c | 6 +++---
 proto.h       | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/proto-shell.c b/proto-shell.c
index 25dec00..1922024 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -44,7 +44,6 @@ struct proto_shell_handler {
 	char *config_buf;
 	char *script_name;
 	bool init_available;
-	bool no_proto_task;
 
 	struct uci_blob_param_list config;
 };
@@ -306,7 +305,7 @@ proto_shell_task_finish(struct proto_shell_state *state,
 			if (state->renew_pending)
 				proto_shell_handler(&state->proto,
 						    PROTO_CMD_RENEW, false);
-			else if (!state->handler->no_proto_task &&
+			else if (!(state->handler->proto.flags & PROTO_FLAG_NO_TASK) &&
 				 !state->proto_task.uloop.pending &&
 				 state->sm == S_SETUP)
 				proto_shell_handler(&state->proto,
@@ -892,7 +891,8 @@ proto_shell_add_handler(const char *script, const char *name, json_object *obj)
 		handler->proto.flags |= PROTO_FLAG_NODEV;
 
 	tmp = json_get_field(obj, "no-proto-task", json_type_boolean);
-	handler->no_proto_task = tmp && json_object_get_boolean(tmp);
+	if (tmp && json_object_get_boolean(tmp))
+		handler->proto.flags |= PROTO_FLAG_NO_TASK;
 
 	tmp = json_get_field(obj, "available", json_type_boolean);
 	if (tmp && json_object_get_boolean(tmp))
diff --git a/proto.h b/proto.h
index 87dec4e..4c4d824 100644
--- a/proto.h
+++ b/proto.h
@@ -38,6 +38,7 @@ enum {
 	PROTO_FLAG_RENEW_AVAILABLE = (1 << 3),
 	PROTO_FLAG_FORCE_LINK_DEFAULT = (1 << 4),
 	PROTO_FLAG_LASTERROR = (1 << 5),
+	PROTO_FLAG_NO_TASK = (1 << 6),
 };
 
 struct interface_proto_state {
-- 
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel