proto-shell: parse shell handler metadata

diff --git a/proto-shell.c b/proto-shell.c
index 031d28a..351e0bf 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -18,16 +18,159 @@ static int proto_fd, main_fd;
 struct proto_shell_handler {
        struct list_head list;
        struct proto_handler proto;
+       struct config_param_list config;
+       char *config_buf;
+       char script_name[];
+};
+
+struct proto_shell_state {
+       struct interface_proto_state proto;
+       struct blob_attr *config;
 };
 
 #define DUMP_SUFFIX    " dump"
 
-static void proto_shell_add_handler(const char *script, struct json_object *obj)
+static int
+proto_shell_handler(struct interface_proto_state *proto,
+                   enum interface_proto_cmd cmd, bool force)
+{
+       switch(cmd) {
+       case PROTO_CMD_SETUP:
+       case PROTO_CMD_TEARDOWN:
+               break;
+       }
+       return 0;
+}
+
+static void
+proto_shell_free(struct interface_proto_state *proto)
 {
+       struct proto_shell_state *state;
+
+       state = container_of(proto, struct proto_shell_state, proto);
+       free(state->config);
+       free(state);
+}
+
+struct interface_proto_state *
+proto_shell_attach(const struct proto_handler *h, struct interface *iface,
+                  struct blob_attr *attr)
+{
+       struct proto_shell_state *state;
+
+       state = calloc(1, sizeof(*state));
+       state->config = malloc(blob_pad_len(attr));
+       if (!state->config)
+               goto error;
+
+       memcpy(state->config, attr, blob_pad_len(attr));
+       state->proto.free = proto_shell_free;
+       state->proto.handler = proto_shell_handler;
+
+       return &state->proto;
+
+error:
+       free(state);
+       return NULL;
+}
+
+static char *
+proto_shell_parse_config(struct config_param_list *config, struct json_object *obj)
+{
+       struct blobmsg_policy *attrs;
+       char *str_buf, *str_cur;
+       int str_len = 0;
+       int i;
+
+       attrs = calloc(1, sizeof(*attrs));
+       if (!attrs)
+               return NULL;
+
+       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;
+
+               cur = json_object_array_get_idx(obj, i);
+               if (!cur || json_object_get_type(cur) != json_type_array)
+                       goto error;
+
+               name = json_object_array_get_idx(cur, 0);
+               if (!name || json_object_get_type(name) != json_type_string)
+                       goto error;
+
+               type = json_object_array_get_idx(cur, 1);
+               if (!type || json_object_get_type(type) != json_type_int)
+                       goto error;
+
+               attrs[i].name = json_object_get_string(name);
+               attrs[i].type = json_object_get_int(type);
+               if (attrs[i].type > BLOBMSG_TYPE_LAST)
+                       goto error;
+
+               str_len += strlen(attrs[i].name + 1);
+       }
+
+       str_buf = malloc(str_len);
+       if (!str_buf)
+               goto error;
+
+       str_cur = str_buf;
+       for (i = 0; i < config->n_params; i++) {
+               const char *name = attrs[i].name;
+
+               attrs[i].name = str_cur;
+               str_cur += sprintf(str_cur, "%s", name) + 1;
+       }
+
+       return str_buf;
+
+error:
+       free(attrs);
+       config->n_params = 0;
+       return NULL;
+}
+
+static void
+proto_shell_add_handler(const char *script, struct json_object *obj)
+{
+       struct proto_shell_handler *handler;
+       struct proto_handler *proto;
+       json_object *config, *tmp;
+       const char *name;
+       char *str;
+
        if (json_object_get_type(obj) != json_type_object)
                return;
 
-       fprintf(stderr, "Add handler for script %s: %s\n", script, json_object_to_json_string(obj));
+       tmp = json_object_object_get(obj, "name");
+       if (!tmp || json_object_get_type(tmp) != json_type_string)
+               return;
+
+       name = json_object_get_string(tmp);
+
+       handler = calloc(1, sizeof(*handler) +
+                        strlen(script) + 1 +
+                        strlen(name) + 1);
+       if (!handler)
+               return;
+
+       strcpy(handler->script_name, script);
+
+       str = handler->script_name + strlen(handler->script_name) + 1;
+       strcpy(str, name);
+
+       proto = &handler->proto;
+       proto->name = str;
+       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)
+               handler->config_buf = proto_shell_parse_config(&handler->config, config);
+
+       DPRINTF("Add handler for script %s: %s\n", script, proto->name);
+       add_proto_handler(proto);
 }
 
 static void proto_shell_add_script(const char *name)

diff --git a/proto/netifd-proto.sh b/proto/netifd-proto.sh
index f850216..3764281 100755 (executable)
--- a/proto/netifd-proto.sh
+++ b/proto/netifd-proto.sh
@@ -1,15 +1,22 @@
 . /usr/share/libubox/jshn.sh
 
+proto_config_add_generic() {
+       json_add_array ""
+       json_add_string "" "$1"
+       json_add_int "" "$2"
+       json_close_array
+}
+
 proto_config_add_int() {
-       json_add_int "$1" 5
+       proto_config_add_generic "$1" 5
 }
 
 proto_config_add_string() {
-       json_add_int "$1" 3
+       proto_config_add_generic "$1" 3
 }
 
 proto_config_add_boolean() {
-       json_add_int "$1" 7
+       proto_config_add_generic "$1" 7
 }
 
 add_default_handler() {
@@ -30,9 +37,9 @@ case "$1" in
                        json_add_string "name" "$1"
                        eval "$1_init"
                        json_add_boolean immediate "$immediate"
-                       json_add_object "config"
+                       json_add_array "config"
                        eval "$1_init_config"
-                       json_close_object
+                       json_close_array
                        json_dump
                }
        ;;

diff --git a/proto/ppp.sh b/proto/ppp.sh
index 76df2f3..8dd97c0 100755 (executable)
--- a/proto/ppp.sh
+++ b/proto/ppp.sh
@@ -8,6 +8,14 @@ ppp_init_config() {
        proto_config_add_int "keepalive"
 }
 
+ppp_setup() {
+       return
+}
+
+ppp_teardown() {
+       return
+}
+
 ppp_init() {
        return
 }