X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=a00226ff80e4bfc65afe0fdae981044fb175ca84;hp=40c63742fe3bd36de3ec2e493ec3d4819662e329;hb=69c5043fdcea724f59055630eb0cf593c41732cb;hpb=b7d1c27b752df3e6c5dfe6a5b789d6cb0c87d0f6 diff --git a/ubus.c b/ubus.c index 40c6374..a00226f 100644 --- a/ubus.c +++ b/ubus.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * 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 @@ -27,16 +40,61 @@ netifd_handle_restart(struct ubus_context *ctx, struct ubus_object *obj, 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 = @@ -232,10 +290,11 @@ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface) } 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; @@ -245,11 +304,18 @@ interface_ip_dump_address_list(struct interface_ip_settings *ip) 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); } } @@ -269,12 +335,13 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip) 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); @@ -289,6 +356,7 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct interface *iface; + struct interface_data *data; struct device *dev; void *a; @@ -311,9 +379,13 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, 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); @@ -321,6 +393,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, 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); @@ -425,6 +503,26 @@ netifd_handle_iface_prepare(struct ubus_context *ctx, struct ubus_object *obj, 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 }, @@ -433,7 +531,8 @@ static struct ubus_method iface_object_methods[] = { 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 =