From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 19 Oct 2006 20:15:35 +0000 (-0700)
Subject: SA and SP in IPSec BEET mode.
X-Git-Tag: v2.6.19-061214~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34e099e24fd3c9070b68c1286a201834c0f4ae03;p=thirdparty%2Fiproute2.git

SA and SP in IPSec BEET mode.

Patch which allows for setting SA and SP also for
new IPSec mode BEET, beside tunnel and transport, according to the latest
changes in the kernel you can find at the following link:

Signed-off-by: Diego Beltrami <diego.beltrami@gmail.com>
Signed-off-by: Miika Komu <miika@iki.fi>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
---

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 8baaabd81..4bcd2f33f 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -282,6 +282,9 @@ void xfrm_id_info_print(xfrm_address_t *saddr, struct xfrm_id *id,
 	case 1:
 		fprintf(fp, "tunnel");
 		break;
+	case 4:
+		fprintf(fp, "beet");
+		break;
 	default:
 		fprintf(fp, "%u", mode);
 		break;
@@ -857,6 +860,8 @@ int xfrm_mode_parse(__u8 *mode, int *argcp, char ***argvp)
 		*mode = 0;
 	else if (matches(*argv, "tunnel") == 0)
 		*mode = 1;
+	else if (matches(*argv, "beet") == 0)
+		*mode = 4;
 	else
 		invarg("\"MODE\" is invalid", *argv);
 
diff --git a/ip/xfrm_policy.c b/ip/xfrm_policy.c
index 340e7df79..abca71302 100644
--- a/ip/xfrm_policy.c
+++ b/ip/xfrm_policy.c
@@ -87,7 +87,7 @@ static void usage(void)
 	fprintf(stderr, "%s", strxf_xfrmproto(IPPROTO_COMP));
 	fprintf(stderr, " ]\n");
 
- 	fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
+ 	fprintf(stderr, "MODE := [ transport | tunnel | beet ](default=transport)\n");
  	//fprintf(stderr, "REQID - number(default=0)\n");
 	fprintf(stderr, "LEVEL := [ required | use ](default=required)\n");
 
diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index 1d61685a1..bb073c0eb 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -75,7 +75,7 @@ static void usage(void)
 
 	//fprintf(stderr, "SPI - security parameter index(default=0)\n");
 
- 	fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
+ 	fprintf(stderr, "MODE := [ transport | tunnel | beet ](default=transport)\n");
  	//fprintf(stderr, "REQID - number(default=0)\n");
 
 	fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");