+#define _GNU_SOURCE
+
#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 */
-enum {
- DEV_NAME,
- DEV_FORCE,
- __DEV_MAX,
- __DEV_MAX_NOFORCE = __DEV_MAX - 1,
-};
-
-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)
-{
- struct device *dev;
- struct blob_attr *tb[__DEV_MAX];
- bool add = !strncmp(method, "add", 3);
-
- blobmsg_parse(dev_policy, __DEV_MAX, tb, blob_data(msg), blob_len(msg));
-
- if (!tb[DEV_NAME])
- return UBUS_STATUS_INVALID_ARGUMENT;
-
- dev = device_get(blobmsg_data(tb[DEV_NAME]), false);
- 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);
-
- return 0;
-}
-
static int
netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
}
static struct ubus_method main_object_methods[] = {
- UBUS_METHOD("add_device", netifd_handle_device, dev_policy),
- UBUS_METHOD("remove_device", netifd_handle_device, dev_policy),
{ .name = "restart", .handler = netifd_handle_restart },
{ .name = "reload", .handler = netifd_handle_reload },
};
UBUS_OBJECT_TYPE("netifd", main_object_methods);
static struct ubus_object main_object = {
- .name = "network.interface",
+ .name = "network",
.type = &main_object_type,
.methods = main_object_methods,
.n_methods = ARRAY_SIZE(main_object_methods),
};
+enum {
+ DEV_NAME,
+ __DEV_MAX,
+};
+
+static const struct blobmsg_policy dev_policy[__DEV_MAX] = {
+ [DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
+};
+
+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 = NULL;
+ struct blob_attr *tb[__DEV_MAX];
+
+ 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);
+ 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;
+}
+
+static struct ubus_method dev_object_methods[] = {
+ UBUS_METHOD("status", netifd_dev_status, dev_policy)
+};
+
+static struct ubus_object_type dev_object_type =
+ UBUS_OBJECT_TYPE("device", dev_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)
{
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
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->state == IFS_UP) {
+ time_t cur = system_get_rtime();
+ blobmsg_add_u32(&b, "uptime", cur - iface->start_time);
+ }
+
if (iface->main_dev.dev) {
struct device *dev = iface->main_dev.dev;
const char *field;
devinfo = blobmsg_open_table(&b, field);
blobmsg_add_string(&b, "name", dev->ifname);
- if (dev->type->dump_status)
- dev->type->dump_status(dev, &b);
-
blobmsg_close_table(&b, devinfo);
}
{ .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_NOFORCE },
+ .policy = dev_policy, .n_policy = __DEV_MAX },
{ .name = "remove_device", .handler = netifd_iface_handle_device,
- .policy = dev_policy, .n_policy = __DEV_MAX_NOFORCE },
+ .policy = dev_policy, .n_policy = __DEV_MAX },
{ .name = "notify_proto", .handler = netifd_iface_notify_proto },
{ .name = "remove", .handler = netifd_iface_remove }
};
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;
projects / project / netifd.git / blobdiff