if (!iface)
return UBUS_STATUS_UNKNOWN_ERROR;
- interface_set_dynamic(iface);
iface->device_config = true;
config = blob_memdup(msg);
goto error;
interface_add(iface, config);
+ interface_set_dynamic(iface);
// need to look up the interface name again, in case of config update,
iface = vlist_find(&interfaces, name, iface, node);
if (route->enabled != enabled)
continue;
+ if ((ip->no_defaultroute == enabled) && !route->mask)
+ continue;
+
if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
af = AF_INET;
else
buf = blobmsg_alloc_string_buffer(&b, "source", buflen);
inet_ntop(af, &route->source, buf, buflen);
- snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask);
+ snprintf(buf + strlen(buf), buflen - strlen(buf), "/%u", route->sourcemask);
blobmsg_add_string_buffer(&b);
blobmsg_close_table(&b, r);
}
static void
-netifd_dump_status(struct interface *iface)
+netifd_dump_status(struct interface *iface, bool up)
{
struct interface_data *data;
struct device *dev;
void *a, *inactive;
- blobmsg_add_u8(&b, "up", iface->state == IFS_UP);
+ blobmsg_add_u8(&b, "up", 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_string(&b, "device", dev->ifname);
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_u8(&b, "delegation", !iface->proto_ip.no_delegation);
a = blobmsg_open_array(&b, "ipv4-address");
struct interface *iface = container_of(obj, struct interface, ubus);
blob_buf_init(&b, 0);
- netifd_dump_status(iface);
+ netifd_dump_status(iface, true);
ubus_send_reply(ctx, req, b.head);
return 0;
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);
+ netifd_dump_status(iface, true);
blobmsg_close_table(&b, i);
}
int ret;
wdev = get_wdev(msg, &ret);
- if (!wdev)
+ if (ret == UBUS_STATUS_NOT_FOUND)
return ret;
- wireless_device_set_up(wdev);
+ if (wdev) {
+ wireless_device_set_up(wdev);
+ } else {
+ vlist_for_each_element(&wireless_devices, wdev, node)
+ wireless_device_set_up(wdev);
+ }
+
return 0;
}
int ret;
wdev = get_wdev(msg, &ret);
- if (!wdev)
+ if (ret == UBUS_STATUS_NOT_FOUND)
return ret;
- wireless_device_set_down(wdev);
+ 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_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)
{ .name = "down", .handler = netifd_handle_wdev_down },
{ .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 =
const char *event = (up) ? "update" : "down";
blob_buf_init(&b, 0);
blobmsg_add_string(&b, "interface", iface->name);
- netifd_dump_status(iface);
+ netifd_dump_status(iface, up);
ubus_notify(ubus_ctx, &iface_object, event, b.head, -1);
ubus_notify(ubus_ctx, &iface->ubus, event, b.head, -1);
}