#define _GNU_SOURCE
+#include <arpa/inet.h>
#include <string.h>
#include <stdio.h>
static int
netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ netifd_reload();
+ return 0;
+}
+
+enum {
+ HR_TARGET,
+ HR_V6,
+ __HR_MAX
+};
+
+static const struct blobmsg_policy route_policy[__HR_MAX] = {
+ [HR_TARGET] = { .name = "target", .type = BLOBMSG_TYPE_STRING },
+ [HR_V6] = { .name = "v6", .type = BLOBMSG_TYPE_BOOL },
+};
+
+static int
+netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- netifd_reload();
+ struct blob_attr *tb[__HR_MAX];
+ struct interface *iface;
+ union if_addr a;
+ bool v6 = false;
+
+ blobmsg_parse(route_policy, __HR_MAX, tb, blob_data(msg), blob_len(msg));
+ if (!tb[HR_TARGET])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if (tb[HR_V6])
+ v6 = blobmsg_get_bool(tb[HR_V6]);
+
+ memset(&a, 0, sizeof(a));
+ 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);
+ if (!iface)
+ return UBUS_STATUS_NOT_FOUND;
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_string(&b, "interface", iface->name);
+ ubus_send_reply(ctx, req, b.head);
+
return 0;
}
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),
};
static struct ubus_object_type main_object_type =
return 0;
}
+enum {
+ ALIAS_ATTR_ALIAS,
+ ALIAS_ATTR_DEV,
+ __ALIAS_ATTR_MAX,
+};
+
+static const struct blobmsg_policy alias_attrs[__ALIAS_ATTR_MAX] = {
+ [ALIAS_ATTR_ALIAS] = { "alias", BLOBMSG_TYPE_ARRAY },
+ [ALIAS_ATTR_DEV] = { "device", BLOBMSG_TYPE_STRING },
+};
+
+static int
+netifd_handle_alias(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct device *dev = NULL;
+ struct blob_attr *tb[__ALIAS_ATTR_MAX];
+ struct blob_attr *cur;
+ int rem;
+
+ blobmsg_parse(alias_attrs, __ALIAS_ATTR_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[ALIAS_ATTR_ALIAS])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ if ((cur = tb[ALIAS_ATTR_DEV]) != NULL) {
+ dev = device_get(blobmsg_data(cur), true);
+ if (!dev)
+ return UBUS_STATUS_NOT_FOUND;
+ }
+
+ blobmsg_for_each_attr(cur, tb[ALIAS_ATTR_ALIAS], rem) {
+ if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING)
+ goto error;
+
+ if (!blobmsg_check_attr(cur, NULL))
+ goto error;
+
+ alias_notify_device(blobmsg_data(cur), dev);
+ }
+ return 0;
+
+error:
+ device_free_unused(dev);
+ return UBUS_STATUS_INVALID_ARGUMENT;
+}
+
static struct ubus_method dev_object_methods[] = {
- UBUS_METHOD("status", netifd_dev_status, dev_policy)
+ UBUS_METHOD("status", netifd_dev_status, dev_policy),
+ UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
};
static struct ubus_object_type dev_object_type =
blobmsg_close_array(b, e);
}
+static void
+interface_ip_dump_address_list(struct interface_ip_settings *ip)
+{
+ struct device_addr *addr;
+ char *buf;
+ void *a;
+ int buflen = 128;
+ int af;
+
+ vlist_for_each_element(&ip->addr, addr, node) {
+ if ((addr->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
+ af = AF_INET;
+ else
+ af = AF_INET6;
+
+ a = blobmsg_open_table(&b, NULL);
+
+ buf = blobmsg_alloc_string_buffer(&b, "address", buflen);
+ inet_ntop(af, &addr->addr, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+
+ blobmsg_add_u32(&b, "mask", addr->mask);
+
+ blobmsg_close_table(&b, a);
+ }
+}
+
+static void
+interface_ip_dump_route_list(struct interface_ip_settings *ip)
+{
+ struct device_route *route;
+ static char *buf;
+ int buflen = 128;
+ void *r;
+ int af;
+
+ vlist_for_each_element(&ip->route, route, node) {
+ if ((route->flags & DEVADDR_FAMILY) == DEVADDR_INET4)
+ af = AF_INET;
+ else
+ af = AF_INET6;
+
+ r = blobmsg_open_table(&b, NULL);
+
+ buf = blobmsg_alloc_string_buffer(&b, "target", buflen);
+ inet_ntop(af, &route->addr, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+
+ blobmsg_add_u32(&b, "mask", route->mask);
+
+ buf = blobmsg_alloc_string_buffer(&b, "nexthop", buflen);
+ inet_ntop(af, &route->nexthop, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+
+ blobmsg_close_table(&b, r);
+ }
+}
+
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;
+ struct interface_data *data;
+ struct device *dev;
+ void *a;
iface = container_of(obj, struct interface, ubus);
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->main_dev.dev) {
- struct device *dev = iface->main_dev.dev;
- const char *field;
- void *devinfo;
+ dev = iface->main_dev.dev;
+ if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+ blobmsg_add_string(&b, "device", dev->ifname);
- /* use a different field for virtual devices */
- if (dev->avl.key)
- field = "device";
- else
- field = "link";
+ if (iface->state == IFS_UP) {
+ a = blobmsg_open_array(&b, "address");
+ interface_ip_dump_address_list(&iface->config_ip);
+ interface_ip_dump_address_list(&iface->proto_ip);
+ blobmsg_close_array(&b, a);
+ a = blobmsg_open_array(&b, "route");
+ interface_ip_dump_route_list(&iface->config_ip);
+ interface_ip_dump_route_list(&iface->proto_ip);
+ blobmsg_close_array(&b, a);
+ }
- devinfo = blobmsg_open_table(&b, field);
- blobmsg_add_string(&b, "name", dev->ifname);
+ a = blobmsg_open_table(&b, "data");
+ avl_for_each_element(&iface->data, data, node)
+ blob_put(&b, blob_id(data->data), blob_data(data->data), blob_len(data->data));
- blobmsg_close_table(&b, devinfo);
- }
+ blobmsg_close_table(&b, a);
if (!list_is_empty(&iface->errors))
netifd_add_interface_errors(&b, iface);
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
- struct interface *iface;
- struct device *dev, *main_dev;
struct blob_attr *tb[__DEV_MAX];
+ struct interface *iface;
+ struct device *dev;
bool add = !strncmp(method, "add", 3);
int ret;
if (!tb[DEV_NAME])
return UBUS_STATUS_INVALID_ARGUMENT;
- main_dev = iface->main_dev.dev;
- if (!main_dev)
- return UBUS_STATUS_NOT_FOUND;
+ device_lock();
- if (!main_dev->hotplug_ops)
- return UBUS_STATUS_NOT_SUPPORTED;
-
- dev = device_get(blobmsg_data(tb[DEV_NAME]), add);
- if (!dev)
+ dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
+ if (add && !dev)
return UBUS_STATUS_NOT_FOUND;
- if (main_dev != dev) {
- if (add)
- ret = main_dev->hotplug_ops->add(main_dev, dev);
- else
- ret = main_dev->hotplug_ops->del(main_dev, dev);
- if (ret)
- ret = UBUS_STATUS_UNKNOWN_ERROR;
- } else {
- ret = UBUS_STATUS_INVALID_ARGUMENT;
- }
-
if (add)
- device_free_unused(dev);
+ return interface_add_link(iface, dev);
+ else
+ return interface_remove_link(iface, dev);
+
+ device_unlock();
return ret;
}
return 0;
}
+static int
+netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ struct interface *iface;
+ struct device *dev;
+ const struct device_hotplug_ops *ops;
+
+ iface = container_of(obj, struct interface, ubus);
+ dev = iface->main_dev.dev;
+ if (!dev)
+ return 0;
+
+ ops = dev->hotplug_ops;
+ if (!ops)
+ return 0;
+
+ return ops->prepare(dev);
+}
+
+static int
+netifd_handle_set_data(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ 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;
+}
+
static struct ubus_method iface_object_methods[] = {
{ .name = "up", .handler = netifd_handle_up },
{ .name = "down", .handler = netifd_handle_down },
{ .name = "status", .handler = netifd_handle_status },
- { .name = "add_device", .handler = netifd_iface_handle_device,
- .policy = dev_policy, .n_policy = __DEV_MAX },
- { .name = "remove_device", .handler = netifd_iface_handle_device,
- .policy = dev_policy, .n_policy = __DEV_MAX },
+ { .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 = "notify_proto", .handler = netifd_iface_notify_proto },
- { .name = "remove", .handler = netifd_iface_remove }
+ { .name = "remove", .handler = netifd_iface_remove },
+ { .name = "set_data", .handler = netifd_handle_set_data },
};
static struct ubus_object_type iface_object_type =
projects / project / netifd.git / blobdiff