Changeset 4640

Timestamp:

11/12/08 17:07:17 (2 months ago)

Author:

martin

Message:

moved ike_initiator flag to IKE_SAs condition bitfield

Files:

• trunk/src/charon/sa/ike_sa.c (modified) (9 diffs)
• trunk/src/charon/sa/ike_sa.h (modified) (2 diffs)
• trunk/src/charon/sa/tasks/ike_me.c (modified) (1 diff)

trunk/src/charon/sa/ike_sa.c

@@ -246 +246 @@
-     */
-    u_int32_t keyingtry;
-    
-    /**
-     * are we the initiator of this IKE_SA (rekeying does not affect this flag)
-     */
-    bool ike_initiator;
-
-    /**
@@ -480 +475 @@
-    ike_cfg->get_ref(ike_cfg);
-    this->ike_cfg = ike_cfg;
-}
-
-/**
- * Implementation of ike_sa_t.is_ike_initiator
- */
-static bool is_ike_initiator(private_ike_sa_t *this)
-{
-    return this->ike_initiator;
-}
-
@@ -1141 +1128 @@
-        }
-        
-this->ike_initiator = TRUE
+set_condition(this, COND_ORIGINAL_INITIATOR, TRUE)
-        
-        task = (task_t*)ike_init_create(&this->public, TRUE, NULL);
@@ -1726 +1713 @@
-     * If the peer does not support RFC4478, there is no way to keep the
-     * IKE_SA up. */
-this->ike_initiator
+has_condition(this, COND_ORIGINAL_INITIATOR)
-    {
-        DBG1(DBG_IKE, "initiator did not reauthenticate as requested");
@@ -1804 +1791 @@
-    
-    /* check if we are able to reestablish this IKE_SA */
-this->ike_initiator
+has_condition(this, COND_ORIGINAL_INITIATOR)
-        (this->other_virtual_ip != NULL ||
-         has_condition(this, COND_EAP_AUTHENTICATED)
@@ -2031 +2018 @@
-    this->my_id = other->my_id->clone(other->my_id);
-    this->other_id = other->other_id->clone(other->other_id);
-    this->ike_initiator = other->ike_initiator;
-    
-    /* apply virtual assigned IPs... */
@@ -2052 +2038 @@
-    }
-
-NAT-T
+all
-    this->conditions = other->conditions;
-    if (this->conditions & COND_NAT_HERE)
@@ -2345 +2331 @@
-    this->public.set_pending_updates = (void(*)(ike_sa_t*, u_int32_t updates))set_pending_updates;
-    this->public.get_pending_updates = (u_int32_t(*)(ike_sa_t*))get_pending_updates;
-    this->public.is_ike_initiator = (bool (*)(ike_sa_t*))is_ike_initiator;
-    this->public.create_additional_address_iterator = (iterator_t*(*)(ike_sa_t*))create_additional_address_iterator;
-    this->public.add_additional_address = (void(*)(ike_sa_t*, host_t *host))add_additional_address;
@@ -2416 +2401 @@
-    this->pending_updates = 0;
-    this->keyingtry = 0;
-    this->ike_initiator = FALSE;
-    this->local_host = NULL;
-    this->remote_host = NULL;

trunk/src/charon/sa/ike_sa.h

@@ -109 +109 @@
-     */
-    COND_NAT_FAKE = (1<<3),
-
+
-    /**
-     * peer has ben authenticated using EAP
-     */
-    COND_EAP_AUTHENTICATED = (1<<4),
-
+
-    /**
-     * received a certificate request from the peer
-     */
-    COND_CERTREQ_SEEN = (1<<5),
+    
+    /**
+     * Local peer is the "original" IKE initiator. Unaffected from rekeying.
+     */
+    COND_ORIGINAL_INITIATOR = (1<<6),
-};
-
@@ -484 +489 @@
-    void (*set_pending_updates)(ike_sa_t *this, u_int32_t updates);
-    
-    /**
-     * Check if we are the original initiator of this IKE_SA (rekeying does not
-     * change this flag).
-     */
-    bool (*is_ike_initiator)(ike_sa_t *this);
-    
-
-#ifdef ME
-    /**

trunk/src/charon/sa/tasks/ike_me.c

@@ -786 +786 @@
-    this->public.task.destroy = (void(*)(task_t*))destroy;
-    
-is_ike_initiator(ike_sa
+has_condition(ike_sa, COND_ORIGINAL_INITIATOR
-    {
-        if (initiator)