X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=interface-ip.c;h=2d7a2d0d8d1b22a5ac9771f90f3d33ba67dc1e68;hb=6d5ca67a135a552a4232bc21705d33a567d00acc;hp=2e2e9d8c5316111b85d54040e61e8cb268072219;hpb=58d2488ffe9553b908d3e10826376adeeb55d67b;p=project%2Fnetifd.git diff --git a/interface-ip.c b/interface-ip.c index 2e2e9d8..2d7a2d0 100644 --- a/interface-ip.c +++ b/interface-ip.c @@ -10,6 +10,20 @@ #include "ubus.h" #include "system.h" +static int +addr_cmp(const void *k1, const void *k2, void *ptr) +{ + return memcmp(k1, k2, sizeof(struct device_addr) - + offsetof(struct device_addr, mask)); +} + +static int +route_cmp(const void *k1, const void *k2, void *ptr) +{ + return memcmp(k1, k2, sizeof(struct device_route) - + offsetof(struct device_route, mask)); +} + static void interface_update_proto_addr(struct vlist_tree *tree, struct vlist_node *node_new, @@ -65,9 +79,8 @@ interface_update_proto_route(struct vlist_tree *tree, void interface_ip_init(struct interface *iface) { - vlist_init(&iface->proto_route, interface_update_proto_route, - struct device_route, node, mask, addr); - vlist_init(&iface->proto_addr, interface_update_proto_addr, - struct device_addr, node, mask, addr); + vlist_init(&iface->proto_route, route_cmp, interface_update_proto_route, + struct device_route, node, mask); + vlist_init(&iface->proto_addr, addr_cmp, interface_update_proto_addr, + struct device_addr, node, mask); } -