[svn-upgrade] Integrating new upstream version, strongswan (4.1.1)

1 files changed, 0 insertions, 108 deletions

diff --git a/linux/net/ipv4/udp.c.fs2_2.patch b/linux/net/ipv4/udp.c.fs2_2.patch
deleted file mode 100644
index 767ddaa23..000000000
--- a/linux/net/ipv4/udp.c.fs2_2.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- ./net/ipv4/udp.c	Sun Mar 25 18:37:41 2001
-+++ ./net/ipv4/udp.c	Mon Jun 10 19:53:18 2002
-@@ -965,6 +965,9 @@
- 
- static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
- {
-+#ifdef CONFIG_IPSEC_NAT_TRAVERSAL
-+	struct udp_opt *tp =  &(sk->tp_pinfo.af_udp);
-+#endif
- 	/*
- 	 *	Charge it to the socket, dropping if the queue is full.
- 	 */
-@@ -982,6 +985,38 @@
- 	}
- #endif
- 
-+#ifdef CONFIG_IPSEC_NAT_TRAVERSAL
-+	if (tp->esp_in_udp) {
-+		/*
-+		 * Set skb->sk and xmit packet to ipsec_rcv.
-+		 *
-+		 * If ret != 0, ipsec_rcv refused the packet (not ESPinUDP),
-+		 * restore skb->sk and fall back to sock_queue_rcv_skb
-+		 */
-+		struct inet_protocol *esp = NULL;
-+
-+#ifdef CONFIG_IPSEC_MODULE
-+		for (esp = (struct inet_protocol *)inet_protos[IPPROTO_ESP & (MAX_INET_PROTOS - 1)];
-+			(esp) && (esp->protocol != IPPROTO_ESP);
-+			esp = esp->next);
-+#else
-+		extern struct inet_protocol esp_protocol;
-+		esp = &esp_protocol;
-+#endif
-+
-+		if (esp && esp->handler) {
-+			struct sock *sav_sk = skb->sk;
-+			skb->sk = sk;
-+			if (esp->handler(skb, 0) == 0) {
-+				skb->sk = sav_sk;
-+				/* not sure we might count ESPinUDP as UDP... */
-+				udp_statistics.UdpInDatagrams++;
-+				return 0;
-+			}
-+			skb->sk = sav_sk;
-+		}
-+	}
-+#endif
- 	if (sock_queue_rcv_skb(sk,skb)<0) {
- 		udp_statistics.UdpInErrors++;
- 		ip_statistics.IpInDiscards++;
-@@ -1165,6 +1200,44 @@
- 	return(0);
- }
- 
-+#if 1
-+static int udp_setsockopt(struct sock *sk, int level, int optname,
-+	char *optval, int optlen)
-+{
-+	struct udp_opt *tp = &(sk->tp_pinfo.af_udp);
-+	int val;
-+	int err = 0;
-+
-+	if (level != SOL_UDP)
-+		return ip_setsockopt(sk, level, optname, optval, optlen);
-+
-+	if(optlen<sizeof(int))
-+		return -EINVAL;
-+
-+	if (get_user(val, (int *)optval))
-+		return -EFAULT;
-+	
-+	lock_sock(sk);
-+
-+	switch(optname) {
-+#ifdef CONFIG_IPSEC_NAT_TRAVERSAL
-+#ifndef UDP_ESPINUDP
-+#define UDP_ESPINUDP 100
-+#endif
-+		case UDP_ESPINUDP:
-+			tp->esp_in_udp = val;
-+			break;
-+#endif
-+		default:
-+			err = -ENOPROTOOPT;
-+			break;
-+	}
-+
-+	release_sock(sk);
-+	return err;
-+}
-+#endif
-+
- struct proto udp_prot = {
- 	(struct sock *)&udp_prot,	/* sklist_next */
- 	(struct sock *)&udp_prot,	/* sklist_prev */
-@@ -1179,7 +1252,11 @@
- 	NULL,				/* init */
- 	NULL,				/* destroy */
- 	NULL,				/* shutdown */
-+#if 1
-+	udp_setsockopt,			/* setsockopt */
-+#else
- 	ip_setsockopt,			/* setsockopt */
-+#endif
- 	ip_getsockopt,			/* getsockopt */
- 	udp_sendmsg,			/* sendmsg */
- 	udp_recvmsg,			/* recvmsg */