struct proto_shell_handler *handler;
struct blob_attr *config;
- struct device_user l3_dev;
-
struct uloop_timeout teardown_timeout;
struct netifd_process script_task;
struct proto_shell_state *state;
state = container_of(proto, struct proto_shell_state, proto);
+ netifd_kill_process(&state->script_task);
+ netifd_kill_process(&state->proto_task);
free(state->config);
free(state);
}
}
}
+static void
+proto_shell_parse_data(struct interface *iface, struct blob_attr *attr)
+{
+ struct blob_attr *cur;
+ int rem;
+
+ blobmsg_for_each_attr(cur, attr, rem)
+ interface_add_data(iface, cur);
+}
+
+static struct device *
+proto_shell_create_tunnel(const char *name, struct blob_attr *attr)
+{
+ struct device *dev;
+ struct blob_buf b;
+
+ memset(&b, 0, sizeof(b));
+ blob_buf_init(&b, 0);
+ blob_put(&b, 0, blobmsg_data(attr), blobmsg_data_len(attr));
+ dev = device_create(name, &tunnel_device_type, blob_data(b.head));
+ blob_buf_free(&b);
+
+ return dev;
+}
+
enum {
NOTIFY_ACTION,
NOTIFY_ERROR,
NOTIFY_ADDR_EXT,
NOTIFY_ROUTES,
NOTIFY_ROUTES6,
+ NOTIFY_TUNNEL,
+ NOTIFY_DATA,
__NOTIFY_LAST
};
[NOTIFY_ADDR_EXT] = { .name = "address-external", .type = BLOBMSG_TYPE_BOOL },
[NOTIFY_ROUTES] = { .name = "routes", .type = BLOBMSG_TYPE_ARRAY },
[NOTIFY_ROUTES6] = { .name = "routes6", .type = BLOBMSG_TYPE_ARRAY },
+ [NOTIFY_TUNNEL] = { .name = "tunnel", .type = BLOBMSG_TYPE_TABLE },
+ [NOTIFY_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE },
};
static int
{
struct interface *iface = state->proto.iface;
struct blob_attr *cur;
+ struct device *dev;
+ const char *devname;
int dev_create = 1;
bool addr_ext = false;
bool up;
if (!iface->main_dev.dev)
return UBUS_STATUS_INVALID_ARGUMENT;
} else {
- if (state->l3_dev.dev)
- device_remove_user(&state->l3_dev);
+ 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;
+ }
- device_add_user(&state->l3_dev,
- device_get(blobmsg_data(tb[NOTIFY_IFNAME]), dev_create));
- iface->l3_dev = &state->l3_dev;
- device_claim(&state->l3_dev);
+ interface_set_l3_dev(iface, dev);
+ device_claim(&iface->l3_dev);
}
interface_update_start(iface);
state->proto.proto_event(&state->proto, IFPEV_UP);
+ if ((cur = tb[NOTIFY_DATA]))
+ proto_shell_parse_data(state->proto.iface, cur);
+
return 0;
}