Don't compare ports when comparing cached routes.

At least src_ip has a port set sometimes.

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
index d0076b59214c06287497df8e4d44cf2e1c543926..63f8894a33152f4c7ad67ceaa1d4ae7aec624831 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -344,8 +344,8 @@ static void route_entry_destroy(route_entry_t *this)
 static bool route_entry_equals(route_entry_t *a, route_entry_t *b)
 {
        return a->if_name && b->if_name && streq(a->if_name, b->if_name) &&
-                  a->src_ip->equals(a->src_ip, b->src_ip) &&
-                  a->gateway->equals(a->gateway, b->gateway) &&
+                  a->src_ip->ip_equals(a->src_ip, b->src_ip) &&
+                  a->gateway->ip_equals(a->gateway, b->gateway) &&
                   chunk_equals(a->dst_net, b->dst_net) && a->prefixlen == b->prefixlen;
 }
 

diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
index a13cfc78fab66baf966cea227bdc67d824c5b204..828422ec53345a55473dc5cd85677bd5e4385346 100644 (file)
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
@@ -186,8 +186,8 @@ static u_int route_entry_hash(route_entry_t *this)
 static bool route_entry_equals(route_entry_t *a, route_entry_t *b)
 {
        return a->if_name && b->if_name && streq(a->if_name, b->if_name) &&
-                  a->src_ip->equals(a->src_ip, b->src_ip) &&
-                  a->gateway->equals(a->gateway, b->gateway) &&
+                  a->src_ip->ip_equals(a->src_ip, b->src_ip) &&
+                  a->gateway->ip_equals(a->gateway, b->gateway) &&
                   chunk_equals(a->dst_net, b->dst_net) && a->prefixlen == b->prefixlen;
 }
 

diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
index 8ad6748db72e5a6d3487d586d06fd63e6ad5c728..c39ebbd9ac6606d9ba84b1e55108ad63ab2bf402 100644 (file)
--- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
@@ -238,8 +238,8 @@ static void route_entry_destroy(route_entry_t *this)
 static bool route_entry_equals(route_entry_t *a, route_entry_t *b)
 {
        return a->if_name && b->if_name && streq(a->if_name, b->if_name) &&
-                  a->src_ip->equals(a->src_ip, b->src_ip) &&
-                  a->gateway->equals(a->gateway, b->gateway) &&
+                  a->src_ip->ip_equals(a->src_ip, b->src_ip) &&
+                  a->gateway->ip_equals(a->gateway, b->gateway) &&
                   chunk_equals(a->dst_net, b->dst_net) && a->prefixlen == b->prefixlen;
 }