X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=513b40cc25ccd988ff28d87462b2548bf7c39856;hp=0592399404fd60d38273b020a48ac15e31203f85;hb=e93c42c036c4b4df1f65f261def31cf1a429e942;hpb=8e14def28d08c4bdb9997a518ad85afbc8ccfbc9 diff --git a/ubus.c b/ubus.c index 0592399..513b40c 100644 --- a/ubus.c +++ b/ubus.c @@ -50,12 +50,14 @@ netifd_handle_reload(struct ubus_context *ctx, struct ubus_object *obj, enum { HR_TARGET, HR_V6, + HR_INTERFACE, __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 }, + [HR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, }; static int @@ -64,7 +66,7 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj, struct blob_attr *msg) { struct blob_attr *tb[__HR_MAX]; - struct interface *iface; + struct interface *iface = NULL; union if_addr a; bool v6 = false; @@ -75,12 +77,15 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj, if (tb[HR_V6]) v6 = blobmsg_get_bool(tb[HR_V6]); + if (tb[HR_INTERFACE]) + iface = vlist_find(&interfaces, blobmsg_data(tb[HR_INTERFACE]), iface, node); + 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); + iface = interface_ip_add_target_route(&a, v6, iface); if (!iface) return UBUS_STATUS_NOT_FOUND; @@ -103,11 +108,69 @@ netifd_get_proto_handlers(struct ubus_context *ctx, struct ubus_object *obj, return 0; } + +enum { + DI_NAME, + __DI_MAX +}; + +static const struct blobmsg_policy dynamic_policy[__DI_MAX] = { + [DI_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING }, +}; + +static int +netifd_add_dynamic(struct ubus_context *ctx, struct ubus_object *obj, + struct ubus_request_data *req, const char *method, + struct blob_attr *msg) +{ + struct blob_attr *tb[__DI_MAX]; + struct interface *iface; + struct blob_attr *config; + struct device *dev; + + blobmsg_parse(dynamic_policy, __DI_MAX, tb, blob_data(msg), blob_len(msg)); + + if (!tb[DI_NAME]) + return UBUS_STATUS_INVALID_ARGUMENT; + + const char *name = blobmsg_get_string(tb[DI_NAME]); + + iface = calloc(1, sizeof(*iface)); + if (!iface) + return UBUS_STATUS_UNKNOWN_ERROR; + + interface_init(iface, name, msg, true); + iface->device_config = true; + + config = blob_memdup(msg); + if (!config) + goto error; + + interface_add(iface, config); + + // need to look up the interface name again, in case of config update, + iface = vlist_find(&interfaces, name, iface, node); + if (!iface) + return UBUS_STATUS_UNKNOWN_ERROR; + + dev = iface->main_dev.dev; + if (!dev || !dev->default_config) + return UBUS_STATUS_UNKNOWN_ERROR; + + device_set_config(dev, dev->type, msg); + return UBUS_STATUS_OK; + +error: + free(iface); + return UBUS_STATUS_UNKNOWN_ERROR; +} + 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 }, + UBUS_METHOD("add_dynamic", netifd_add_dynamic, dynamic_policy), }; static struct ubus_object_type main_object_type = @@ -425,6 +488,11 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip, bool enabled) if (route->valid_until) blobmsg_add_u32(&b, "valid", route->valid_until - now); + buf = blobmsg_alloc_string_buffer(&b, "source", buflen); + inet_ntop(af, &route->source, buf, buflen); + snprintf(buf + strlen(buf), 4, "/%u", route->sourcemask); + blobmsg_add_string_buffer(&b); + blobmsg_close_table(&b, r); } } @@ -458,6 +526,8 @@ interface_ip_dump_prefix_list(struct interface_ip_settings *ip) if (prefix->valid_until) blobmsg_add_u32(&b, "valid", prefix->valid_until - now); + blobmsg_add_string(&b, "class", prefix->pclass); + c = blobmsg_open_table(&b, "assigned"); struct device_prefix_assignment *assign; list_for_each_entry(assign, &prefix->assignments, head) { @@ -558,19 +628,13 @@ interface_ip_dump_dns_search_list(struct interface_ip_settings *ip, } } -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 +netifd_dump_status(struct interface *iface) { - struct interface *iface; struct interface_data *data; struct device *dev; void *a, *inactive; - iface = container_of(obj, struct interface, ubus); - - blob_buf_init(&b, 0); 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); @@ -652,7 +716,40 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, if (!list_is_empty(&iface->errors)) netifd_add_interface_errors(&b, iface); +} +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 = container_of(obj, struct interface, ubus); + + blob_buf_init(&b, 0); + netifd_dump_status(iface); + ubus_send_reply(ctx, req, b.head); + + return 0; +} + + +static int +netifd_handle_dump(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); + void *a = blobmsg_open_array(&b, "interface"); + + struct interface *iface; + vlist_for_each_element(&interfaces, iface, node) { + void *i = blobmsg_open_table(&b, NULL); + blobmsg_add_string(&b, "interface", iface->name); + netifd_dump_status(iface); + blobmsg_close_table(&b, i); + } + + blobmsg_close_array(&b, a); ubus_send_reply(ctx, req, b.head); return 0; @@ -788,6 +885,7 @@ static struct ubus_method iface_object_methods[] = { { .name = "down", .handler = netifd_handle_down }, { .name = "status", .handler = netifd_handle_status }, { .name = "prepare", .handler = netifd_handle_iface_prepare }, + { .name = "dump", .handler = netifd_handle_dump }, 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 }, @@ -858,6 +956,9 @@ static void netifd_add_iface_object(void) iface_object.methods = methods; for (i = 0; i < ARRAY_SIZE(iface_object_methods); i++) { + if (methods[i].handler == netifd_handle_dump) + continue; + methods[i].handler = netifd_handle_iface; methods[i].policy = &iface_policy; methods[i].n_policy = 1; @@ -902,6 +1003,17 @@ netifd_ubus_interface_event(struct interface *iface, bool up) } void +netifd_ubus_interface_notify(struct interface *iface, bool up) +{ + const char *event = (up) ? "update" : "down"; + blob_buf_init(&b, 0); + blobmsg_add_string(&b, "interface", iface->name); + netifd_dump_status(iface); + ubus_notify(ctx, &iface_object, event, b.head, -1); + ubus_notify(ctx, &iface->ubus, event, b.head, -1); +} + +void netifd_ubus_add_interface(struct interface *iface) { struct ubus_object *obj = &iface->ubus;