commit 5cf576d928c515ce8dea2500154a291477ce38ba
author osdl.net!shemminger <osdl.net!shemminger> Thu Mar 10 19:04:00 2005 +0000
committer osdl.net!shemminger <osdl.net!shemminger> Thu Mar 10 19:04:00 2005 +0000
tree f4f58e95f86822b276a26e5fbbfecb565431288a
parent 493dac2a49688d64ec0cef7f7517fac6f0b7c86e

Add Esp-in-udp encapsulation

(Logical change 1.152)

ip/ipxfrm.c

diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c
index 836e11a..fc0f0d9 100644
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
@@ -571,19 +571,19 @@
 	if (tb[XFRMA_ALG_AUTH]) {
 		struct rtattr *rta = tb[XFRMA_ALG_AUTH];
 		xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
-			XFRMA_ALG_AUTH, RTA_PAYLOAD(rta), fp, prefix);
+				XFRMA_ALG_AUTH, RTA_PAYLOAD(rta), fp, prefix);
 	}
 
 	if (tb[XFRMA_ALG_CRYPT]) {
 		struct rtattr *rta = tb[XFRMA_ALG_CRYPT];
 		xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
-			XFRMA_ALG_CRYPT, RTA_PAYLOAD(rta), fp, prefix);
+				XFRMA_ALG_CRYPT, RTA_PAYLOAD(rta), fp, prefix);
 	}
 
 	if (tb[XFRMA_ALG_COMP]) {
 		struct rtattr *rta = tb[XFRMA_ALG_COMP];
 		xfrm_algo_print((struct xfrm_algo *) RTA_DATA(rta),
-			XFRMA_ALG_COMP, RTA_PAYLOAD(rta), fp, prefix);
+				XFRMA_ALG_COMP, RTA_PAYLOAD(rta), fp, prefix);
 	}
 
 	if (tb[XFRMA_ENCAP]) {
@@ -601,7 +601,18 @@
 		}
 		e = (struct xfrm_encap_tmpl *) RTA_DATA(tb[XFRMA_ENCAP]);
 
-		fprintf(fp, "type %u ", e->encap_type);
+		fprintf(fp, "type ");
+		switch (e->encap_type) {
+		case 1:
+			fprintf(fp, "espinudp-nonike ");
+			break;
+		case 2:
+			fprintf(fp, "espinudp ");
+			break;
+		default:
+			fprintf(fp, "%u ", e->encap_type);
+			break;
+		}
 		fprintf(fp, "sport %u ", ntohs(e->encap_sport));
 		fprintf(fp, "dport %u ", ntohs(e->encap_dport));
 
@@ -615,7 +626,7 @@
 	if (tb[XFRMA_TMPL]) {
 		struct rtattr *rta = tb[XFRMA_TMPL];
 		xfrm_tmpl_print((struct xfrm_user_tmpl *) RTA_DATA(rta),
-			RTA_PAYLOAD(rta), family, fp, prefix);
+				RTA_PAYLOAD(rta), family, fp, prefix);
 	}
 }
 
@@ -724,6 +735,24 @@
 	return 0;
 }
 
+int xfrm_encap_type_parse(__u16 *type, int *argcp, char ***argvp)
+{
+	int argc = *argcp;
+	char **argv = *argvp;
+
+	if (strcmp(*argv, "espinudp-nonike") == 0)
+		*type = 1;
+	else if (strcmp(*argv, "espinudp") == 0)
+		*type = 2;
+	else
+		invarg("\"ENCAP-TYPE\" is invalid", *argv);
+
+	*argcp = argc;
+	*argvp = argv;
+
+	return 0;
+}
+
 /* NOTE: reqid is used by host-byte order */
 int xfrm_reqid_parse(__u32 *reqid, int *argcp, char ***argvp)
 {