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.138.2.5 retrieving revision 1.145.2.2 diff -u -p -r1.138.2.5 -r1.145.2.2 --- src/sys/netinet/udp_usrreq.c 2007/12/07 17:34:33 1.138.2.5 +++ src/sys/netinet/udp_usrreq.c 2006/03/01 09:28:47 1.145.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.138.2.5 2007/12/07 17:34:33 yamt Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.145.2.2 2006/03/01 09:28:47 yamt Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.138.2.5 2007/12/07 17:34:33 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.145.2.2 2006/03/01 09:28:47 yamt Exp $"); #include "opt_inet.h" #include "opt_ipsec.h" @@ -139,7 +139,11 @@ __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; @@ -173,9 +177,9 @@ static void udp_notify (struct inpcb *, int udbhashsize = UDBHASHSIZE; #ifdef MBUFTRACE -struct mowner udp_mowner = MOWNER_INIT("udp", ""); -struct mowner udp_rx_mowner = MOWNER_INIT("udp", "rx"); -struct mowner udp_tx_mowner = MOWNER_INIT("udp", "tx"); +struct mowner udp_mowner = { "udp" }; +struct mowner udp_rx_mowner = { "udp", "rx" }; +struct mowner udp_tx_mowner = { "udp", "tx" }; #endif #ifdef UDP_CSUM_COUNTERS @@ -384,8 +388,16 @@ udp_input(struct mbuf *m, ...) goto badcsum; /* construct source and dst sockaddrs. */ - sockaddr_in_init(&src, &ip->ip_src, uh->uh_sport); - sockaddr_in_init(&dst, &ip->ip_dst, uh->uh_dport); + 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; if ((n = udp4_realinput(&src, &dst, &m, iphlen)) == -1) { udpstat.udps_hdrops++; @@ -617,14 +629,14 @@ udp4_sendup(struct mbuf *m, int off /* o /* check AH/ESP integrity. */ if (so != NULL && ipsec4_in_reject_so(m, so)) { ipsecstat.in_polvio++; - if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) icmp_error(n, ICMP_UNREACH, ICMP_UNREACH_ADMIN_PROHIBIT, 0, 0); return; } #endif /*IPSEC*/ - if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { if (inp && (inp->inp_flags & INP_CONTROLOPTS || so->so_options & SO_TIMESTAMP)) { struct ip *ip = mtod(n, struct ip *); @@ -664,14 +676,14 @@ udp6_sendup(struct mbuf *m, int off /* o /* check AH/ESP integrity. */ if (so != NULL && ipsec6_in_reject_so(m, so)) { ipsec6stat.in_polvio++; - if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) icmp6_error(n, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN, 0); return; } #endif /*IPSEC*/ - if ((n = m_copypacket(m, M_DONTWAIT)) != NULL) { + if ((n = m_copy(m, 0, M_COPYALL)) != NULL) { if (in6p && (in6p->in6p_flags & IN6P_CONTROLOPTS || in6p->in6p_socket->so_options & SO_TIMESTAMP)) { struct ip6_hdr *ip6 = mtod(n, struct ip6_hdr *); @@ -955,7 +967,7 @@ udp_notify(struct inpcb *inp, int errno) } void * -udp_ctlinput(int cmd, const struct sockaddr *sa, void *v) +udp_ctlinput(int cmd, struct sockaddr *sa, void *v) { struct ip *ip = v; struct udphdr *uh; @@ -975,20 +987,23 @@ udp_ctlinput(int cmd, const struct socka else if (errno == 0) return NULL; if (ip) { - uh = (struct udphdr *)((char *)ip + (ip->ip_hl << 2)); - in_pcbnotify(&udbtable, satocsin(sa)->sin_addr, uh->uh_dport, + uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); + in_pcbnotify(&udbtable, satosin(sa)->sin_addr, uh->uh_dport, ip->ip_src, uh->uh_sport, errno, notify); /* XXX mapped address case */ } else - in_pcbnotifyall(&udbtable, satocsin(sa)->sin_addr, errno, + in_pcbnotifyall(&udbtable, satosin(sa)->sin_addr, errno, notify); return NULL; } int -udp_ctloutput(int op, struct socket *so, int level, int optname, - struct mbuf **mp) +udp_ctloutput(op, so, level, optname, mp) + int op; + struct socket *so; + int level, optname; + struct mbuf **mp; { int s; int error = 0; @@ -1019,6 +1034,7 @@ udp_ctloutput(int op, struct socket *so, default: error = EAFNOSUPPORT; goto end; + break; } @@ -1029,9 +1045,9 @@ udp_ctloutput(int op, struct socket *so, switch (optname) { case UDP_ENCAP: - if (m == NULL || m->m_len != sizeof(int)) { + if (m == NULL || m->m_len < sizeof (int)) { error = EINVAL; - break; + goto end; } switch(*mtod(m, int *)) { @@ -1052,21 +1068,21 @@ udp_ctloutput(int op, struct socket *so, #endif default: error = EINVAL; + goto end; break; } break; default: error = ENOPROTOOPT; + goto end; break; } - if (m != NULL) { - m_free(m); - } break; default: error = EINVAL; + goto end; break; } @@ -1163,23 +1179,23 @@ udp_usrreq(struct socket *so, int req, s struct mbuf *control, struct lwp *l) { struct inpcb *inp; + struct proc *p; int s; int error = 0; + p = l ? l->l_proc : NULL; if (req == PRU_CONTROL) - return (in_control(so, (long)m, (void *)nam, - (struct ifnet *)control, l)); - - s = splsoftnet(); + return (in_control(so, (long)m, (caddr_t)nam, + (struct ifnet *)control, p)); if (req == PRU_PURGEIF) { in_pcbpurgeif0(&udbtable, (struct ifnet *)control); in_purgeif((struct ifnet *)control); in_pcbpurgeif(&udbtable, (struct ifnet *)control); - splx(s); return (0); } + s = splsoftnet(); inp = sotoinpcb(so); #ifdef DIAGNOSTIC if (req != PRU_SEND && req != PRU_SENDOOB && control) @@ -1223,7 +1239,7 @@ udp_usrreq(struct socket *so, int req, s break; case PRU_BIND: - error = in_pcbbind(inp, nam, l); + error = in_pcbbind(inp, nam, p); break; case PRU_LISTEN: @@ -1231,7 +1247,7 @@ udp_usrreq(struct socket *so, int req, s break; case PRU_CONNECT: - error = in_pcbconnect(inp, nam, l); + error = in_pcbconnect(inp, nam, p); if (error) break; soisconnected(so); @@ -1273,7 +1289,7 @@ udp_usrreq(struct socket *so, int req, s error = EISCONN; goto die; } - error = in_pcbconnect(inp, nam, l); + error = in_pcbconnect(inp, nam, p); if (error) goto die; } else { @@ -1405,11 +1421,14 @@ 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, - struct socket *so) +udp4_espinudp(mp, off, src, so) + struct mbuf **mp; + int off; + struct sockaddr *src; + struct socket *so; { size_t len; - void *data; + caddr_t data; struct inpcb *inp; size_t skip = 0; size_t minlen; @@ -1438,11 +1457,11 @@ udp4_espinudp(struct mbuf **mp, int off, } len = m->m_len - off; - data = mtod(m, char *) + off; + data = mtod(m, caddr_t) + off; inp = sotoinpcb(so); /* Ignore keepalive packets */ - if ((len == 1) && (*(unsigned char *)data == 0xff)) { + if ((len == 1) && (data[0] == '\xff')) { return 1; } @@ -1474,7 +1493,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 *)((char *)data - skip); + udphdr = (struct udphdr *)(data - skip); sport = udphdr->uh_sport; dport = udphdr->uh_dport; @@ -1494,7 +1513,7 @@ udp4_espinudp(struct mbuf **mp, int off, * <-skip-> */ iphdrlen = off - sizeof(struct udphdr); - memmove(mtod(m, char *) + skip, mtod(m, void *), iphdrlen); + memmove(mtod(m, caddr_t) + skip, mtod(m, caddr_t), iphdrlen); m_adj(m, skip); ip = mtod(m, struct ip *); @@ -1528,7 +1547,7 @@ udp4_espinudp(struct mbuf **mp, int off, m_tag_prepend(n, tag); #ifdef FAST_IPSEC - ipsec4_common_input(n, iphdrlen, IPPROTO_ESP); + ipsec4_common_input(n, iphdrlen); #else esp4_input(n, iphdrlen); #endif