+#define _GNU_SOURCE
+
+#include <arpa/inet.h>
#include <string.h>
+#include <stdio.h>
#include "netifd.h"
#include "interface.h"
+#include "proto.h"
#include "ubus.h"
+#include "system.h"
static struct ubus_context *ctx = NULL;
static struct blob_buf b;
+static struct netifd_fd ubus_fd;
/* global object */
+static int
+netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
+{
+ netifd_restart();
+ return 0;
+}
+
+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;
+}
+
+static struct ubus_method main_object_methods[] = {
+ { .name = "restart", .handler = netifd_handle_restart },
+ { .name = "reload", .handler = netifd_handle_reload },
+};
+
+static struct ubus_object_type main_object_type =
+ UBUS_OBJECT_TYPE("netifd", main_object_methods);
+
+static struct ubus_object main_object = {
+ .name = "network",
+ .type = &main_object_type,
+ .methods = main_object_methods,
+ .n_methods = ARRAY_SIZE(main_object_methods),
+};
+
enum {
DEV_NAME,
- DEV_FORCE,
- DEV_LAST,
+ __DEV_MAX,
};
-static const struct blobmsg_policy dev_policy[] = {
+static const struct blobmsg_policy dev_policy[__DEV_MAX] = {
[DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
- [DEV_FORCE] = { .name = "force", .type = BLOBMSG_TYPE_INT8 },
};
-static int netifd_handle_device(struct ubus_context *ctx, struct ubus_object *obj,
- struct ubus_request_data *req, const char *method,
- struct blob_attr *msg)
+static int
+netifd_dev_status(struct ubus_context *ctx, struct ubus_object *obj,
+ struct ubus_request_data *req, const char *method,
+ struct blob_attr *msg)
{
- struct device *dev;
- struct blob_attr *tb[DEV_LAST];
- bool add = !strncmp(method, "add", 3);
+ struct device *dev = NULL;
+ struct blob_attr *tb[__DEV_MAX];
- blobmsg_parse(dev_policy, ARRAY_SIZE(dev_policy), tb, blob_data(msg), blob_len(msg));
+ blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
- if (!tb[DEV_NAME])
+ if (tb[DEV_NAME]) {
+ dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
+ if (!dev)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+ }
+
+ blob_buf_init(&b, 0);
+ device_dump_status(&b, dev);
+ ubus_send_reply(ctx, req, b.head);
+
+ 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;
- dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
- if (!dev)
- return UBUS_STATUS_NOT_FOUND;
+ if ((cur = tb[ALIAS_ATTR_DEV]) != NULL) {
+ dev = device_get(blobmsg_data(cur), true);
+ if (!dev)
+ return UBUS_STATUS_NOT_FOUND;
+ }
- if (!add || (tb[DEV_FORCE] && blobmsg_get_u8(tb[DEV_FORCE])))
- device_set_present(dev, add);
- else
- check_device_state(dev);
+ 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 main_object_methods[] = {
- UBUS_METHOD("add_device", netifd_handle_device, dev_policy),
- UBUS_METHOD("del_device", netifd_handle_device, dev_policy),
+static struct ubus_method dev_object_methods[] = {
+ UBUS_METHOD("status", netifd_dev_status, dev_policy),
+ UBUS_METHOD("set_alias", netifd_handle_alias, alias_attrs),
};
-static struct ubus_object_type main_object_type =
- UBUS_OBJECT_TYPE("netifd", main_object_methods);
+static struct ubus_object_type dev_object_type =
+ UBUS_OBJECT_TYPE("device", dev_object_methods);
-static struct ubus_object main_object = {
- .name = "network.interface",
- .type = &main_object_type,
- .methods = main_object_methods,
- .n_methods = ARRAY_SIZE(main_object_methods),
+static struct ubus_object dev_object = {
+ .name = "network.device",
+ .type = &dev_object_type,
+ .methods = dev_object_methods,
+ .n_methods = ARRAY_SIZE(dev_object_methods),
};
-int netifd_ubus_init(const char *path)
+int
+netifd_ubus_init(const char *path)
{
int ret;
DPRINTF("connected as %08x\n", ctx->local_id);
uloop_init();
ubus_add_uloop(ctx);
+ ubus_fd.fd = ctx->sock.fd;
+ netifd_fd_add(&ubus_fd);
ret = ubus_add_object(ctx, &main_object);
+ if (ret)
+ goto out;
+
+ ret = ubus_add_object(ctx, &dev_object);
+
+out:
if (ret != 0)
fprintf(stderr, "Failed to publish object: %s\n", ubus_strerror(ret));
-
- return 0;
+ return ret;
}
-void netifd_ubus_done(void)
+void
+netifd_ubus_done(void)
{
ubus_free(ctx);
}
/* per-interface object */
-static int netifd_handle_up(struct ubus_context *ctx, struct ubus_object *obj,
- struct ubus_request_data *req, const char *method,
- struct blob_attr *msg)
+static int
+netifd_handle_up(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);
- set_interface_up(iface);
+ interface_set_up(iface);
return 0;
}
-static int netifd_handle_down(struct ubus_context *ctx, struct ubus_object *obj,
- struct ubus_request_data *req, const char *method,
- struct blob_attr *msg)
+static int
+netifd_handle_down(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);
- set_interface_down(iface);
+ interface_set_down(iface);
return 0;
}
-static void netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
+static void
+netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
{
struct interface_error *error;
void *e, *e2, *e3;
blobmsg_close_array(b, e);
}
-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
+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)
{
- static const char *iface_state[] = {
- [IFS_SETUP] = "setup",
- [IFS_UP] = "up",
- [IFS_TEARDOWN] = "teardown",
- [IFS_DOWN] = "down",
- };
struct interface *iface;
+ struct interface_data *data;
+ struct device *dev;
+ void *a;
iface = container_of(obj, struct interface, ubus);
blob_buf_init(&b, 0);
- blobmsg_add_string(&b, "state", iface_state[iface->state]);
- blobmsg_add_u8(&b, "active", iface->active);
+ 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);
- if (iface->main_dev.dev) {
- struct device *dev = iface->main_dev.dev;
- const char *field;
- void *devinfo;
-
- /* use a different field for virtual devices */
- if (dev->avl.key)
- field = "device";
- else
- field = "link";
-
- devinfo = blobmsg_open_table(&b, field);
- blobmsg_add_string(&b, "name", dev->ifname);
- if (dev->type->dump_status)
- dev->type->dump_status(dev, &b);
+ 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);
+ }
- blobmsg_close_table(&b, devinfo);
+ dev = iface->main_dev.dev;
+ if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV))
+ blobmsg_add_string(&b, "device", dev->ifname);
+
+ 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);
}
+ 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, a);
+
if (!list_is_empty(&iface->errors))
netifd_add_interface_errors(&b, iface);
return 0;
}
+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 interface *iface;
+ struct device *dev;
+ bool add = !strncmp(method, "add", 3);
+ int ret;
+
+ iface = container_of(obj, struct interface, ubus);
+
+ blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
+
+ if (!tb[DEV_NAME])
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ device_lock();
+
+ dev = device_get(blobmsg_data(tb[DEV_NAME]), add ? 2 : 0);
+ if (add && !dev)
+ return UBUS_STATUS_NOT_FOUND;
+
+ if (add)
+ return interface_add_link(iface, dev);
+ else
+ return interface_remove_link(iface, dev);
+
+ device_unlock();
+
+ return ret;
+}
+
+
+static int
+netifd_iface_notify_proto(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);
+
+ if (!iface->proto || !iface->proto->notify)
+ return UBUS_STATUS_NOT_SUPPORTED;
+
+ return iface->proto->notify(iface->proto, msg);
+}
+
+static void
+netifd_iface_do_remove(struct uloop_timeout *timeout)
+{
+ struct interface *iface;
+
+ iface = container_of(timeout, struct interface, remove_timer);
+ vlist_delete(&interfaces, &iface->node);
+}
+
+static int
+netifd_iface_remove(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);
+ if (iface->remove_timer.cb)
+ return UBUS_STATUS_INVALID_ARGUMENT;
+
+ iface->remove_timer.cb = netifd_iface_do_remove;
+ uloop_timeout_set(&iface->remove_timer, 100);
+ 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 = "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 = "set_data", .handler = netifd_handle_set_data },
};
static struct ubus_object_type iface_object_type =
UBUS_OBJECT_TYPE("netifd_iface", iface_object_methods);
-void netifd_ubus_add_interface(struct interface *iface)
+void
+netifd_ubus_interface_event(struct interface *iface, bool up)
+{
+ 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);
+}
+
+void
+netifd_ubus_add_interface(struct interface *iface)
{
struct ubus_object *obj = &iface->ubus;
- char *name;
+ char *name = NULL;
- name = malloc(strlen(main_object.name) + strlen(iface->name) + 2);
+ asprintf(&name, "%s.interface.%s", main_object.name, iface->name);
if (!name)
return;
- sprintf(name, "%s.%s", main_object.name, iface->name);
obj->name = name;
obj->type = &iface_object_type;
obj->methods = iface_object_methods;
}
}
-void netifd_ubus_remove_interface(struct interface *iface)
+void
+netifd_ubus_remove_interface(struct interface *iface)
{
if (!iface->ubus.name)
return;
projects / project / netifd.git / blobdiff