denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starter: Fix comparison of connections.

Browse Source
This commit is contained in:
Tobias Brunner
2012-06-11 17:33:32 +02:00
parent 3e2ff81e5d
commit 4d21846912
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starter/cmp.c
+4 -3
View File
@@ -19,8 +19,6 @@
#include "cmp.h" #include "cmp.h"
#define VARCMP(obj) if (c1->obj != c2->obj) return FALSE #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 #define STRCMP(obj) if (strcmp(c1->obj,c2->obj)) return FALSE
static bool starter_cmp_end(starter_end_t *c1, starter_end_t *c2) 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)) if ((c1 == NULL) || (c2 == NULL))
return FALSE; return FALSE;
VARCMP(ikeport);
VARCMP(has_natip); VARCMP(has_natip);
VARCMP(modecfg); VARCMP(modecfg);
VARCMP(port); VARCMP(port);
@@ -42,11 +39,15 @@ bool starter_cmp_conn(starter_conn_t *c1, starter_conn_t *c2)
if ((c1 == NULL) || (c2 == NULL)) if ((c1 == NULL) || (c2 == NULL))
return FALSE; return FALSE;
VARCMP(mode);
VARCMP(proxy_mode);
VARCMP(options); VARCMP(options);
VARCMP(mark_in.value); VARCMP(mark_in.value);
VARCMP(mark_in.mask); VARCMP(mark_in.mask);
VARCMP(mark_out.value); VARCMP(mark_out.value);
VARCMP(mark_in.mask); VARCMP(mark_in.mask);
VARCMP(tfc);
VARCMP(sa_keying_tries);
if (!starter_cmp_end(&c1->left, &c2->left)) if (!starter_cmp_end(&c1->left, &c2->left))
return FALSE; return FALSE;