From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 8 Jun 2016 14:10:30 +0000 (+0200)
Subject: kernel-netlink: Use ipsec_sa_cfg_equals() and compare marks properly
X-Git-Tag: 5.5.0dr1~36^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87ed9a5ffb1935f16390cadc94caf2d0cd319bbc;p=thirdparty%2Fstrongswan.git

kernel-netlink: Use ipsec_sa_cfg_equals() and compare marks properly
---

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
index add4761f60..ab896a4ae3 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -414,8 +414,9 @@ static bool ipsec_sa_equals(ipsec_sa_t *sa, ipsec_sa_t *other_sa)
 {
 	return sa->src->ip_equals(sa->src, other_sa->src) &&
 		   sa->dst->ip_equals(sa->dst, other_sa->dst) &&
-		   memeq(&sa->mark, &other_sa->mark, sizeof(mark_t)) &&
-		   memeq(&sa->cfg, &other_sa->cfg, sizeof(ipsec_sa_cfg_t));
+		   sa->mark.value == other_sa->mark.value &&
+		   sa->mark.mask == other_sa->mark.mask &&
+		   ipsec_sa_cfg_equals(&sa->cfg, &other_sa->cfg);
 }
 
 /**