proto-shell: Model config parameter "no-proto-task" as a proto flag

[project/netifd.git] / proto-shell.c

diff --git a/proto-shell.c b/proto-shell.c
index 8a3ff69..998a44c 100644 (file)
--- 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,
@@ -708,6 +707,8 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att
                return UBUS_STATUS_PERMISSION_DENIED;
 
        dep = calloc(1, sizeof(*dep) + strlen(ifname) + 1);
+       if (!dep)
+               return UBUS_STATUS_UNKNOWN_ERROR;
 
        if (!host[0] && ifname[0]) {
                dep->any = true;
@@ -834,6 +835,9 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
        struct proto_shell_state *state;
 
        state = calloc(1, sizeof(*state));
+       if (!state)
+               return NULL;
+
        INIT_LIST_HEAD(&state->deps);
 
        state->config = malloc(blob_pad_len(attr));
@@ -887,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))
@@ -901,6 +906,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_LASTERROR;
 
+       tmp = json_get_field(obj, "teardown-on-l3-link-down", json_type_boolean);
+       if (tmp && json_object_get_boolean(tmp))
+               handler->proto.flags |= PROTO_FLAG_TEARDOWN_ON_L3_LINK_DOWN;
+
        config = json_get_field(obj, "config", json_type_array);
        if (config)
                handler->config_buf = netifd_handler_parse_config(&handler->config, config);