struct proto_shell_handler {
struct list_head list;
struct proto_handler proto;
- struct config_param_list config;
+ struct uci_blob_param_list config;
char *config_buf;
bool init_available;
char script_name[];
union if_addr host;
bool v6;
+
+ char interface[];
};
struct proto_shell_state {
static void
proto_shell_update_host_dep(struct proto_shell_dependency *dep)
{
- struct interface *iface;
+ struct interface *iface = NULL;
if (dep->dep.iface)
goto out;
- iface = interface_ip_add_target_route(&dep->host, dep->v6);
+ if (dep->interface[0])
+ iface = vlist_find(&interfaces, dep->interface, iface, node);
+
+ iface = interface_ip_add_target_route(&dep->host, dep->v6, iface);
if (!iface)
goto out;
{
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);
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);
{
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;
if (!host)
return UBUS_STATUS_INVALID_ARGUMENT;
- dep = calloc(1, sizeof(*dep));
- if (!inet_pton(AF_INET, blobmsg_data(host), &dep->host)) {
- free(dep);
- return UBUS_STATUS_INVALID_ARGUMENT;
+ dep = calloc(1, sizeof(*dep) + ifnamelen);
+ if (inet_pton(AF_INET, blobmsg_data(host), &dep->host) < 1) {
+ if (inet_pton(AF_INET6, blobmsg_data(host), &dep->host) < 1) {
+ free(dep);
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ } else {
+ dep->v6 = true;
+ }
}
dep->proto = state;
+ if (ifname)
+ memcpy(dep->interface, blobmsg_data(ifname), ifnamelen);
+ else
+ dep->interface[0] = 0;
+
dep->dep.cb = proto_shell_if_up_cb;
interface_add_user(&dep->dep, NULL);
list_add(&dep->list, &state->deps);
}
static char *
-proto_shell_parse_config(struct config_param_list *config, json_object *obj)
+proto_shell_parse_config(struct uci_blob_param_list *config, json_object *obj)
{
struct blobmsg_policy *attrs;
char *str_buf, *str_cur;
name = json_object_get_string(tmp);
- handler = calloc(1, sizeof(*handler) +
- strlen(script) + 1 +
- strlen(name) + 1);
+ handler = calloc_a(sizeof(*handler) + strlen(script) + 1,
+ &str, 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;