From 0b7eb2f1467c554a0cbb7eb8f7dfeee2b525e907 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 1 Feb 2021 16:41:11 +0100 Subject: [PATCH] resolv port to owrt iface names Signed-off-by: John Crispin --- netdev.c | 2 +- ubus.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netdev.c b/netdev.c index c5e40a9..f080299 100644 --- a/netdev.c +++ b/netdev.c @@ -136,7 +136,7 @@ iface_dump(void) struct iface_ip *ip; void *c, *d; - c = blobmsg_open_table(&b, iface->name); + c = blobmsg_open_table(&b, interface_resolve(iface->name)); blobmsg_add_mac(&b, "hwaddr", iface->addr); if (!list_empty(&iface->ipv4)) { d = blobmsg_open_array(&b, "ipv4"); diff --git a/ubus.c b/ubus.c index 32fef08..176b353 100644 --- a/ubus.c +++ b/ubus.c @@ -52,7 +52,7 @@ ubus_mac_cb(struct ubus_context *ctx, struct ubus_object *obj, return UBUS_STATUS_OK; } -static int +/*static int ubus_interface_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req, const char *method, struct blob_attr *msg) @@ -60,7 +60,7 @@ ubus_interface_cb(struct ubus_context *ctx, struct ubus_object *obj, if (!interface_dump()) ubus_send_reply(ctx, req, b.head); return UBUS_STATUS_OK; -} +}*/ static int ubus_port_cb(struct ubus_context *ctx, struct ubus_object *obj, @@ -74,7 +74,7 @@ ubus_port_cb(struct ubus_context *ctx, struct ubus_object *obj, } static const struct ubus_method topology_methods[] = { - UBUS_METHOD_NOARG("interface", ubus_interface_cb), + //UBUS_METHOD_NOARG("interface", ubus_interface_cb), UBUS_METHOD_NOARG("mac", ubus_mac_cb), UBUS_METHOD_NOARG("port", ubus_port_cb), };