Attachment 305104 Details for Bug 443626 – Rewrite ikev2->ikev1 fallback code

[patch] Rewrite ikev2->ikev1 fallback code

openswan-2.6.12-fallback.patch (text/plain), 1.81 KB, created by Miloslav Trmač on 2008-05-12 08:43:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2008-05-12 08:43:55 UTC

Size: 1.81 KB

patch

obsolete

>diff --exclude '*~' -urN openswan/programs/pluto/timer.c openswan-2.6.12/programs/pluto/timer.c
>--- openswan/programs/pluto/timer.c	2008-04-22 05:55:38.000000000 +0200
>+++ openswan-2.6.12/programs/pluto/timer.c	2008-05-12 08:24:34.000000000 +0200
>@@ -255,21 +255,13 @@
> 	    }
> 
> 	    if((try % 3)==0
>-	       && (c->policy & POLICY_IKEV2_ALLOW)!=0) {
>+	       && ((c->policy & (POLICY_IKEV2_ALLOW | POLICY_IKEV2_PROPOSE))
>+		   ==(POLICY_IKEV2_ALLOW | POLICY_IKEV2_PROPOSE))) {
> 		/* so, let's retry with IKEv2, alternating every three messages */
>-		if(c->failed_ikev2) {
>-		    c->failed_ikev2 = FALSE;
>-		    loglog(RC_COMMENT, "next attempt will be IKEv2");
>-		    ipsecdoi_replace(st, LEMPTY, LEMPTY, try);
>-		} else {
>-		    c->failed_ikev2 = TRUE;
>-		    loglog(RC_COMMENT, "next attempt will be IKEv1");
>-		    ipsecdoi_replace(st, POLICY_IKEV1_DISABLE, LEMPTY, try);
>-		}
>-	    } else {
>-		/* no, just retry with this policy */
>-		ipsecdoi_replace(st, LEMPTY, LEMPTY, try);
>+		c->failed_ikev2 = FALSE;
>+		loglog(RC_COMMENT, "next attempt will be IKEv2");
> 	    }
>+	    ipsecdoi_replace(st, LEMPTY, LEMPTY, try);
> 	}
> 	delete_state(st);
>     }
>@@ -379,18 +371,10 @@
> 	   && (c->policy & POLICY_IKEV1_DISABLE)==0) {
> 
> 	    /* so, let's retry with IKEv1, alternating every three messages */
>-	    if(c->failed_ikev2) {
>-		c->failed_ikev2 = FALSE;
>-		loglog(RC_COMMENT, "next attempt will be IKEv2");
>-		ipsecdoi_replace(st, POLICY_IKEV1_DISABLE, LEMPTY, try);
>-	    } else {
>-		c->failed_ikev2 = TRUE;
>-		loglog(RC_COMMENT, "next attempt will be IKEv1");
>-		ipsecdoi_replace(st, LEMPTY, POLICY_IKEV2_PROPOSE, try);
>-	    }
>-	} else {
>-	    ipsecdoi_replace(st, LEMPTY, LEMPTY, try);
>+	    c->failed_ikev2 = TRUE;
>+	    loglog(RC_COMMENT, "next attempt will be IKEv1");
> 	}
>+	ipsecdoi_replace(st, LEMPTY, LEMPTY, try);
>     }
> 
>     delete_state(st);

Actions: View | Diff

Attachments on bug 443626: 303332 | 303661 | 305104