starter: Fix comparison of connections.

diff --git a/src/starter/cmp.c b/src/starter/cmp.c
index c01d273e168f3b2691fdb8c8381b6b77fc9ec8bf..724dc78048ed525adc76152ab29fa951a31bb279 100644 (file)
--- 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;