X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=6bbfe10ea6696f13607c23ca731d36dd1b9b5dd6;hp=4bb07446b8a1650c9bfe6548e4c442aca4c257dd;hb=37769eb666aa614b76df9b537db35c2c70e3ac7a;hpb=d095bf24cf7879150d008c23998676bfedebbde6 diff --git a/proto-shell.c b/proto-shell.c index 4bb0744..6bbfe10 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -16,21 +16,18 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include "netifd.h" #include "interface.h" #include "interface-ip.h" #include "proto.h" #include "system.h" +#include "handler.h" static int proto_fd = -1; @@ -44,22 +41,22 @@ enum proto_shell_sm { struct proto_shell_handler { struct list_head list; struct proto_handler proto; - struct uci_blob_param_list config; char *config_buf; + char *script_name; bool init_available; - char script_name[]; + + struct uci_blob_param_list config; }; struct proto_shell_dependency { struct list_head list; + char *interface; struct proto_shell_state *proto; struct interface_user dep; union if_addr host; bool v6; - - char interface[]; }; struct proto_shell_state { @@ -211,7 +208,7 @@ proto_shell_if_up_cb(struct interface_user *dep, struct interface *iface, { struct proto_shell_dependency *pdep; - if (ev != IFEV_UP) + if (ev != IFEV_UP && ev != IFEV_UPDATE) return; pdep = container_of(dep, struct proto_shell_dependency, dep); @@ -225,7 +222,7 @@ proto_shell_if_down_cb(struct interface_user *dep, struct interface *iface, struct proto_shell_dependency *pdep; struct proto_shell_state *state; - if (ev == IFEV_UP) + if (ev == IFEV_UP || ev == IFEV_UPDATE) return; pdep = container_of(dep, struct proto_shell_dependency, dep); @@ -621,13 +618,14 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att { struct proto_shell_dependency *dep; struct blob_attr *host = tb[NOTIFY_HOST]; - struct blob_attr *ifname = tb[NOTIFY_IFNAME]; - size_t ifnamelen = (ifname) ? blobmsg_data_len(ifname) : 1; + struct blob_attr *ifname_a = tb[NOTIFY_IFNAME]; + const char *ifname_str = ifname_a ? blobmsg_data(ifname_a) : ""; + char *ifname; if (!host) return UBUS_STATUS_INVALID_ARGUMENT; - dep = calloc(1, sizeof(*dep) + ifnamelen); + dep = calloc_a(sizeof(*dep), &ifname, strlen(ifname_str) + 1); if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) { if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) { free(dep); @@ -638,10 +636,7 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att } dep->proto = state; - if (ifname) - memcpy(dep->interface, blobmsg_data(ifname), ifnamelen); - else - dep->interface[0] = 0; + dep->interface = strcpy(ifname, ifname_str); dep->dep.cb = proto_shell_if_up_cb; interface_add_user(&dep->dep, NULL); @@ -736,202 +731,48 @@ 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; + char *proto_name, *script_name; - 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); + handler = calloc_a(sizeof(*handler), + &proto_name, strlen(name) + 1, + &script_name, strlen(script) + 1); if (!handler) return; - strcpy(handler->script_name, script); - strcpy(str, name); + handler->script_name = strcpy(script_name, script); proto = &handler->proto; - proto->name = str; + proto->name = strcpy(proto_name, name); 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); } -static void proto_shell_add_script(const char *name) -{ - struct json_tokener *tok = NULL; - json_object *obj; - static char buf[512]; - char *start, *cmd; - FILE *f; - int len; - -#define DUMP_SUFFIX " '' dump" - - cmd = alloca(strlen(name) + 1 + sizeof(DUMP_SUFFIX)); - sprintf(cmd, "%s" DUMP_SUFFIX, name); - - f = popen(cmd, "r"); - if (!f) - return; - - do { - start = fgets(buf, sizeof(buf), f); - if (!start) - continue; - - len = strlen(start); - - if (!tok) - tok = json_tokener_new(); - - obj = json_tokener_parse_ex(tok, start, len); - if (!is_error(obj)) { - proto_shell_add_handler(name, obj); - json_object_put(obj); - json_tokener_free(tok); - tok = NULL; - } else if (start[len - 1] == '\n') { - json_tokener_free(tok); - tok = NULL; - } - } while (!feof(f) && !ferror(f)); - - if (tok) - json_tokener_free(tok); - - pclose(f); -} - static void __init proto_shell_init(void) { - glob_t g; - int main_fd; - int i; - - main_fd = open(".", O_RDONLY | O_DIRECTORY); - if (main_fd < 0) - return; - - if (chdir(main_path)) { - perror("chdir(main path)"); - goto close_cur; - } - - if (chdir("./proto")) - goto close_cur; - - proto_fd = open(".", O_RDONLY | O_DIRECTORY); + proto_fd = netifd_open_subdir("proto"); if (proto_fd < 0) - goto close_cur; - - system_fd_set_cloexec(proto_fd); - glob("./*.sh", 0, NULL, &g); - for (i = 0; i < g.gl_pathc; i++) - proto_shell_add_script(g.gl_pathv[i]); + return; -close_cur: - fchdir(main_fd); - close(main_fd); + netifd_init_script_handlers(proto_fd, proto_shell_add_handler); }