code cleanup

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

diff --git a/proto-shell.c b/proto-shell.c
index 351e0bf..281debc 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -13,7 +13,7 @@
 #include "proto.h"
 
 static LIST_HEAD(handlers);
-static int proto_fd, main_fd;
+static int proto_fd;
 
 struct proto_shell_handler {
        struct list_head list;
@@ -25,21 +25,67 @@ struct proto_shell_handler {
 
 struct proto_shell_state {
        struct interface_proto_state proto;
+       struct proto_shell_handler *handler;
        struct blob_attr *config;
 };
 
-#define DUMP_SUFFIX    " dump"
+static int run_script(const char **argv)
+{
+       int pid, ret;
+
+       if ((pid = fork()) < 0)
+               return -1;
+
+       if (!pid) {
+               fchdir(proto_fd);
+               execvp(argv[0], (char **) argv);
+               exit(127);
+       }
+
+       if (waitpid(pid, &ret, 0) == -1)
+               ret = -1;
+
+       if (ret > 0)
+               return -ret;
+
+       return 0;
+}
 
 static int
 proto_shell_handler(struct interface_proto_state *proto,
                    enum interface_proto_cmd cmd, bool force)
 {
+       struct proto_shell_state *state;
+       struct proto_shell_handler *handler;
+       const char *argv[5];
+       char *config;
+       int ret;
+
+       state = container_of(proto, struct proto_shell_state, proto);
+       handler = state->handler;
+
+       config = blobmsg_format_json(state->config, true);
+       if (!config)
+               return -1;
+
+       argv[0] = handler->script_name;
+       argv[1] = handler->proto.name;
+       argv[2] = "teardown";
+       argv[3] = config;
+       argv[4] = NULL;
+
        switch(cmd) {
        case PROTO_CMD_SETUP:
+               argv[2] = "setup";
+               /* fall through */
        case PROTO_CMD_TEARDOWN:
+               ret = run_script(argv);
                break;
        }
-       return 0;
+
+       free(config);
+
+       return ret;
 }
 
 static void
@@ -66,6 +112,7 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface,
        memcpy(state->config, attr, blob_pad_len(attr));
        state->proto.free = proto_shell_free;
        state->proto.handler = proto_shell_handler;
+       state->handler = container_of(h, struct proto_shell_handler, proto);
 
        return &state->proto;
 
@@ -74,8 +121,26 @@ error:
        return NULL;
 }
 
+static json_object *
+check_type(json_object *obj, json_type type)
+{
+       if (!obj)
+               return NULL;
+
+       if (json_object_get_type(obj) != type)
+               return NULL;
+
+       return obj;
+}
+
+static inline json_object *
+get_field(json_object *obj, const char *name, json_type type)
+{
+       return check_type(json_object_object_get(obj, name), type);
+}
+
 static char *
-proto_shell_parse_config(struct config_param_list *config, struct json_object *obj)
+proto_shell_parse_config(struct config_param_list *config, json_object *obj)
 {
        struct blobmsg_policy *attrs;
        char *str_buf, *str_cur;
@@ -89,18 +154,18 @@ proto_shell_parse_config(struct config_param_list *config, struct json_object *o
        config->n_params = json_object_array_length(obj);
        config->params = attrs;
        for (i = 0; i < config->n_params; i++) {
-               struct json_object *cur, *name, *type;
+               json_object *cur, *name, *type;
 
-               cur = json_object_array_get_idx(obj, i);
-               if (!cur || json_object_get_type(cur) != json_type_array)
+               cur = check_type(json_object_array_get_idx(obj, i), json_type_array);
+               if (!cur)
                        goto error;
 
-               name = json_object_array_get_idx(cur, 0);
-               if (!name || json_object_get_type(name) != json_type_string)
+               name = check_type(json_object_array_get_idx(cur, 0), json_type_string);
+               if (!name)
                        goto error;
 
-               type = json_object_array_get_idx(cur, 1);
-               if (!type || json_object_get_type(type) != json_type_int)
+               type = check_type(json_object_array_get_idx(cur, 1), json_type_int);
+               if (!type)
                        goto error;
 
                attrs[i].name = json_object_get_string(name);
@@ -132,7 +197,7 @@ error:
 }
 
 static void
-proto_shell_add_handler(const char *script, struct json_object *obj)
+proto_shell_add_handler(const char *script, json_object *obj)
 {
        struct proto_shell_handler *handler;
        struct proto_handler *proto;
@@ -140,11 +205,11 @@ proto_shell_add_handler(const char *script, struct json_object *obj)
        const char *name;
        char *str;
 
-       if (json_object_get_type(obj) != json_type_object)
+       if (!check_type(obj, json_type_object))
                return;
 
-       tmp = json_object_object_get(obj, "name");
-       if (!tmp || json_object_get_type(tmp) != json_type_string)
+       tmp = get_field(obj, "name", json_type_string);
+       if (!tmp)
                return;
 
        name = json_object_get_string(tmp);
@@ -165,8 +230,8 @@ proto_shell_add_handler(const char *script, struct json_object *obj)
        proto->config_params = &handler->config;
        proto->attach = proto_shell_attach;
 
-       config = json_object_object_get(obj, "config");
-       if (config && json_object_get_type(config) == json_type_array)
+       config = get_field(obj, "config", json_type_array);
+       if (config)
                handler->config_buf = proto_shell_parse_config(&handler->config, config);
 
        DPRINTF("Add handler for script %s: %s\n", script, proto->name);
@@ -176,12 +241,14 @@ proto_shell_add_handler(const char *script, struct json_object *obj)
 static void proto_shell_add_script(const char *name)
 {
        struct json_tokener *tok = NULL;
-       struct json_object *obj;
+       json_object *obj;
        static char buf[512];
        char *start, *end, *cmd;
        FILE *f;
        int buflen, len;
 
+#define DUMP_SUFFIX    " '' dump"
+
        cmd = alloca(strlen(name) + 1 + sizeof(DUMP_SUFFIX));
        sprintf(cmd, "%s" DUMP_SUFFIX, name);
 
@@ -228,6 +295,7 @@ static void proto_shell_add_script(const char *name)
 void __init proto_shell_init(void)
 {
        glob_t g;
+       int main_fd;
        int i;
 
        main_fd = open(".", O_RDONLY | O_DIRECTORY);
@@ -250,11 +318,7 @@ void __init proto_shell_init(void)
        for (i = 0; i < g.gl_pathc; i++)
                proto_shell_add_script(g.gl_pathv[i]);
 
-       if (list_empty(&handlers))
-               close(proto_fd);
-
 close_cur:
        fchdir(main_fd);
-       if (list_empty(&handlers))
-               close(main_fd);
+       close(main_fd);
 }