Sync new IKE_SA condition/extension flags

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 197bb5e24a0d1b9eef418be54404c14bb7ebd1e4..7ce23b3c67a0243f89dd4101672c7550892a706f 100644 (file)
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -379,6 +379,8 @@ static void process_ike_update(private_ha_dispatcher_t *this,
                                set_extension(ike_sa, value.u32, EXT_STRONGSWAN);
                                set_extension(ike_sa, value.u32, EXT_EAP_ONLY_AUTHENTICATION);
                                set_extension(ike_sa, value.u32, EXT_MS_WINDOWS);
+                               set_extension(ike_sa, value.u32, EXT_XAUTH);
+                               set_extension(ike_sa, value.u32, EXT_DPD);
                                break;
                        case HA_CONDITIONS:
                                set_condition(ike_sa, value.u32, COND_NAT_ANY);
@@ -389,6 +391,8 @@ static void process_ike_update(private_ha_dispatcher_t *this,
                                set_condition(ike_sa, value.u32, COND_CERTREQ_SEEN);
                                set_condition(ike_sa, value.u32, COND_ORIGINAL_INITIATOR);
                                set_condition(ike_sa, value.u32, COND_STALE);
+                               set_condition(ike_sa, value.u32, COND_INIT_CONTACT_SEEN);
+                               set_condition(ike_sa, value.u32, COND_XAUTH_AUTHENTICATED);
                                break;
                        default:
                                break;

diff --git a/src/libcharon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
index 97fc8560021f09ad86e907ffb275f9593affbaf5..ce3131b0b51009082542a88d24d1987e31456a10 100644 (file)
--- a/src/libcharon/plugins/ha/ha_ike.c
+++ b/src/libcharon/plugins/ha/ha_ike.c
@@ -175,7 +175,9 @@ METHOD(listener_t, ike_updown, bool,
                                  | copy_condition(ike_sa, COND_EAP_AUTHENTICATED)
                                  | copy_condition(ike_sa, COND_CERTREQ_SEEN)
                                  | copy_condition(ike_sa, COND_ORIGINAL_INITIATOR)
-                                 | copy_condition(ike_sa, COND_STALE);
+                                 | copy_condition(ike_sa, COND_STALE)
+                                 | copy_condition(ike_sa, COND_INIT_CONTACT_SEEN)
+                                 | copy_condition(ike_sa, COND_XAUTH_AUTHENTICATED);
 
                extension = copy_extension(ike_sa, EXT_NATT)
                                  | copy_extension(ike_sa, EXT_MOBIKE)
@@ -183,7 +185,9 @@ METHOD(listener_t, ike_updown, bool,
                                  | copy_extension(ike_sa, EXT_MULTIPLE_AUTH)
                                  | copy_extension(ike_sa, EXT_STRONGSWAN)
                                  | copy_extension(ike_sa, EXT_EAP_ONLY_AUTHENTICATION)
-                                 | copy_extension(ike_sa, EXT_MS_WINDOWS);
+                                 | copy_extension(ike_sa, EXT_MS_WINDOWS)
+                                 | copy_extension(ike_sa, EXT_XAUTH)
+                                 | copy_extension(ike_sa, EXT_DPD);
 
                id = ike_sa->get_id(ike_sa);