X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=proto-shell.c;h=9fad3a0a581f038c703da42348084084d1110198;hp=6ac8dab2f7dd79502630c5b5425bcd9cc7ff2ab2;hb=07e9b542017c692ee2abe7a8689517b466150944;hpb=f16a15c39c872c5f42eb554deb4d956264c0c823 diff --git a/proto-shell.c b/proto-shell.c index 6ac8dab..9fad3a0 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -42,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 { @@ -159,6 +158,11 @@ proto_shell_handler(struct interface_proto_state *proto, action = "setup"; state->last_error = -1; proto_shell_clear_host_dep(state); + state->sm = S_SETUP; + } else if (cmd == PROTO_CMD_RENEW) { + if (!(handler->proto.flags & PROTO_FLAG_RENEW_AVAILABLE)) + return 0; + action = "renew"; } else { if (state->sm == S_TEARDOWN) return 0; @@ -441,30 +445,31 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, dev_create = 2; } - if (!tb[NOTIFY_IFNAME]) { - if (!iface->main_dev.dev) - return UBUS_STATUS_INVALID_ARGUMENT; - } else if (!keep || iface->state != IFS_UP) { + if (iface->state != IFS_UP || !iface->l3_dev.dev) keep = false; - devname = blobmsg_data(tb[NOTIFY_IFNAME]); - if (tb[NOTIFY_TUNNEL]) { - dev = proto_shell_create_tunnel(devname, - tb[NOTIFY_TUNNEL]); - if (!dev) - return UBUS_STATUS_INVALID_ARGUMENT; - } else { - dev = device_get(devname, dev_create); - if (!dev) - return UBUS_STATUS_NOT_FOUND; + + if (!keep) { + dev = iface->main_dev.dev; + if (tb[NOTIFY_IFNAME]) { + keep = false; + devname = blobmsg_data(tb[NOTIFY_IFNAME]); + if (tb[NOTIFY_TUNNEL]) + dev = proto_shell_create_tunnel(devname, tb[NOTIFY_TUNNEL]); + else + dev = device_get(devname, dev_create); } + if (!dev) + return UBUS_STATUS_INVALID_ARGUMENT; + interface_set_l3_dev(iface, dev); - device_claim(&iface->l3_dev); + if (device_claim(&iface->l3_dev) < 0) + return UBUS_STATUS_UNKNOWN_ERROR; + device_set_present(dev, true); - } - if (!keep) interface_update_start(iface); + } proto_apply_ip_settings(iface, data, addr_ext); @@ -480,15 +485,15 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr *data, if ((cur = tb[NOTIFY_DNS_SEARCH])) interface_add_dns_search_list(&iface->proto_ip, cur); + if ((cur = tb[NOTIFY_DATA])) + proto_shell_parse_data(state->proto.iface, cur); + interface_update_complete(state->proto.iface); if (!keep) state->proto.proto_event(&state->proto, IFPEV_UP); state->sm = S_IDLE; - if ((cur = tb[NOTIFY_DATA])) - proto_shell_parse_data(state->proto.iface, cur); - return 0; } @@ -619,13 +624,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); @@ -636,10 +642,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); @@ -734,129 +737,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; + char *proto_name, *script_name; - 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); + 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); + tmp = json_get_field(obj, "renew-handler", json_type_boolean); + if (tmp && json_object_get_boolean(tmp)) + handler->proto.flags |= PROTO_FLAG_RENEW_AVAILABLE; + + 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 __init proto_shell_init(void) +void proto_shell_init(void) { proto_fd = netifd_open_subdir("proto"); if (proto_fd < 0)