[Openswan dev] Re: [patch] RHEL3 (26sec) + Openswan-2.2.0 + NAT-T + KLIPS

[Matthew Callaway]

On Fri, 15 Oct 2004, Tuomo Soini wrote:

> Matthew Callaway wrote:
> | I just noted a duplicate "lock_sock(sk)" in my patch.  Must remove the
> | second one.
> |
> | Would anyone else care to comment on the sanity of this patch?
> 
> I won't comment on sanity but I'll test it asap.
> 
> But. Please change to kernel 2.4.21-20.EL which is latest version. There
> are lots of small changes between 2.4.21-9.0.1EL and 2.4.21-20EL.

The patch I sent before applies cleanly to 2.4.21-20.EL.  I've attached
it again here to remove that second lock_sock(sk).

I'll continue to test it today, and would appreciate any input you might
have.

MC
-------------- next part --------------
diff -ruN kernel-2.4.21.orig/linux-2.4.21/include/net/sock.h kernel-2.4.21/linux-2.4.21/include/net/sock.h
--- kernel-2.4.21.orig/linux-2.4.21/include/net/sock.h	2004-10-14 16:05:56.000000000 -0500
+++ kernel-2.4.21/linux-2.4.21/include/net/sock.h	2004-10-14 16:27:33.000000000 -0500
@@ -481,6 +481,7 @@
 	__u16		sport;		/* source port */
 	__u16		dport;		/* destination port */
 	__u16		len;		/* total length of pending frames */
+	__u32		esp_in_udp;		/* openswan's NAT-T encapsulation */
 };
  	
 /*
diff -ruN kernel-2.4.21.orig/linux-2.4.21/net/ipv4/udp.c kernel-2.4.21/linux-2.4.21/net/ipv4/udp.c
--- kernel-2.4.21.orig/linux-2.4.21/net/ipv4/udp.c	2004-10-14 16:06:02.000000000 -0500
+++ kernel-2.4.21/linux-2.4.21/net/ipv4/udp.c	2004-10-14 16:36:32.000000000 -0500
@@ -1100,6 +1100,7 @@
 static int udp_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
 {
 	struct udp_opt *up = udp_sk(sk);
+	struct udp_opt *tp = &(sk->tp_pinfo.af_udp);
 
 	/*
 	 *	Charge it to the socket, dropping if the queue is full.
@@ -1149,6 +1150,41 @@
 	}
 #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;
+
+#if defined(CONFIG_IPSEC) && !defined(CONFIG_IPSEC_MODULE)
+		/* optomize only when we know it is statically linked */
+		extern struct inet_protocol esp_protocol;
+		esp = &esp_protocol;
+#else
+		for (esp = (struct inet_protocol *)inet_protos[IPPROTO_ESP & (MAX_INET_PROTOS - 1)];
+				(esp) && (esp->protocol != IPPROTO_ESP);
+				esp = esp->next);
+#endif
+
+		if (esp && esp->handler) {
+			struct sock *sav_sk = skb->sk;
+			skb->sk = sk;
+			if (esp->handler(skb) == 0) {
+				skb->sk = sav_sk;
+				/*not sure we might count ESPinUDP as UDP...*/
+				UDP_INC_STATS_BH(UdpInDatagrams);
+				return 0;
+			}
+			skb->sk = sav_sk;
+		}
+	}
+#endif
+
+
 	if (sock_queue_rcv_skb(sk,skb)<0) {
 		UDP_INC_STATS_BH(UdpInErrors);
 		IP_INC_STATS_BH(IpInDiscards);
@@ -1402,6 +1438,7 @@
 			  char *optval, int optlen)
 {
 	struct udp_opt *up = udp_sk(sk);
+	struct udp_opt *tp = &(sk->tp_pinfo.af_udp);
 	int val;
 	int err = 0;
 
@@ -1414,27 +1451,38 @@
 	if (get_user(val, (int *)optval))
 		return -EFAULT;
 
+	lock_sock(sk);
+
 	switch(optname) {
-	case UDP_CORK:
-		if (val != 0) {
-			up->corkflag = 1;
-		} else {
-			up->corkflag = 0;
-			lock_sock(sk);
-			udp_push_pending_frames(sk, up);
-			release_sock(sk);
-		}
-		break;
-		
-	case UDP_ENCAP:
-		up->encap_type = val;
-		break;
+	case UDP_CORK:
+		if (val != 0) {
+			up->corkflag = 1;
+		} else {
+			up->corkflag = 0;
+			udp_push_pending_frames(sk, up);
+			release_sock(sk);
+		}
+		break;
 
-	default:
-		err = -ENOPROTOOPT;
-		break;
+	case UDP_ENCAP:
+		up->encap_type = val;
+		break;
+
+#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;
 }