X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=ubus.c;h=0f19607fecdb8714b4388b119007dc77dff5df3e;hp=b8de859b21b49baa50277641e643a336676f9dbd;hb=f096d021fb4119a449a7980e1667c2033491dba7;hpb=1b601254a2a71a199e3df5b26f364dc7a203eb65 diff --git a/ubus.c b/ubus.c index b8de859..0f19607 100644 --- a/ubus.c +++ b/ubus.c @@ -432,6 +432,14 @@ interface_ip_dump_route_list(struct interface_ip_settings *ip) inet_ntop(af, &route->nexthop, buf, buflen); blobmsg_add_string_buffer(&b); + if (route->flags & DEVROUTE_MTU) + blobmsg_add_u32(&b, "mtu", route->mtu); + + if (route->flags & DEVROUTE_METRIC) + blobmsg_add_u32(&b, "metric", route->metric); + + blobmsg_add_u8(&b, "enabled", route->enabled); + blobmsg_close_table(&b, r); } } @@ -488,10 +496,12 @@ netifd_handle_status(struct ubus_context *ctx, struct ubus_object *obj, blobmsg_add_string(&b, "proto", iface->proto_handler->name); dev = iface->main_dev.dev; - if (dev && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) + if (dev && !dev->hidden && + !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) blobmsg_add_string(&b, "device", dev->ifname); if (iface->state == IFS_UP) { + blobmsg_add_u32(&b, "metric", iface->metric); 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); @@ -552,10 +562,12 @@ netifd_iface_handle_device(struct ubus_context *ctx, struct ubus_object *obj, if (add && !dev) return UBUS_STATUS_NOT_FOUND; - if (add) - return interface_add_link(iface, dev); - else - return interface_remove_link(iface, dev); + if (add) { + device_set_present(dev, true); + ret = interface_add_link(iface, dev); + } else { + ret = interface_remove_link(iface, dev); + } device_unlock();