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.151 retrieving revision 1.195 diff -u -p -r1.151 -r1.195 --- src/sys/netinet/udp_usrreq.c 2006/10/12 01:32:38 1.151 +++ src/sys/netinet/udp_usrreq.c 2014/05/18 14:46:16 1.195 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.151 2006/10/12 01:32:38 christos Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.195 2014/05/18 14:46:16 rmind Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,9 +61,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.151 2006/10/12 01:32:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.195 2014/05/18 14:46:16 rmind Exp $"); #include "opt_inet.h" +#include "opt_compat_netbsd.h" #include "opt_ipsec.h" #include "opt_inet_csum.h" #include "opt_ipkdb.h" @@ -72,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #include #include +#include #include #include #include @@ -94,13 +96,16 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #include #include +#include #ifdef INET6 #include #include #include +#include #include #include +#include #include #endif @@ -114,22 +119,19 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c #include #endif -#include - -#ifdef FAST_IPSEC +#ifdef IPSEC #include -#include /* XXX ipsecstat namespace */ +#include +#include #include #ifdef INET6 #include #endif -#endif /* FAST_IPSEC*/ +#endif /* IPSEC */ -#ifdef IPSEC -#include -#include -#include -#endif /*IPSEC*/ +#ifdef COMPAT_50 +#include +#endif #ifdef IPKDB #include @@ -139,18 +141,15 @@ __KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c * UDP protocol implementation. * Per RFC 768, August, 1980. */ -#ifndef COMPAT_42 int udpcksum = 1; -#else -int udpcksum = 0; /* XXX */ -#endif int udp_do_loopback_cksum = 0; struct inpcbtable udbtable; -struct udpstat udpstat; + +percpu_t *udpstat_percpu; #ifdef INET -#ifdef IPSEC_NAT_T +#ifdef IPSEC static int udp4_espinudp (struct mbuf **, int, struct sockaddr *, struct socket *); #endif @@ -225,15 +224,37 @@ EVCNT_ATTACH_STATIC(udp6_swcsum); #endif /* UDP_CSUM_COUNTERS */ -void -udp_init(void) +static void sysctl_net_inet_udp_setup(struct sysctllog **); + +static int +do_udpinit(void) { in_pcbinit(&udbtable, udbhashsize, udbhashsize); + udpstat_percpu = percpu_alloc(sizeof(uint64_t) * UDP_NSTATS); MOWNER_ATTACH(&udp_tx_mowner); MOWNER_ATTACH(&udp_rx_mowner); MOWNER_ATTACH(&udp_mowner); + + return 0; +} + +void +udp_init_common(void) +{ + static ONCE_DECL(doudpinit); + + RUN_ONCE(&doudpinit, do_udpinit); +} + +void +udp_init(void) +{ + + sysctl_net_inet_udp_setup(NULL); + + udp_init_common(); } /* @@ -328,7 +349,7 @@ udp4_input_checksum(struct mbuf *m, cons return 0; badcsum: - udpstat.udps_badsum++; + UDP_STATINC(UDP_STAT_BADSUM); return -1; } @@ -350,7 +371,7 @@ udp_input(struct mbuf *m, ...) va_end(ap); MCLAIM(m, &udp_rx_mowner); - udpstat.udps_ipackets++; + UDP_STATINC(UDP_STAT_IPACKETS); /* * Get IP and UDP header together in first mbuf. @@ -358,7 +379,7 @@ udp_input(struct mbuf *m, ...) ip = mtod(m, struct ip *); IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr)); if (uh == NULL) { - udpstat.udps_hdrops++; + UDP_STATINC(UDP_STAT_HDROPS); return; } KASSERT(UDP_HDR_ALIGNED_P(uh)); @@ -375,7 +396,7 @@ udp_input(struct mbuf *m, ...) len = ntohs((u_int16_t)uh->uh_ulen); if (ip_len != iphlen + len) { if (ip_len < iphlen + len || len < sizeof(struct udphdr)) { - udpstat.udps_badlen++; + UDP_STATINC(UDP_STAT_BADLEN); goto bad; } m_adj(m, iphlen + len - ip_len); @@ -388,37 +409,37 @@ udp_input(struct mbuf *m, ...) goto badcsum; /* construct source and dst sockaddrs. */ - bzero(&src, sizeof(src)); - src.sin_family = AF_INET; - src.sin_len = sizeof(struct sockaddr_in); - bcopy(&ip->ip_src, &src.sin_addr, sizeof(src.sin_addr)); - src.sin_port = uh->uh_sport; - bzero(&dst, sizeof(dst)); - dst.sin_family = AF_INET; - dst.sin_len = sizeof(struct sockaddr_in); - bcopy(&ip->ip_dst, &dst.sin_addr, sizeof(dst.sin_addr)); - dst.sin_port = uh->uh_dport; + sockaddr_in_init(&src, &ip->ip_src, uh->uh_sport); + sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport); if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) { - udpstat.udps_hdrops++; + UDP_STATINC(UDP_STAT_HDROPS); return; } + if (m == NULL) { + /* + * packet has been processed by ESP stuff - + * e.g. dropped NAT-T-keep-alive-packet ... + */ + return; + } + ip = mtod(m, struct ip *); #ifdef INET6 if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) { struct sockaddr_in6 src6, dst6; - bzero(&src6, sizeof(src6)); + memset(&src6, 0, sizeof(src6)); src6.sin6_family = AF_INET6; src6.sin6_len = sizeof(struct sockaddr_in6); src6.sin6_addr.s6_addr[10] = src6.sin6_addr.s6_addr[11] = 0xff; - bcopy(&ip->ip_src, &src6.sin6_addr.s6_addr[12], + memcpy(&src6.sin6_addr.s6_addr[12], &ip->ip_src, sizeof(ip->ip_src)); src6.sin6_port = uh->uh_sport; - bzero(&dst6, sizeof(dst6)); + memset(&dst6, 0, sizeof(dst6)); dst6.sin6_family = AF_INET6; dst6.sin6_len = sizeof(struct sockaddr_in6); dst6.sin6_addr.s6_addr[10] = dst6.sin6_addr.s6_addr[11] = 0xff; - bcopy(&ip->ip_dst, &dst6.sin6_addr.s6_addr[12], + memcpy(&dst6.sin6_addr.s6_addr[12], &ip->ip_dst, sizeof(ip->ip_dst)); dst6.sin6_port = uh->uh_dport; @@ -428,10 +449,10 @@ udp_input(struct mbuf *m, ...) if (n == 0) { if (m->m_flags & (M_BCAST | M_MCAST)) { - udpstat.udps_noportbcast++; + UDP_STATINC(UDP_STAT_NOPORTBCAST); goto bad; } - udpstat.udps_noport++; + UDP_STATINC(UDP_STAT_NOPORT); #ifdef IPKDB if (checkipkdb(&ip->ip_src, uh->uh_sport, uh->uh_dport, m, iphlen + sizeof(struct udphdr), @@ -471,7 +492,7 @@ udp6_input_checksum(struct mbuf *m, cons goto good; } if (uh->uh_sum == 0) { - udp6stat.udp6s_nosum++; + UDP6_STATINC(UDP6_STAT_NOSUM); goto bad; } @@ -480,7 +501,7 @@ udp6_input_checksum(struct mbuf *m, cons M_CSUM_TCP_UDP_BAD | M_CSUM_DATA)) { case M_CSUM_UDPv6|M_CSUM_TCP_UDP_BAD: UDP_CSUM_COUNTER_INCR(&udp6_hwcsum_bad); - udp6stat.udp6s_badsum++; + UDP6_STATINC(UDP6_STAT_BADSUM); goto bad; #if 0 /* notyet */ @@ -499,7 +520,7 @@ udp6_input_checksum(struct mbuf *m, cons */ UDP_CSUM_COUNTER_INCR(&udp6_swcsum); if (in6_cksum(m, IPPROTO_UDP, off, len) != 0) { - udp6stat.udp6s_badsum++; + UDP6_STATINC(UDP6_STAT_BADSUM); goto bad; } } @@ -511,7 +532,7 @@ bad: } int -udp6_input(struct mbuf **mp, int *offp, int proto __unused) +udp6_input(struct mbuf **mp, int *offp, int proto) { struct mbuf *m = *mp; int off = *offp; @@ -530,13 +551,13 @@ udp6_input(struct mbuf **mp, int *offp, } #endif - udp6stat.udp6s_ipackets++; + UDP6_STATINC(UDP6_STAT_IPACKETS); /* check for jumbogram is done in ip6_input. we can trust pkthdr.len */ plen = m->m_pkthdr.len - off; IP6_EXTHDR_GET(uh, struct udphdr *, m, off, sizeof(struct udphdr)); if (uh == NULL) { - ip6stat.ip6s_tooshort++; + IP6_STATINC(IP6_STAT_TOOSHORT); return IPPROTO_DONE; } KASSERT(UDP_HDR_ALIGNED_P(uh)); @@ -549,7 +570,7 @@ udp6_input(struct mbuf **mp, int *offp, ulen = plen; if (plen != ulen) { - udp6stat.udp6s_badlen++; + UDP6_STATINC(UDP6_STAT_BADLEN); goto bad; } @@ -574,12 +595,12 @@ udp6_input(struct mbuf **mp, int *offp, /* * Construct source and dst sockaddrs. */ - bzero(&src, sizeof(src)); + memset(&src, 0, sizeof(src)); src.sin6_family = AF_INET6; src.sin6_len = sizeof(struct sockaddr_in6); src.sin6_addr = ip6->ip6_src; src.sin6_port = uh->uh_sport; - bzero(&dst, sizeof(dst)); + memset(&dst, 0, sizeof(dst)); dst.sin6_family = AF_INET6; dst.sin6_len = sizeof(struct sockaddr_in6); dst.sin6_addr = ip6->ip6_dst; @@ -587,10 +608,10 @@ udp6_input(struct mbuf **mp, int *offp, if (udp6_realinput(AF_INET6, &src, &dst, m, off) == 0) { if (m->m_flags & M_MCAST) { - udp6stat.udp6s_noportmcast++; + UDP6_STATINC(UDP6_STAT_NOPORTMCAST); goto bad; } - udp6stat.udp6s_noport++; + UDP6_STATINC(UDP6_STAT_NOPORT); icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0); m = NULL; } @@ -625,19 +646,22 @@ udp4_sendup(struct mbuf *m, int off /* o return; } -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec4_in_reject_so(m, so)) { - ipsecstat.in_polvio++; - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) + IPSEC_STATINC(IPSEC_STAT_IN_POLVIO); + if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) icmp_error(n, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT, 0, 0); return; } #endif /*IPSEC*/ - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { + if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { if (inp && (inp->inp_flags & INP_CONTROLOPTS +#ifdef SO_OTIMESTAMP + || so->so_options & SO_OTIMESTAMP +#endif || so->so_options & SO_TIMESTAMP)) { struct ip *ip = mtod(n, struct ip *); ip_savecontrol(inp, &opts, ip, n); @@ -650,7 +674,7 @@ udp4_sendup(struct mbuf *m, int off /* o if (opts) m_freem(opts); so->so_rcv.sb_overflowed++; - udpstat.udps_fullsock++; + UDP_STATINC(UDP_STAT_FULLSOCK); } else sorwakeup(so); } @@ -672,20 +696,23 @@ udp6_sendup(struct mbuf *m, int off /* o return; in6p = sotoin6pcb(so); -#if defined(IPSEC) || defined(FAST_IPSEC) +#if defined(IPSEC) /* check AH/ESP integrity. */ if (so != NULL && ipsec6_in_reject_so(m, so)) { - ipsec6stat.in_polvio++; - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) + IPSEC6_STATINC(IPSEC_STAT_IN_POLVIO); + if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) icmp6_error(n, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN, 0); return; } #endif /*IPSEC*/ - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { + if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { if (in6p && (in6p->in6p_flags & IN6P_CONTROLOPTS - || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { +#ifdef SO_OTIMESTAMP + || in6p->in6p_socket->so_options & SO_OTIMESTAMP +#endif + || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *); ip6_savecontrol(in6p, &opts, ip6, n); } @@ -696,7 +723,7 @@ udp6_sendup(struct mbuf *m, int off /* o if (opts) m_freem(opts); so->so_rcv.sb_overflowed++; - udp6stat.udp6s_fullsock++; + UDP6_STATINC(UDP6_STAT_FULLSOCK); } else sorwakeup(so); } @@ -751,7 +778,7 @@ udp4_realinput(struct sockaddr_in *src, /* * Locate pcb(s) for datagram. */ - CIRCLEQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { + TAILQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { inp = (struct inpcb *)inph; if (inp->inp_af != AF_INET) continue; @@ -788,15 +815,16 @@ udp4_realinput(struct sockaddr_in *src, /* * Locate pcb for datagram. */ - inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, *dport); + inp = in_pcblookup_connect(&udbtable, *src4, *sport, *dst4, + *dport, 0); if (inp == 0) { - ++udpstat.udps_pcbhashmiss; + UDP_STATINC(UDP_STAT_PCBHASHMISS); inp = in_pcblookup_bind(&udbtable, *dst4, *dport); if (inp == 0) return rcvcnt; } -#ifdef IPSEC_NAT_T +#ifdef IPSEC /* Handle ESP over UDP */ if (inp->inp_flags & INP_ESPINUDP_ALL) { struct sockaddr *sa = (struct sockaddr *)src; @@ -824,6 +852,12 @@ udp4_realinput(struct sockaddr_in *src, } #endif + /* + * Check the minimum TTL for socket. + */ + if (mtod(m, struct ip *)->ip_ttl < inp->inp_ip_minttl) + goto bad; + udp4_sendup(m, off, (struct sockaddr *)src, inp->inp_socket); rcvcnt++; } @@ -889,7 +923,7 @@ udp6_realinput(int af, struct sockaddr_i /* * Locate pcb(s) for datagram. */ - CIRCLEQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { + TAILQ_FOREACH(inph, &udbtable.inpt_queue, inph_queue) { in6p = (struct in6pcb *)inph; if (in6p->in6p_af != AF_INET6) continue; @@ -936,9 +970,9 @@ udp6_realinput(int af, struct sockaddr_i * Locate pcb for datagram. */ in6p = in6_pcblookup_connect(&udbtable, &src6, sport, dst6, - dport, 0); + dport, 0, 0); if (in6p == 0) { - ++udpstat.udps_pcbhashmiss; + UDP_STATINC(UDP_STAT_PCBHASHMISS); in6p = in6_pcblookup_bind(&udbtable, dst6, dport, 0); if (in6p == 0) return rcvcnt; @@ -967,7 +1001,7 @@ udp_notify(struct inpcb *inp, int errno) } void * -udp_ctlinput(int cmd, struct sockaddr *sa, void *v) +udp_ctlinput(int cmd, const struct sockaddr *sa, void *v) { struct ip *ip = v; struct udphdr *uh; @@ -987,29 +1021,25 @@ udp_ctlinput(int cmd, struct sockaddr *s else if (errno == 0) return NULL; if (ip) { - uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); - in_pcbnotify(&udbtable, satosin(sa)->sin_addr, uh->uh_dport, + uh = (struct udphdr *)((char *)ip + (ip->ip_hl << 2)); + in_pcbnotify(&udbtable, satocsin(sa)->sin_addr, uh->uh_dport, ip->ip_src, uh->uh_sport, errno, notify); /* XXX mapped address case */ } else - in_pcbnotifyall(&udbtable, satosin(sa)->sin_addr, errno, + in_pcbnotifyall(&udbtable, satocsin(sa)->sin_addr, errno, notify); return NULL; } int -udp_ctloutput(op, so, level, optname, mp) - int op; - struct socket *so; - int level, optname; - struct mbuf **mp; +udp_ctloutput(int op, struct socket *so, struct sockopt *sopt) { int s; int error = 0; - struct mbuf *m; struct inpcb *inp; int family; + int optval; family = so->so_proto->pr_domain->dom_family; @@ -1017,16 +1047,16 @@ udp_ctloutput(op, so, level, optname, mp switch (family) { #ifdef INET case PF_INET: - if (level != IPPROTO_UDP) { - error = ip_ctloutput(op, so, level, optname, mp); + if (sopt->sopt_level != IPPROTO_UDP) { + error = ip_ctloutput(op, so, sopt); goto end; } break; #endif #ifdef INET6 case PF_INET6: - if (level != IPPROTO_UDP) { - error = ip6_ctloutput(op, so, level, optname, mp); + if (sopt->sopt_level != IPPROTO_UDP) { + error = ip6_ctloutput(op, so, sopt); goto end; } break; @@ -1034,24 +1064,20 @@ udp_ctloutput(op, so, level, optname, mp default: error = EAFNOSUPPORT; goto end; - break; } switch (op) { case PRCO_SETOPT: - m = *mp; inp = sotoinpcb(so); - switch (optname) { + switch (sopt->sopt_name) { case UDP_ENCAP: - if (m == NULL || m->m_len < sizeof (int)) { - error = EINVAL; - goto end; - } + error = sockopt_getint(sopt, &optval); + if (error) + break; - switch(*mtod(m, int *)) { -#ifdef IPSEC_NAT_T + switch(optval) { case 0: inp->inp_flags &= ~INP_ESPINUDP_ALL; break; @@ -1065,24 +1091,20 @@ udp_ctloutput(op, so, level, optname, mp inp->inp_flags &= ~INP_ESPINUDP_ALL; inp->inp_flags |= INP_ESPINUDP_NON_IKE; break; -#endif default: error = EINVAL; - goto end; break; } break; - + default: error = ENOPROTOOPT; - goto end; break; } break; default: error = EINVAL; - goto end; break; } @@ -1158,7 +1180,7 @@ udp_output(struct mbuf *m, ...) ((struct ip *)ui)->ip_len = htons(sizeof (struct udpiphdr) + len); ((struct ip *)ui)->ip_ttl = inp->inp_ip.ip_ttl; /* XXX */ ((struct ip *)ui)->ip_tos = inp->inp_ip.ip_tos; /* XXX */ - udpstat.udps_opackets++; + UDP_STATINC(UDP_STAT_OPACKETS); return (ip_output(m, inp->inp_options, ro, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST), @@ -1173,25 +1195,26 @@ int udp_sendspace = 9216; /* really max int udp_recvspace = 40 * (1024 + sizeof(struct sockaddr_in)); /* 40 1K datagrams */ -/*ARGSUSED*/ -int +static int udp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam, - struct mbuf *control, struct lwp *l) + struct mbuf *control, struct lwp *l) { struct inpcb *inp; int s; int error = 0; if (req == PRU_CONTROL) - return (in_control(so, (long)m, (caddr_t)nam, + return (in_control(so, (long)m, (void *)nam, (struct ifnet *)control, l)); s = splsoftnet(); if (req == PRU_PURGEIF) { + mutex_enter(softnet_lock); in_pcbpurgeif0(&udbtable, (struct ifnet *)control); in_purgeif((struct ifnet *)control); in_pcbpurgeif(&udbtable, (struct ifnet *)control); + mutex_exit(softnet_lock); splx(s); return (0); } @@ -1201,7 +1224,9 @@ udp_usrreq(struct socket *so, int req, s if (req != PRU_SEND && req != PRU_SENDOOB && control) panic("udp_usrreq: unexpected control mbuf"); #endif - if (inp == 0 && req != PRU_ATTACH) { + if (req == PRU_ATTACH) { + sosetlock(so); + } else if (inp == 0) { error = EINVAL; goto release; } @@ -1283,6 +1308,7 @@ udp_usrreq(struct socket *so, int req, s { struct in_addr laddr; /* XXX */ + memset(&laddr, 0, sizeof laddr); if (nam) { laddr = inp->inp_laddr; /* XXX */ if ((so->so_state & SS_ISCONNECTED) != 0) { @@ -1345,19 +1371,22 @@ release: return (error); } +static int +sysctl_net_inet_udp_stats(SYSCTLFN_ARGS) +{ + + return (NETSTAT_SYSCTL(udpstat_percpu, UDP_NSTATS)); +} + /* * Sysctl for udp variables. */ -SYSCTL_SETUP(sysctl_net_inet_udp_setup, "sysctl net.inet.udp subtree setup") +static void +sysctl_net_inet_udp_setup(struct sysctllog **clog) { sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT, - CTLTYPE_NODE, "net", NULL, - NULL, 0, NULL, 0, - CTL_NET, CTL_EOL); - sysctl_createv(clog, 0, NULL, NULL, - CTLFLAG_PERMANENT, CTLTYPE_NODE, "inet", NULL, NULL, 0, NULL, 0, CTL_NET, PF_INET, CTL_EOL); @@ -1407,13 +1436,21 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, CTLFLAG_PERMANENT, CTLTYPE_STRUCT, "stats", SYSCTL_DESCR("UDP statistics"), - NULL, 0, &udpstat, sizeof(udpstat), + sysctl_net_inet_udp_stats, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS, CTL_EOL); } #endif -#if (defined INET && defined IPSEC_NAT_T) +void +udp_statinc(u_int stat) +{ + + KASSERT(stat < UDP_NSTATS); + UDP_STATINC(stat); +} + +#if defined(INET) && defined(IPSEC) /* * Returns: * 1 if the packet was processed @@ -1421,17 +1458,16 @@ SYSCTL_SETUP(sysctl_net_inet_udp_setup, * -1 if an error occurent and m was freed */ static int -udp4_espinudp(struct mbuf **mp, int off, struct sockaddr *src __unused, +udp4_espinudp(struct mbuf **mp, int off, struct sockaddr *src, struct socket *so) { size_t len; - caddr_t data; + void *data; struct inpcb *inp; size_t skip = 0; size_t minlen; size_t iphdrlen; struct ip *ip; - struct mbuf *n; struct m_tag *tag; struct udphdr *udphdr; u_int16_t sport, dport; @@ -1454,11 +1490,13 @@ udp4_espinudp(struct mbuf **mp, int off, } len = m->m_len - off; - data = mtod(m, caddr_t) + off; + data = mtod(m, char *) + off; inp = sotoinpcb(so); /* Ignore keepalive packets */ - if ((len == 1) && (data[0] == '\xff')) { + if ((len == 1) && (*(unsigned char *)data == 0xff)) { + m_free(m); + *mp = NULL; /* avoid any further processiong by caller ... */ return 1; } @@ -1490,7 +1528,7 @@ udp4_espinudp(struct mbuf **mp, int off, * Get the UDP ports. They are handled in network * order everywhere in IPSEC_NAT_T code. */ - udphdr = (struct udphdr *)(data - skip); + udphdr = (struct udphdr *)((char *)data - skip); sport = udphdr->uh_sport; dport = udphdr->uh_dport; @@ -1510,7 +1548,7 @@ udp4_espinudp(struct mbuf **mp, int off, * <-skip-> */ iphdrlen = off - sizeof(struct udphdr); - memmove(mtod(m, caddr_t) + skip, mtod(m, caddr_t), iphdrlen); + memmove(mtod(m, char *) + skip, mtod(m, void *), iphdrlen); m_adj(m, skip); ip = mtod(m, struct ip *); @@ -1518,16 +1556,9 @@ udp4_espinudp(struct mbuf **mp, int off, ip->ip_p = IPPROTO_ESP; /* - * 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) { - printf("udp4_espinudp: m_dup failed\n"); - return 0; - } - - /* + * We have modified the packet - it is now ESP, so we should not + * return to UDP processing ... + * * 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 @@ -1536,20 +1567,29 @@ udp4_espinudp(struct mbuf **mp, int off, 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; + m_freem(m); + return -1; } ((u_int16_t *)(tag + 1))[0] = sport; ((u_int16_t *)(tag + 1))[1] = dport; - m_tag_prepend(n, tag); + m_tag_prepend(m, tag); -#ifdef FAST_IPSEC - ipsec4_common_input(n, iphdrlen); +#ifdef IPSEC + ipsec4_common_input(m, iphdrlen, IPPROTO_ESP); #else - esp4_input(n, iphdrlen); + esp4_input(m, iphdrlen); #endif - /* We handled it, it shoudln't be handled by UDP */ + /* We handled it, it shouldn't be handled by UDP */ + *mp = NULL; /* avoid free by caller ... */ return 1; } #endif + +PR_WRAP_USRREQ(udp_usrreq) + +#define udp_usrreq udp_usrreq_wrapper + +const struct pr_usrreqs udp_usrreqs = { + .pr_generic = udp_usrreq, +};