+/*
+ * netifd - network interface daemon
+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#define _GNU_SOURCE
#include <arpa/inet.h>
static struct ubus_context *ctx = NULL;
static struct blob_buf b;
static struct netifd_fd ubus_fd;
+static const char *ubus_path;
/* global object */
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 int
+netifd_get_proto_handlers(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);
+ proto_dump_handlers(&b);
+ 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),
+ { .name = "get_proto_handlers", .handler = netifd_get_proto_handlers },
};
static struct ubus_object_type main_object_type =
.n_methods = ARRAY_SIZE(dev_object_methods),
};
+static void
+netifd_ubus_add_fd(void)
+{
+ ubus_add_uloop(ctx);
+ ubus_fd.fd = ctx->sock.fd;
+ netifd_fd_add(&ubus_fd);
+}
+
+static void
+netifd_ubus_reconnect_timer(struct uloop_timeout *timeout)
+{
+ static struct uloop_timeout retry = {
+ .cb = netifd_ubus_reconnect_timer,
+ };
+ int t = 2;
+
+ if (ubus_reconnect(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);
+ netifd_ubus_add_fd();
+}
+
+static void
+netifd_ubus_connection_lost(struct ubus_context *ctx)
+{
+ netifd_fd_delete(&ubus_fd);
+ netifd_ubus_reconnect_timer(NULL);
+}
+
int
netifd_ubus_init(const char *path)
{
int ret;
+ uloop_init();
+ ubus_path = path;
+
ctx = ubus_connect(path);
if (!ctx)
return -EIO;
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);
+ ctx->connection_lost = netifd_ubus_connection_lost;
+ netifd_ubus_add_fd();
ret = ubus_add_object(ctx, &main_object);
if (ret)
}
static void
-interface_ip_dump_address_list(struct interface_ip_settings *ip)
+interface_ip_dump_address_list(struct interface_ip_settings *ip, bool v6)
{
struct device_addr *addr;
- static char *buf;
+ char *buf;
+ void *a;
int buflen = 128;
int af;
else
af = AF_INET6;
- buf = blobmsg_alloc_string_buffer(&b, NULL, buflen);
- inet_ntop(af, &addr->addr, buf, buflen - 5);
- buf += strlen(buf);
- sprintf(buf, "/%d", addr->mask);
+ if (af != (v6 ? AF_INET6 : AF_INET))
+ continue;
+
+ 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);
}
}
interface_ip_dump_route_list(struct interface_ip_settings *ip)
{
struct device_route *route;
- static char *buf;
int buflen = 128;
+ char *buf;
void *r;
int af;
af = AF_INET6;
r = blobmsg_open_table(&b, NULL);
+
buf = blobmsg_alloc_string_buffer(&b, "target", buflen);
- inet_ntop(af, &route->addr, buf, buflen - 5);
- buf += strlen(buf);
- sprintf(buf, "/%d", route->mask);
+ 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);
}
}
+static void
+interface_ip_dump_dns_server_list(struct interface_ip_settings *ip)
+{
+ struct dns_server *dns;
+ int buflen = 128;
+ char *buf;
+
+ vlist_simple_for_each_element(&ip->dns_servers, dns, node) {
+ buf = blobmsg_alloc_string_buffer(&b, NULL, buflen);
+ inet_ntop(dns->af, &dns->addr, buf, buflen);
+ blobmsg_add_string_buffer(&b);
+ }
+}
+
+static void
+interface_ip_dump_dns_search_list(struct interface_ip_settings *ip)
+{
+ struct dns_search_domain *dns;
+
+ vlist_simple_for_each_element(&ip->dns_search, dns, node) {
+ blobmsg_add_string(&b, NULL, dns->name);
+ }
+}
+
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;
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 && !(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);
+ a = blobmsg_open_array(&b, "ipv4-address");
+ interface_ip_dump_address_list(&iface->config_ip, false);
+ interface_ip_dump_address_list(&iface->proto_ip, false);
+ blobmsg_close_array(&b, a);
+ a = blobmsg_open_array(&b, "ipv6-address");
+ interface_ip_dump_address_list(&iface->config_ip, true);
+ interface_ip_dump_address_list(&iface->proto_ip, true);
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_array(&b, "dns-server");
+ interface_ip_dump_dns_server_list(&iface->config_ip);
+ interface_ip_dump_dns_server_list(&iface->proto_ip);
+ blobmsg_close_array(&b, a);
+ a = blobmsg_open_array(&b, "dns-search");
+ interface_ip_dump_dns_search_list(&iface->config_ip);
+ interface_ip_dump_dns_search_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 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 },
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