add an ubus method for dumping available protocol handlers

diff --git a/proto.c b/proto.c
index c3bd19de8e4af478c5a7e47b20d163cd913de34e..ccc5f25a89be4dce52a8c585448af602b37bc740 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -449,6 +449,19 @@ get_proto_handler(const char *name)
        return avl_find_element(&handlers, name, proto, avl);
 }
 
+void
+proto_dump_handlers(struct blob_buf *b)
+{
+       struct proto_handler *p;
+       void *c;
+
+       avl_for_each_element(&handlers, p, avl) {
+               c = blobmsg_open_table(b, p->name);
+               blobmsg_add_u8(b, "no_device", !!(p->flags & PROTO_FLAG_NODEV));
+               blobmsg_close_table(b, c);
+       }
+}
+
 void
 proto_init_interface(struct interface *iface, struct blob_attr *attr)
 {

diff --git a/proto.h b/proto.h
index 12653cdf57b663afcff58575555c8316f96e67a2..4ed70a317c967166a193c56265aaeb4617ef7751 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -72,6 +72,6 @@ int interface_proto_event(struct interface_proto_state *proto,
 unsigned int parse_netmask_string(const char *str, bool v6);
 int proto_apply_static_ip_settings(struct interface *iface, struct blob_attr *attr);
 int proto_apply_ip_settings(struct interface *iface, struct blob_attr *attr, bool ext);
-
+void proto_dump_handlers(struct blob_buf *b);
 
 #endif

diff --git a/ubus.c b/ubus.c
index 438b08ca502fc3ffe1a2b3d762c3535af01f3052..dcc4098b163e5ce81ee7695b234dfa805a75d79c 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -92,10 +92,23 @@ netifd_add_host_route(struct ubus_context *ctx, struct ubus_object *obj,
        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 =