Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/udp_usrreq.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.130
retrieving revision 1.134.2.3
diff -u -p -r1.130 -r1.134.2.3
--- src/sys/netinet/udp_usrreq.c	2005/02/12 12:31:07	1.130
+++ src/sys/netinet/udp_usrreq.c	2005/05/01 11:03:37	1.134.2.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: udp_usrreq.c,v 1.130 2005/02/12 12:31:07 manu Exp $	*/
+/*	$NetBSD: udp_usrreq.c,v 1.134.2.3 2005/05/01 11:03:37 tron Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.130 2005/02/12 12:31:07 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.134.2.3 2005/05/01 11:03:37 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -932,7 +932,7 @@ udp_ctlinput(int cmd, struct sockaddr *s
 }
 
 int
-udp_ctloutput(op, so, level, optname, mp) 
+udp_ctloutput(op, so, level, optname, mp)
 	int op;
 	struct socket *so;
 	int level, optname;
@@ -982,7 +982,7 @@ udp_ctloutput(op, so, level, optname, mp
 				error = EINVAL;
 				goto end;
 			}
-			
+
 			switch(*mtod(m, int *)) {
 #ifdef IPSEC_NAT_T
 			case 0:
@@ -993,7 +993,7 @@ udp_ctloutput(op, so, level, optname, mp
 				inp->inp_flags &= ~INP_ESPINUDP_ALL;
 				inp->inp_flags |= INP_ESPINUDP;
 				break;
-				
+
 			case UDP_ENCAP_ESPINUDP_NON_IKE:
 				inp->inp_flags &= ~INP_ESPINUDP_ALL;
 				inp->inp_flags |= INP_ESPINUDP_NON_IKE;
@@ -1017,13 +1017,13 @@ udp_ctloutput(op, so, level, optname, mp
 		error = EINVAL;
 		goto end;
 		break;
-	}	
-	
+	}
+
 end:
 	splx(s);
 	return error;
 }
-	
+
 
 int
 udp_output(struct mbuf *m, ...)
@@ -1334,6 +1334,13 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, 
 		       NULL, 0, &udp_do_loopback_cksum, 0,
 		       CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_LOOPBACKCKSUM,
 		       CTL_EOL);
+	sysctl_createv(clog, 0, NULL, NULL,
+		       CTLFLAG_PERMANENT,
+		       CTLTYPE_STRUCT, "pcblist",
+		       SYSCTL_DESCR("UDP protocol control block list"),
+		       sysctl_inpcblist, 0, &udbtable, 0,
+		       CTL_NET, PF_INET, IPPROTO_UDP, CTL_CREATE,
+		       CTL_EOL);
 }
 #endif
 
@@ -1358,8 +1365,11 @@ udp4_espinudp(m, off, src, so)
 	size_t iphdrlen;
 	struct ip *ip;
 	struct mbuf *n;
+	struct m_tag *tag;
+	struct udphdr *udphdr;
+	u_int16_t sport, dport;
 
-	/* 
+	/*
 	 * Collapse the mbuf chain if the first mbuf is too short
 	 * The longest case is: UDP + non ESP marker + ESP
 	 */
@@ -1374,7 +1384,7 @@ udp4_espinudp(m, off, src, so)
 		}
 	}
 
-	len = m->m_len - off;	
+	len = m->m_len - off;
 	data = mtod(m, caddr_t) + off;
 	inp = sotoinpcb(so);
 
@@ -1383,10 +1393,10 @@ udp4_espinudp(m, off, src, so)
 		return 1;
 	}
 
-	/* 
-	 * Check that the payload is long enough to hold 
+	/*
+	 * Check that the payload is long enough to hold
 	 * an ESP header and compute the length of encapsulation
-	 * header to remove 
+	 * header to remove
 	 */
 	if (inp->inp_flags & INP_ESPINUDP) {
 		u_int32_t *st = (u_int32_t *)data;
@@ -1403,14 +1413,22 @@ udp4_espinudp(m, off, src, so)
 		if ((len <= sizeof(u_int64_t) + sizeof(struct esp))
 		    || (*st != 0))
 			return 0; /* Normal UDP processing */
-		
+
 		skip = sizeof(struct udphdr) + sizeof(u_int64_t);
 	}
 
 	/*
+	 * Get the UDP ports. They are handled in network 
+	 * order everywhere in IPSEC_NAT_T code.
+	 */
+	udphdr = (struct udphdr *)(data - skip);
+	sport = udphdr->uh_sport;
+	dport = udphdr->uh_dport;
+
+	/*
 	 * Remove the UDP header (and possibly the non ESP marker)
 	 * IP header lendth is iphdrlen
-	 * Before:   
+	 * Before:
 	 *   <--- off --->
 	 *   +----+------+-----+
 	 *   | IP |  UDP | ESP |
@@ -1431,8 +1449,8 @@ udp4_espinudp(m, off, src, so)
 	ip->ip_p = IPPROTO_ESP;
 
 	/*
-	 * Copy the mbuf to avoid multiple free, as both 
-	 * esp4_input (which we call) and udp_input (which 
+	 * Copy the mbuf to avoid multiple free, as both
+	 * esp4_input (which we call) and udp_input (which
 	 * called us) free the mbuf.
 	 */
 	if ((n = m_dup(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
@@ -1440,6 +1458,22 @@ udp4_espinudp(m, off, src, so)
 		return 0;
 	}
 
+	/*
+	 * Add a PACKET_TAG_IPSEC_NAT_T_PORT tag to remember
+	 * the source UDP port. This is required if we want
+	 * to select the right SPD for multiple hosts behind 
+	 * same NAT 
+	 */
+	if ((tag = m_tag_get(PACKET_TAG_IPSEC_NAT_T_PORTS,
+	    sizeof(sport) + sizeof(dport), M_DONTWAIT)) == NULL) {
+		printf("udp4_espinudp: m_tag_get failed\n");
+		m_freem(n);
+		return 0;
+	}
+	((u_int16_t *)(tag + 1))[0] = sport;
+	((u_int16_t *)(tag + 1))[1] = dport;
+	m_tag_prepend(n, tag);
+
 	esp4_input(n, iphdrlen);
 
 	/* We handled it, it shoudln't be handled by UDP */