ipsec-286.1.1.tar.gz

[apple/ipsec.git] / ipsec-tools / racoon / ike_session.c

diff --git a/ipsec-tools/racoon/ike_session.c b/ipsec-tools/racoon/ike_session.c
index c1e77189997237b15ba8af844ab0bf79dcec75b0..e40f89882c3105b0097616d8f4e8bd2195057db2 100644 (file)
--- a/ipsec-tools/racoon/ike_session.c
+++ b/ipsec-tools/racoon/ike_session.c
@@ -266,7 +266,7 @@ ike_session_get_session (struct sockaddr_storage *local,
                                 p->ikev1_state.active_ph1cnt, p->ikev1_state.active_ph2cnt);
                        continue;
                }
                                 p->ikev1_state.active_ph1cnt, p->ikev1_state.active_ph2cnt);
                        continue;
                }

-               
+

                // Skip if the spi doesn't match
                if (optionalIndex != NULL && ike_session_getph1byindex(p, optionalIndex) == NULL) {
                        continue;
                // Skip if the spi doesn't match
                if (optionalIndex != NULL && ike_session_getph1byindex(p, optionalIndex) == NULL) {
                        continue;


@@ -359,9 +359,7 @@ ike_session_update_mode (phase2_handle_t *iph2)
        }
     if (iph2->phase2_type != PHASE2_TYPE_SA)
         return;
        }
     if (iph2->phase2_type != PHASE2_TYPE_SA)
         return;

-       if (iph2->version == ISAKMP_VERSION_NUMBER_IKEV2) {
-               return; // for now
-       }
+       

        // exit early if we already detected cisco-ipsec
        if (iph2->parent_session->is_cisco_ipsec) {
                return;
        // exit early if we already detected cisco-ipsec
        if (iph2->parent_session->is_cisco_ipsec) {
                return;


@@ -927,7 +925,7 @@ ike_session_replace_other_ph1 (phase1_handle_t *new_iph1,
        /*
         * if we are responder, then we should wait until the server sends a delete notification.
         */
        /*
         * if we are responder, then we should wait until the server sends a delete notification.
         */

-       if ((new_iph1->version == ISAKMP_VERSION_NUMBER_IKEV2 || session->is_client) &&
+       if (session->is_client &&

                new_iph1->side == RESPONDER) {
                return;
        }
                new_iph1->side == RESPONDER) {
                return;
        }


@@ -975,7 +973,7 @@ ike_session_cleanup_other_established_ph1s (ike_session_t    *session,
        /*
         * if we are responder, then we should wait until the server sends a delete notification.
         */
        /*
         * if we are responder, then we should wait until the server sends a delete notification.
         */

-       if ((new_iph1->version == ISAKMP_VERSION_NUMBER_IKEV2 || session->is_client) &&
+       if (session->is_client &&

                new_iph1->side == RESPONDER) {
                return;
        }
                new_iph1->side == RESPONDER) {
                return;
        }