diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-05-16 17:18:27 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-06-11 17:33:32 +0200 |
| commit | 4d218469123e9170009035b0437650395189305e (patch) | |
| tree | 4b4217198d8bcc5163683f3c2bfcb1434fe6864c /src | |
| parent | 3e2ff81e5dbbd54d33bc8f91c23ab3fa55a22bd8 (diff) | |
| download | strongswan-4d218469123e9170009035b0437650395189305e.tar.bz2 strongswan-4d218469123e9170009035b0437650395189305e.tar.xz | |
starter: Fix comparison of connections.
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/cmp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/starter/cmp.c b/src/starter/cmp.c index c01d273e1..724dc7804 100644 --- a/src/starter/cmp.c +++ b/src/starter/cmp.c @@ -19,8 +19,6 @@ #include "cmp.h" #define VARCMP(obj) if (c1->obj != c2->obj) return FALSE -#define ADDCMP(obj) if (!sameaddr(&c1->obj,&c2->obj)) return FALSE -#define SUBCMP(obj) if (!samesubnet(&c1->obj,&c2->obj)) return FALSE #define STRCMP(obj) if (strcmp(c1->obj,c2->obj)) return FALSE static bool starter_cmp_end(starter_end_t *c1, starter_end_t *c2) @@ -28,7 +26,6 @@ static bool starter_cmp_end(starter_end_t *c1, starter_end_t *c2) if ((c1 == NULL) || (c2 == NULL)) return FALSE; - VARCMP(ikeport); VARCMP(has_natip); VARCMP(modecfg); VARCMP(port); @@ -42,11 +39,15 @@ bool starter_cmp_conn(starter_conn_t *c1, starter_conn_t *c2) if ((c1 == NULL) || (c2 == NULL)) return FALSE; + VARCMP(mode); + VARCMP(proxy_mode); VARCMP(options); VARCMP(mark_in.value); VARCMP(mark_in.mask); VARCMP(mark_out.value); VARCMP(mark_in.mask); + VARCMP(tfc); + VARCMP(sa_keying_tries); if (!starter_cmp_end(&c1->left, &c2->left)) return FALSE; |