X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=33c94a14d9b781d4c190a8c0f6490471dd8685d5;hp=b01d6ad5e0aec4aa48ad9e7030016f6a51032788;hb=0942c9368654ee1a0518bbeaf291a51852c11543;hpb=76d5b041afff56375bb88a18eff33e50acceb1d8

diff --git a/ubus.c b/ubus.c
index b01d6ad..33c94a1 100644
--- a/ubus.c
+++ b/ubus.c
@@ -27,16 +27,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 =
@@ -235,7 +280,8 @@ static void
 interface_ip_dump_address_list(struct interface_ip_settings *ip)
 {
 	struct device_addr *addr;
-	static char *buf;
+	char *buf;
+	void *a;
 	int buflen = 128;
 	int af;
 
@@ -245,11 +291,15 @@ 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);
+		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 +319,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);