#include "proto.h"
#include "ubus.h"
#include "system.h"
+#include "wireless.h"
-static struct ubus_context *ctx = NULL;
+struct ubus_context *ubus_ctx = NULL;
static struct blob_buf b;
static const char *ubus_path;
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- netifd_reload();
- return 0;
+ if (netifd_reload())
+ return UBUS_STATUS_NOT_FOUND;
+
+ return UBUS_STATUS_OK;
}
enum {
HR_TARGET,
HR_V6,
HR_INTERFACE,
+ HR_EXCLUDE,
__HR_MAX
};
[HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
[HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
[HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
+ [HR_EXCLUDE] = { .name = "exclude", .type = BLOBMSG_TYPE_BOOL },
};
static int
struct interface *iface = NULL;
union if_addr a;
bool v6 = false;
+ bool exclude = false;
blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg));
if (!tb[HR_TARGET])
if (tb[HR_V6])
v6 = blobmsg_get_bool(tb[HR_V6]);
+ if (tb[HR_EXCLUDE])
+ exclude = blobmsg_get_bool(tb[HR_EXCLUDE]);
+
if (tb[HR_INTERFACE])
iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node);
if (!inet_pton(v6 ? AF_INET6 : AF_INET, blobmsg_data(tb[HR_TARGET]), &a))
return UBUS_STATUS_INVALID_ARGUMENT;
-
- iface = interface_ip_add_target_route(&a, v6, iface);
+ iface = interface_ip_add_target_route(&a, v6, iface, exclude);
if (!iface)
return UBUS_STATUS_NOT_FOUND;
return 0;
}
+
+enum {
+ DI_NAME,
+ __DI_MAX
+};
+
+static const struct blobmsg_policy dynamic_policy[__DI_MAX] = {
+ [DI_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct blob_attr *tb[__DI_MAX];
+ struct interface *iface;
+ struct blob_attr *config;
+
+ blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[DI_NAME])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ const char *name = blobmsg_get_string(tb[DI_NAME]);
+
+ iface = interface_alloc(name, msg, true);
+ if (!iface)
+ return UBUS_STATUS_UNKNOWN_ERROR;
+
+ config = blob_memdup(msg);
+ if (!config)
+ goto error;
+
+ if (!interface_add(iface, config))
+ goto error_free_config;
+
+ return UBUS_STATUS_OK;
+
+error_free_config:
+ free(config);
+error:
+ free(iface);
+ return UBUS_STATUS_UNKNOWN_ERROR;
+}
+
+enum {
+ NETNS_UPDOWN_JAIL,
+ NETNS_UPDOWN_START,
+ __NETNS_UPDOWN_MAX
+};
+
+static const struct blobmsg_policy netns_updown_policy[__NETNS_UPDOWN_MAX] = {
+ [NETNS_UPDOWN_JAIL] = { .name = "jail", .type = BLOBMSG_TYPE_STRING },
+ [NETNS_UPDOWN_START] = { .name = "start", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_netns_updown(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ int target_netns_fd = ubus_request_get_caller_fd(req);
+ struct blob_attr *tb[__NETNS_UPDOWN_MAX];
+ bool start;
+
+ if (target_netns_fd < 0)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ blobmsg_parse(netns_updown_policy, __NETNS_UPDOWN_MAX, tb, blob_data(msg), blob_len(msg));
+
+ start = tb[NETNS_UPDOWN_START] && blobmsg_get_bool(tb[NETNS_UPDOWN_START]);
+
+ if (start) {
+ if (!tb[NETNS_UPDOWN_JAIL])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ interface_start_jail(target_netns_fd, blobmsg_get_string(tb[NETNS_UPDOWN_JAIL]));
+ } else {
+ interface_stop_jail(target_netns_fd);
+ }
+ close(target_netns_fd);
+
+ return UBUS_STATUS_OK;
+}
+
static struct ubus_method main_object_methods[] = {
{ .name = "restart", .handler = netifd_handle_restart },
{ .name = "reload", .handler = netifd_handle_reload },
UBUS_METHOD("add_host_route", netifd_add_host_route, route_policy),
{ .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
+ UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy),
+ UBUS_METHOD("netns_updown", netifd_netns_updown, netns_updown_policy),
};
static struct ubus_object_type main_object_type =
blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
if (tb[DEV_NAME]) {
- dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
+ dev = device_find(blobmsg_data(tb[DEV_NAME]));
if (!dev)
return UBUS_STATUS_INVALID_ARGUMENT;
}
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
goto error;
- if (!blobmsg_check_attr(cur, NULL))
+ if (!blobmsg_check_attr(cur, false))
goto error;
alias_notify_device(blobmsg_data(cur), dev);
return 0;
error:
- device_free_unused(dev);
+ device_free_unused();
return UBUS_STATUS_INVALID_ARGUMENT;
}
enum {
DEV_STATE_NAME,
DEV_STATE_DEFER,
+ DEV_STATE_AUTH_STATUS,
__DEV_STATE_MAX,
};
static const struct blobmsg_policy dev_state_policy[__DEV_STATE_MAX] = {
[DEV_STATE_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
[DEV_STATE_DEFER] = { .name = "defer", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_STATE_AUTH_STATUS] = { .name = "auth_status", .type = BLOBMSG_TYPE_BOOL },
};
static int
if (!cur)
return UBUS_STATUS_INVALID_ARGUMENT;
- dev = device_get(blobmsg_data(cur), false);
+ dev = device_find(blobmsg_data(cur));
if (!dev)
return UBUS_STATUS_NOT_FOUND;
if (cur)
device_set_deferred(dev, !!blobmsg_get_u8(cur));
+ cur = tb[DEV_STATE_AUTH_STATUS];
+ if (cur)
+ device_set_auth_status(dev, !!blobmsg_get_u8(cur));
+
+ return 0;
+}
+
+#ifdef DUMMY_MODE
+enum {
+ DEV_HOTPLUG_ATTR_NAME,
+ DEV_HOTPLUG_ATTR_ADD,
+ __DEV_HOTPLUG_ATTR_MAX,
+};
+
+static const struct blobmsg_policy dev_hotplug_policy[__DEV_HOTPLUG_ATTR_MAX] = {
+ [DEV_HOTPLUG_ATTR_NAME] = { "name", BLOBMSG_TYPE_STRING },
+ [DEV_HOTPLUG_ATTR_ADD] = { "add", BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_handle_dev_hotplug(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct blob_attr *tb[__DEV_HOTPLUG_ATTR_MAX];
+ const char *name;
+
+ blobmsg_parse(dev_hotplug_policy, __DEV_HOTPLUG_ATTR_MAX, tb,
+ blob_data(msg), blob_len(msg));
+
+ if (!tb[DEV_HOTPLUG_ATTR_NAME] || !tb[DEV_HOTPLUG_ATTR_ADD])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ name = blobmsg_get_string(tb[DEV_HOTPLUG_ATTR_NAME]);
+ device_hotplug_event(name, blobmsg_get_bool(tb[DEV_HOTPLUG_ATTR_ADD]));
+
+ return 0;
+}
+#endif
+
+static int
+netifd_handle_stp_init(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ device_stp_init();
+
return 0;
}
UBUS_METHOD("status", netifd_dev_status, dev_policy),
UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
UBUS_METHOD("set_state", netifd_handle_set_state, dev_state_policy),
+#ifdef DUMMY_MODE
+ UBUS_METHOD("hotplug_event", netifd_handle_dev_hotplug, dev_hotplug_policy),
+#endif
+ UBUS_METHOD_NOARG("stp_init", netifd_handle_stp_init)
};
static struct ubus_object_type dev_object_type =
static void
netifd_ubus_add_fd(void)
{
- ubus_add_uloop(ctx);
- system_fd_set_cloexec(ctx->sock.fd);
+ ubus_add_uloop(ubus_ctx);
+ system_fd_set_cloexec(ubus_ctx->sock.fd);
+}
+
+void netifd_ubus_device_notify(const char *event, struct blob_attr *data, int timeout)
+{
+ ubus_notify(ubus_ctx, &dev_object, event, data, timeout);
}
static void
};
int t = 2;
- if (ubus_reconnect(ctx, ubus_path) != 0) {
+ if (ubus_reconnect(ubus_ctx, ubus_path) != 0) {
DPRINTF("failed to reconnect, trying again in %d seconds\n", t);
uloop_timeout_set(&retry, t * 1000);
return;
}
- DPRINTF("reconnected to ubus, new id: %08x\n", ctx->local_id);
+ DPRINTF("reconnected to ubus, new id: %08x\n", ubus_ctx->local_id);
netifd_ubus_add_fd();
}
return 0;
}
+static int
+netifd_handle_renew(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct interface *iface;
+
+ iface = container_of(obj, struct interface, ubus);
+ interface_renew(iface);
+
+ return 0;
+}
+
static void
netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
{
}
static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6,
- bool enabled)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6, bool enabled)
{
struct device_addr *addr;
char *buf;
blobmsg_add_u32(&b, "mask", addr->mask);
+ if (addr->point_to_point) {
+ buf = blobmsg_alloc_string_buffer(&b, "ptpaddress", buflen);
+ inet_ntop(af, &addr->point_to_point, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+ }
+
if (addr->preferred_until) {
int preferred = addr->preferred_until - now;
if (preferred < 0)
if (addr->valid_until)
blobmsg_add_u32(&b, "valid", addr->valid_until - now);
+ if (addr->pclass)
+ blobmsg_add_string(&b, "class", addr->pclass);
+
blobmsg_close_table(&b, a);
}
}
+static void
+interface_ip_dump_neighbor_list(struct interface_ip_settings *ip, bool enabled)
+{
+ struct device_neighbor *neighbor;
+ int buflen = 128;
+ char *buf;
+ void *r;
+ int af;
+
+ vlist_for_each_element(&ip->neighbor, neighbor, node) {
+ if (neighbor->enabled != enabled)
+ continue;
+
+ if ((neighbor->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
+ af = AF_INET;
+ else
+ af = AF_INET6;
+
+ r = blobmsg_open_table(&b, NULL);
+
+ if (neighbor->flags & DEVNEIGH_MAC)
+ blobmsg_add_string(&b, "mac", format_macaddr(neighbor->macaddr));
+
+ buf = blobmsg_alloc_string_buffer(&b , "address", buflen);
+ inet_ntop(af, &neighbor->addr, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+
+ if (neighbor->proxy)
+ blobmsg_add_u32(&b, "proxy", neighbor->proxy);
+
+ if (neighbor->router)
+ blobmsg_add_u32(&b, "router", neighbor->router);
+
+ blobmsg_close_table(&b, r);
+ }
+}
+
static void
interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled)
{
if (route->enabled != enabled)
continue;
+ if ((ip->no_defaultroute == enabled) && !route->mask)
+ continue;
+
if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
af = AF_INET;
else
inet_ntop(af, &route->nexthop, buf, buflen);
blobmsg_add_string_buffer(&b);
+ if (route->flags & DEVROUTE_TYPE)
+ blobmsg_add_u32(&b, "type", route->type);
+
+ if (route->flags & DEVROUTE_PROTO)
+ blobmsg_add_u32(&b, "proto", route->proto);
+
if (route->flags & DEVROUTE_MTU)
blobmsg_add_u32(&b, "mtu", route->mtu);
if (route->valid_until)
blobmsg_add_u32(&b, "valid", route->valid_until - now);
+ buf = blobmsg_alloc_string_buffer(&b, "source", buflen);
+ inet_ntop(af, &route->source, buf, buflen);
+ snprintf(buf + strlen(buf), buflen - strlen(buf), "/%u", route->sourcemask);
+ blobmsg_add_string_buffer(&b);
+
blobmsg_close_table(&b, r);
}
}
if (prefix->valid_until)
blobmsg_add_u32(&b, "valid", prefix->valid_until - now);
+ void *c = blobmsg_open_table(&b, "local-address");
+ if (assign->enabled) {
+ buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
+ inet_ntop(AF_INET6, &assign->addr, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+
+ blobmsg_add_u32(&b, "mask", assign->length);
+ }
+ blobmsg_close_table(&b, c);
+
blobmsg_close_table(&b, a);
}
}
}
-
static void
-interface_ip_dump_dns_server_list(struct interface_ip_settings *ip,
- bool enabled)
+interface_ip_dump_dns_server_list(struct interface_ip_settings *ip, bool enabled)
{
struct dns_server *dns;
int buflen = 128;
}
static void
-interface_ip_dump_dns_search_list(struct interface_ip_settings *ip,
- bool enabled)
+interface_ip_dump_dns_search_list(struct interface_ip_settings *ip, bool enabled)
{
struct dns_search_domain *dns;
}
}
-static int
-netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
- struct ubus_request_data *req, const char *method,
- struct blob_attr *msg)
+static void
+netifd_dump_status(struct interface *iface)
{
- struct interface *iface;
struct interface_data *data;
struct device *dev;
void *a, *inactive;
- iface = container_of(obj, struct interface, ubus);
-
- blob_buf_init(&b, 0);
blobmsg_add_u8(&b, "up", iface->state == IFS_UP);
blobmsg_add_u8(&b, "pending", iface->state == IFS_SETUP);
blobmsg_add_u8(&b, "available", iface->available);
blobmsg_add_u8(&b, "autostart", iface->autostart);
+ blobmsg_add_u8(&b, "dynamic", iface->dynamic);
if (iface->state == IFS_UP) {
time_t cur = system_get_rtime();
blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
- blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
+ if (iface->l3_dev.dev)
+ blobmsg_add_string(&b, "l3_device", iface->l3_dev.dev->ifname);
}
if (iface->proto_handler)
blobmsg_add_string(&b, "proto", iface->proto_handler->name);
dev = iface->main_dev.dev;
- if (dev && !dev->hidden &&
+ if (dev && !dev->hidden && iface->proto_handler &&
!(iface->proto_handler->flags & PROTO_FLAG_NODEV))
blobmsg_add_string(&b, "device", dev->ifname);
+ if (iface->jail)
+ blobmsg_add_string(&b, "jail", iface->jail);
+
+ if (iface->jail_device)
+ blobmsg_add_string(&b, "jail_device", iface->jail_device);
+
if (iface->state == IFS_UP) {
+ if (iface->updated) {
+ a = blobmsg_open_array(&b, "updated");
+
+ if (iface->updated & IUF_ADDRESS)
+ blobmsg_add_string(&b, NULL, "addresses");
+ if (iface->updated & IUF_ROUTE)
+ blobmsg_add_string(&b, NULL, "routes");
+ if (iface->updated & IUF_PREFIX)
+ blobmsg_add_string(&b, NULL, "prefixes");
+ if (iface->updated & IUF_DATA)
+ blobmsg_add_string(&b, NULL, "data");
+
+ blobmsg_close_array(&b, a);
+ }
+
+ if (iface->ip4table)
+ blobmsg_add_u32(&b, "ip4table", iface->ip4table);
+ if (iface->ip6table)
+ blobmsg_add_u32(&b, "ip6table", iface->ip6table);
blobmsg_add_u32(&b, "metric", iface->metric);
+ blobmsg_add_u32(&b, "dns_metric", iface->dns_metric);
+ blobmsg_add_u8(&b, "delegation", !iface->proto_ip.no_delegation);
+ if (iface->assignment_weight)
+ blobmsg_add_u32(&b, "ip6weight", iface->assignment_weight);
a = blobmsg_open_array(&b, "ipv4-address");
interface_ip_dump_address_list(&iface->config_ip, false, true);
interface_ip_dump_address_list(&iface->proto_ip, false, true);
interface_ip_dump_dns_search_list(&iface->config_ip, true);
interface_ip_dump_dns_search_list(&iface->proto_ip, true);
blobmsg_close_array(&b, a);
+ a = blobmsg_open_array(&b, "neighbors");
+ interface_ip_dump_neighbor_list(&iface->config_ip, true);
+ interface_ip_dump_neighbor_list(&iface->proto_ip, true);
+ blobmsg_close_array(&b, a);
inactive = blobmsg_open_table(&b, "inactive");
a = blobmsg_open_array(&b, "ipv4-address");
interface_ip_dump_dns_search_list(&iface->config_ip, false);
interface_ip_dump_dns_search_list(&iface->proto_ip, false);
blobmsg_close_array(&b, a);
+ a = blobmsg_open_array(&b, "neighbors");
+ interface_ip_dump_neighbor_list(&iface->config_ip, false);
+ interface_ip_dump_neighbor_list(&iface->proto_ip, false);
+ blobmsg_close_array(&b, a);
blobmsg_close_table(&b, inactive);
}
a = blobmsg_open_table(&b, "data");
+
+ if (iface->zone)
+ blobmsg_add_string(&b, "zone", iface->zone);
avl_for_each_element(&iface->data, data, node)
- blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data));
+ blobmsg_add_blob(&b, data->data);
blobmsg_close_table(&b, a);
- if (!list_is_empty(&iface->errors))
+ if (!list_empty(&iface->errors))
netifd_add_interface_errors(&b, iface);
+}
+static int
+netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct interface *iface = container_of(obj, struct interface, ubus);
+
+ blob_buf_init(&b, 0);
+ netifd_dump_status(iface);
ubus_send_reply(ctx, req, b.head);
return 0;
}
+
+static int
+netifd_handle_dump(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ blob_buf_init(&b, 0);
+ void *a = blobmsg_open_array(&b, "interface");
+
+ struct interface *iface;
+ vlist_for_each_element(&interfaces, iface, node) {
+ void *i = blobmsg_open_table(&b, NULL);
+ blobmsg_add_string(&b, "interface", iface->name);
+ netifd_dump_status(iface);
+ blobmsg_close_table(&b, i);
+ }
+
+ blobmsg_close_array(&b, a);
+ ubus_send_reply(ctx, req, b.head);
+
+ return 0;
+}
+
+enum {
+ DEV_LINK_NAME,
+ DEV_LINK_EXT,
+ DEV_LINK_VLAN,
+ __DEV_LINK_MAX,
+};
+
+static const struct blobmsg_policy dev_link_policy[__DEV_LINK_MAX] = {
+ [DEV_LINK_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+ [DEV_LINK_EXT] = { .name = "link-ext", .type = BLOBMSG_TYPE_BOOL },
+ [DEV_LINK_VLAN] = { .name = "vlan", .type = BLOBMSG_TYPE_ARRAY },
+};
+
static int
netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- struct blob_attr *tb[__DEV_MAX];
+ struct blob_attr *tb[__DEV_LINK_MAX];
+ struct blob_attr *cur;
struct interface *iface;
- struct device *dev;
bool add = !strncmp(method, "add", 3);
- int ret;
+ bool link_ext = true;
iface = container_of(obj, struct interface, ubus);
- blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(dev_link_policy, __DEV_LINK_MAX, tb, blob_data(msg), blob_len(msg));
- if (!tb[DEV_NAME])
+ if (!tb[DEV_LINK_NAME])
return UBUS_STATUS_INVALID_ARGUMENT;
- device_lock();
-
- dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
- if (!dev) {
- ret = UBUS_STATUS_NOT_FOUND;
- goto out;
- }
-
- if (add) {
- device_set_present(dev, true);
- if (iface->device_config)
- device_set_config(dev, &simple_device_type, iface->config);
-
- system_if_apply_settings(dev, &dev->settings);
- ret = interface_add_link(iface, dev);
- } else {
- ret = interface_remove_link(iface, dev);
- }
-
-out:
- device_unlock();
+ cur = tb[DEV_LINK_EXT];
+ if (cur)
+ link_ext = blobmsg_get_bool(cur);
- return ret;
+ return interface_handle_link(iface, blobmsg_data(tb[DEV_LINK_NAME]),
+ tb[DEV_LINK_VLAN], add, link_ext);
}
struct blob_attr *msg)
{
struct interface *iface;
- struct device *dev;
+ struct device *dev, *bridge_dev = NULL;
const struct device_hotplug_ops *ops;
iface = container_of(obj, struct interface, ubus);
dev = iface->main_dev.dev;
if (!dev)
- return 0;
+ goto out;
ops = dev->hotplug_ops;
if (!ops)
- return 0;
+ goto out;
- return ops->prepare(dev);
+ ops->prepare(dev, &bridge_dev);
+
+out:
+ blob_buf_init(&b, 0);
+ if (bridge_dev)
+ blobmsg_add_string(&b, "bridge", bridge_dev->ifname);
+ ubus_send_reply(ctx, req, b.head);
+
+ return 0;
}
static int
struct blob_attr *msg)
{
struct interface *iface;
- struct blob_attr *cur;
- int rem, ret;
iface = container_of(obj, struct interface, ubus);
- blob_for_each_attr(cur, msg, rem) {
- ret = interface_add_data(iface, cur);
- if (ret)
- return ret;
- }
-
- return 0;
+ return interface_parse_data(iface, msg);
}
static struct ubus_method iface_object_methods[] = {
{ .name = "up", .handler = netifd_handle_up },
{ .name = "down", .handler = netifd_handle_down },
+ { .name = "renew", .handler = netifd_handle_renew },
{ .name = "status", .handler = netifd_handle_status },
{ .name = "prepare", .handler = netifd_handle_iface_prepare },
- UBUS_METHOD("add_device", netifd_iface_handle_device, dev_policy ),
- UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_policy ),
+ { .name = "dump", .handler = netifd_handle_dump },
+ UBUS_METHOD("add_device", netifd_iface_handle_device, dev_link_policy ),
+ UBUS_METHOD("remove_device", netifd_iface_handle_device, dev_link_policy ),
{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
{ .name = "remove", .handler = netifd_iface_remove },
{ .name = "set_data", .handler = netifd_handle_set_data },
static void netifd_add_object(struct ubus_object *obj)
{
- int ret = ubus_add_object(ctx, obj);
+ int ret = ubus_add_object(ubus_ctx, obj);
if (ret != 0)
fprintf(stderr, "Failed to publish object '%s': %s\n", obj->name, ubus_strerror(ret));
int i;
methods = calloc(1, sizeof(iface_object_methods));
+ if (!methods)
+ return;
+
memcpy(methods, iface_object_methods, sizeof(iface_object_methods));
iface_object.methods = methods;
for (i = 0; i < ARRAY_SIZE(iface_object_methods); i++) {
+ if (methods[i].handler == netifd_handle_dump)
+ continue;
+
methods[i].handler = netifd_handle_iface;
methods[i].policy = &iface_policy;
methods[i].n_policy = 1;
netifd_add_object(&iface_object);
}
+static struct wireless_device *
+get_wdev(struct blob_attr *msg, int *ret)
+{
+ struct blobmsg_policy wdev_policy = {
+ .name = "device",
+ .type = BLOBMSG_TYPE_STRING,
+ };
+ struct blob_attr *dev_attr;
+ struct wireless_device *wdev = NULL;
+
+
+ blobmsg_parse(&wdev_policy, 1, &dev_attr, blob_data(msg), blob_len(msg));
+ if (!dev_attr) {
+ *ret = UBUS_STATUS_INVALID_ARGUMENT;
+ return NULL;
+ }
+
+ wdev = vlist_find(&wireless_devices, blobmsg_data(dev_attr), wdev, node);
+ if (!wdev) {
+ *ret = UBUS_STATUS_NOT_FOUND;
+ return NULL;
+ }
+
+ *ret = 0;
+ return wdev;
+}
+
+static int
+netifd_handle_wdev_reconf(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (ret == UBUS_STATUS_NOT_FOUND)
+ return ret;
+
+ if (wdev) {
+ wireless_device_reconf(wdev);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_reconf(wdev);
+ }
+
+ return 0;
+}
+
+static int
+netifd_handle_wdev_up(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (ret == UBUS_STATUS_NOT_FOUND)
+ return ret;
+
+ if (wdev) {
+ wireless_device_set_up(wdev);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_set_up(wdev);
+ }
+
+ return 0;
+}
+
+static int
+netifd_handle_wdev_down(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (ret == UBUS_STATUS_NOT_FOUND)
+ return ret;
+
+ if (wdev) {
+ wireless_device_set_down(wdev);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_set_down(wdev);
+ }
+
+ return 0;
+}
+
+static int
+netifd_handle_wdev_status(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (ret == UBUS_STATUS_NOT_FOUND)
+ return ret;
+
+ blob_buf_init(&b, 0);
+ if (wdev) {
+ wireless_device_status(wdev, &b);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_status(wdev, &b);
+ }
+ ubus_send_reply(ctx, req, b.head);
+ return 0;
+}
+
+static int
+netifd_handle_wdev_get_validate(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (ret == UBUS_STATUS_NOT_FOUND)
+ return ret;
+
+ blob_buf_init(&b, 0);
+ if (wdev) {
+ wireless_device_get_validate(wdev, &b);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_get_validate(wdev, &b);
+ }
+ ubus_send_reply(ctx, req, b.head);
+ return 0;
+}
+
+static int
+netifd_handle_wdev_notify(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct wireless_device *wdev;
+ int ret;
+
+ wdev = get_wdev(msg, &ret);
+ if (!wdev)
+ return ret;
+
+ return wireless_device_notify(wdev, msg, req);
+}
+
+static struct ubus_method wireless_object_methods[] = {
+ { .name = "up", .handler = netifd_handle_wdev_up },
+ { .name = "down", .handler = netifd_handle_wdev_down },
+ { .name = "reconf", .handler = netifd_handle_wdev_reconf },
+ { .name = "status", .handler = netifd_handle_wdev_status },
+ { .name = "notify", .handler = netifd_handle_wdev_notify },
+ { .name = "get_validate", .handler = netifd_handle_wdev_get_validate },
+};
+
+static struct ubus_object_type wireless_object_type =
+ UBUS_OBJECT_TYPE("netifd_iface", wireless_object_methods);
+
+
+static struct ubus_object wireless_object = {
+ .name = "network.wireless",
+ .type = &wireless_object_type,
+ .methods = wireless_object_methods,
+ .n_methods = ARRAY_SIZE(wireless_object_methods),
+};
+
+int
+netifd_extdev_invoke(uint32_t id, const char *method, struct blob_attr *msg,
+ ubus_data_handler_t data_cb, void *data)
+{
+ return ubus_invoke(ubus_ctx, id, method, msg, data_cb, data, 3000);
+}
+
int
netifd_ubus_init(const char *path)
{
uloop_init();
ubus_path = path;
- ctx = ubus_connect(path);
- if (!ctx)
+ ubus_ctx = ubus_connect(path);
+ if (!ubus_ctx)
return -EIO;
- DPRINTF("connected as %08x\n", ctx->local_id);
- ctx->connection_lost = netifd_ubus_connection_lost;
+ DPRINTF("connected as %08x\n", ubus_ctx->local_id);
+ ubus_ctx->connection_lost = netifd_ubus_connection_lost;
netifd_ubus_add_fd();
netifd_add_object(&main_object);
netifd_add_object(&dev_object);
+ netifd_add_object(&wireless_object);
netifd_add_iface_object();
return 0;
void
netifd_ubus_done(void)
{
- ubus_free(ctx);
+ ubus_free(ubus_ctx);
}
void
blob_buf_init(&b, 0);
blobmsg_add_string(&b, "action", up ? "ifup" : "ifdown");
blobmsg_add_string(&b, "interface", iface->name);
- ubus_send_event(ctx, "network.interface", b.head);
+ ubus_send_event(ubus_ctx, "network.interface", b.head);
+}
+
+void
+netifd_ubus_interface_notify(struct interface *iface, bool up)
+{
+ const char *event = (up) ? "interface.update" : "interface.down";
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "interface", iface->name);
+ netifd_dump_status(iface);
+ ubus_notify(ubus_ctx, &iface_object, event, b.head, -1);
+ ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1);
}
void
obj->type = &iface_object_type;
obj->methods = iface_object_methods;
obj->n_methods = ARRAY_SIZE(iface_object_methods);
- if (ubus_add_object(ctx, &iface->ubus)) {
+ if (ubus_add_object(ubus_ctx, &iface->ubus)) {
DPRINTF("failed to publish ubus object for interface '%s'\n", iface->name);
free(name);
obj->name = NULL;
if (!iface->ubus.name)
return;
- ubus_remove_object(ctx, &iface->ubus);
+ ubus_remove_object(ubus_ctx, &iface->ubus);
free((void *) iface->ubus.name);
}
projects / project / netifd.git / blobdiff