bridge: fix stray semicolon, fixes a bug in bridge primary port reset

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

diff --git a/proto-shell.c b/proto-shell.c
index 6ac8dab..629f43b 100644 (file)
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <signal.h>
 
 #include <arpa/inet.h>
@@ -734,99 +733,14 @@ 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 uci_blob_param_list *config, json_object *obj)
-{
-       struct blobmsg_policy *attrs;
-       char *str_buf, *str_cur;
-       int str_len = 0;
-       int i;
-
-       config->n_params = json_object_array_length(obj);
-       attrs = calloc(1, sizeof(*attrs) * config->n_params);
-       if (!attrs)
-               return NULL;
-
-       config->params = attrs;
-       for (i = 0; i < config->n_params; i++) {
-               json_object *cur, *name, *type;
-
-               cur = check_type(json_object_array_get_idx(obj, i), json_type_array);
-               if (!cur)
-                       goto error;
-
-               name = check_type(json_object_array_get_idx(cur, 0), json_type_string);
-               if (!name)
-                       goto error;
-
-               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);
-               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, json_object *obj)
+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;
-       const char *name;
        char *str;
 
-       if (!check_type(obj, json_type_object))
-               return;
-
-       tmp = get_field(obj, "name", json_type_string);
-       if (!tmp)
-               return;
-
-       name = json_object_get_string(tmp);
-
        handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
                           &str, strlen(name) + 1);
        if (!handler)
@@ -840,17 +754,17 @@ proto_shell_add_handler(const char *script, json_object *obj)
        proto->config_params = &handler->config;
        proto->attach = proto_shell_attach;
 
-       tmp = get_field(obj, "no-device", json_type_boolean);
+       tmp = json_get_field(obj, "no-device", json_type_boolean);
        if (tmp && json_object_get_boolean(tmp))
                handler->proto.flags |= PROTO_FLAG_NODEV;
 
-       tmp = get_field(obj, "available", json_type_boolean);
+       tmp = json_get_field(obj, "available", json_type_boolean);
        if (tmp && json_object_get_boolean(tmp))
                handler->proto.flags |= PROTO_FLAG_INIT_AVAILABLE;
 
-       config = get_field(obj, "config", json_type_array);
+       config = json_get_field(obj, "config", json_type_array);
        if (config)
-               handler->config_buf = proto_shell_parse_config(&handler->config, config);
+               handler->config_buf = netifd_handler_parse_config(&handler->config, config);
 
        DPRINTF("Add handler for script %s: %s\n", script, proto->name);
        add_proto_handler(proto);