[Midnightbsd-cvs] src [6962] trunk: Revert revisions 6952-6954, aka udp lite support.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 6 08:57:12 EST 2015
Revision: 6962
http://svnweb.midnightbsd.org/src/?rev=6962
Author: laffer1
Date: 2015-02-06 08:57:11 -0500 (Fri, 06 Feb 2015)
Log Message:
-----------
Revert revisions 6952-6954, aka udp lite support. This is not ready for primetime yet.
Modified Paths:
--------------
trunk/UPDATING
trunk/lib/libc/net/getaddrinfo.c
trunk/share/man/man4/Makefile
trunk/share/man/man4/udplite.4
trunk/sys/netinet/in.c
trunk/sys/netinet/in.h
trunk/sys/netinet/in_pcb.c
trunk/sys/netinet/in_proto.c
trunk/sys/netinet/udp_usrreq.c
trunk/sys/netinet/udp_var.h
trunk/sys/netinet/udplite.h
trunk/sys/netinet6/in6_ifattach.c
trunk/sys/netinet6/in6_proto.c
trunk/sys/netinet6/udp6_usrreq.c
trunk/sys/netinet6/udp6_var.h
Modified: trunk/UPDATING
===================================================================
--- trunk/UPDATING 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/UPDATING 2015-02-06 13:57:11 UTC (rev 6962)
@@ -5,12 +5,6 @@
an attacker to create a denial of service attack on any
program that uses libmagic.
-20141117:
- Add support for UDP Lite protocol aka RFC 3828 to IPv4 and IPv6
- stacks.
-
- Based on FreeBSD's 10.1 patch.
-
20141109:
Fix building perl during buildworld when the GDBM port is installed.
Modified: trunk/lib/libc/net/getaddrinfo.c
===================================================================
--- trunk/lib/libc/net/getaddrinfo.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/lib/libc/net/getaddrinfo.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -171,7 +171,6 @@
{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
{ PF_INET6, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 },
{ PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 },
- { PF_INET6, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
{ PF_INET6, SOCK_RAW, ANY, NULL, 0x05 },
#endif
{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
@@ -178,7 +177,6 @@
{ PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
{ PF_INET, SOCK_STREAM, IPPROTO_SCTP, "sctp", 0x03 },
{ PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, "sctp", 0x07 },
- { PF_INET, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
{ PF_INET, SOCK_RAW, ANY, NULL, 0x05 },
{ -1, 0, 0, NULL, 0 },
};
@@ -1491,9 +1489,6 @@
case IPPROTO_SCTP:
proto = "sctp";
break;
- case IPPROTO_UDPLITE:
- proto = "udplite";
- break;
default:
proto = NULL;
break;
Modified: trunk/share/man/man4/Makefile
===================================================================
--- trunk/share/man/man4/Makefile 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/share/man/man4/Makefile 2015-02-06 13:57:11 UTC (rev 6962)
@@ -478,7 +478,6 @@
udav.4 \
udbp.4 \
udp.4 \
- udplite.4 \
uep.4 \
ufm.4 \
ufoma.4 \
Modified: trunk/share/man/man4/udplite.4
===================================================================
--- trunk/share/man/man4/udplite.4 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/share/man/man4/udplite.4 2015-02-06 13:57:11 UTC (rev 6962)
@@ -95,3 +95,100 @@
.Xr recv 2 ,
.Xr send 2 ,
.Xr socket 2
+.\" Copyright (c) 2014, Kevin Lo.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD: stable/10/share/man/man4/udplite.4 272661 2014-10-06 17:04:26Z tuexen $
+.\" $MidnightBSD$
+.\"
+.Dd November 17, 2014
+.Dt UDPLITE 4
+.Os
+.Sh NAME
+.Nm udplite
+.Nd Lightweight User Datagram Protocol
+.Sh SYNOPSIS
+.In sys/types.h
+.In sys/socket.h
+.In netinet/udplite.h
+.Ft int
+.Fn socket AF_INET SOCK_DGRAM IPPROTO_UDPLITE
+.Sh DESCRIPTION
+The
+.Tn UDP-Lite
+protocol provides a partial checksum which allows
+corrupted packets to be transmitted to the receiving
+application.
+This has advantages for some types of multimedia
+transport that may be able to make use of slightly
+damaged datagrams, rather than having them discarded
+by lower-layer protocols.
+.Pp
+.Tn UDP-Lite
+supports a number of socket options which can be set with
+.Xr setsockopt 2
+and tested with
+.Xr getsockopt 2 :
+.Bl -tag -width ".Dv UDPLITE_SEND_CSCOV"
+.It Dv UDPLITE_SEND_CSCOV
+This option sets the sender checksum coverage.
+A value of zero indicates that all sent packets will have
+full checksum coverage.
+A value of 8 to 65535 limits the checksum coverage of all sent packets
+to the value given.
+.It Dv UDPLITE_RECV_CSCOV
+This option is the receiver-side analogue.
+A value of zero instructs the kernel to drop all received packets
+not having full checksum coverage.
+A value of 8 to 65535 instructs the kernel to drop all received
+packets with a partial checksum coverage smaller than the value specified.
+.El
+.Sh ERRORS
+A socket operation may fail with one of the following errors returned:
+.Bl -tag -width Er
+.It Bq Er EISCONN
+when trying to establish a connection on a socket which
+already has one, or when trying to send a datagram with the destination
+address specified and the socket is already connected;
+.It Bq Er ENOTCONN
+when trying to send a datagram, but
+no destination address is specified, and the socket has not been
+connected;
+.It Bq Er ENOBUFS
+when the system runs out of memory for
+an internal data structure;
+.It Bq Er EADDRINUSE
+when an attempt
+is made to create a socket with a port which has already been
+allocated;
+.It Bq Er EADDRNOTAVAIL
+when an attempt is made to create a
+socket with a network address for which no network interface
+exists.
+.El
+.Sh SEE ALSO
+.Xr getsockopt 2 ,
+.Xr recv 2 ,
+.Xr send 2 ,
+.Xr socket 2
Modified: trunk/sys/netinet/in.c
===================================================================
--- trunk/sys/netinet/in.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/in.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -1266,7 +1266,6 @@
in_pcbpurgeif0(&V_ripcbinfo, ifp);
in_pcbpurgeif0(&V_udbinfo, ifp);
- in_pcbpurgeif0(&V_ulitecbinfo, ifp);
in_purgemaddrs(ifp);
}
Modified: trunk/sys/netinet/in.h
===================================================================
--- trunk/sys/netinet/in.h 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/in.h 2015-02-06 13:57:11 UTC (rev 6962)
@@ -237,16 +237,11 @@
#define IPPROTO_IPCOMP 108 /* payload compression (IPComp) */
#define IPPROTO_SCTP 132 /* SCTP */
#define IPPROTO_MH 135 /* IPv6 Mobility Header */
-#define IPPROTO_UDPLITE 136 /* UDP-Lite */
-#define IPPROTO_HIP 139 /* IP6 Host Identity Protocol */
-#define IPPROTO_SHIM6 140 /* IP6 Shim6 Protocol */
/* 101-254: Partly Unassigned */
#define IPPROTO_PIM 103 /* Protocol Independent Mcast */
#define IPPROTO_CARP 112 /* CARP */
#define IPPROTO_PGM 113 /* PGM */
#define IPPROTO_PFSYNC 240 /* PFSYNC */
-#define IPPROTO_RESERVED_253 253 /* Reserved */
-#define IPPROTO_RESERVED_254 254 /* Reserved */
/* 255: Reserved */
/* BSD Private, local use, namespace incursion, no longer used */
#define IPPROTO_OLD_DIVERT 254 /* OLD divert pseudo-proto */
Modified: trunk/sys/netinet/in_pcb.c
===================================================================
--- trunk/sys/netinet/in_pcb.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/in_pcb.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -388,14 +388,13 @@
lastport = &pcbinfo->ipi_lastport;
}
/*
- * For UDP(-Lite), use random port allocation as long as the user
+ * For UDP, use random port allocation as long as the user
* allows it. For TCP (and as of yet unknown) connections,
* use random port allocation only if the user allows it AND
* ipport_tick() allows it.
*/
if (V_ipport_randomized &&
- (!V_ipport_stoprandom || pcbinfo == &V_udbinfo ||
- pcbinfo == &V_ulitecbinfo))
+ (!V_ipport_stoprandom || pcbinfo == &V_udbinfo))
dorandom = 1;
else
dorandom = 0;
@@ -405,8 +404,8 @@
*/
if (first == last)
dorandom = 0;
- /* Make sure to not include UDP(-Lite) packets in the count. */
- if (pcbinfo != &V_udbinfo || pcbinfo != &V_ulitecbinfo)
+ /* Make sure to not include UDP packets in the count. */
+ if (pcbinfo != &V_udbinfo)
V_ipport_tcpallocs++;
/*
* Instead of having two loops further down counting up or down
Modified: trunk/sys/netinet/in_proto.c
===================================================================
--- trunk/sys/netinet/in_proto.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/in_proto.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -184,20 +184,6 @@
},
#endif /* SCTP */
{
- .pr_type = SOCK_DGRAM,
- .pr_domain = &inetdomain,
- .pr_protocol = IPPROTO_UDPLITE,
- .pr_flags = PR_ATOMIC|PR_ADDR,
- .pr_input = udp_input,
- .pr_ctlinput = udplite_ctlinput,
- .pr_ctloutput = udp_ctloutput,
- .pr_init = udplite_init,
-#ifdef VIMAGE
- .pr_destroy = udplite_destroy,
-#endif
- .pr_usrreqs = &udp_usrreqs
-},
-{
.pr_type = SOCK_RAW,
.pr_domain = &inetdomain,
.pr_protocol = IPPROTO_RAW,
Modified: trunk/sys/netinet/udp_usrreq.c
===================================================================
--- trunk/sys/netinet/udp_usrreq.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/udp_usrreq.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -3,7 +3,6 @@
* The Regents of the University of California.
* Copyright (c) 2008 Robert N. M. Watson
* Copyright (c) 2010-2011 Juniper Networks, Inc.
- * Copyright (c) 2014 Kevin Lo
* All rights reserved.
*
* Portions of this software were developed by Robert N. M. Watson under
@@ -85,7 +84,6 @@
#endif
#include <netinet/udp.h>
#include <netinet/udp_var.h>
-#include <netinet/udplite.h>
#ifdef IPSEC
#include <netipsec/ipsec.h>
@@ -97,9 +95,8 @@
#include <security/mac/mac_framework.h>
/*
- * UDP and UDP-Lite protocols implementation.
+ * UDP protocol implementation.
* Per RFC 768, August, 1980.
- * Per RFC 3828, July, 2004.
*/
/*
@@ -139,8 +136,6 @@
VNET_DEFINE(struct inpcbhead, udb); /* from udp_var.h */
VNET_DEFINE(struct inpcbinfo, udbinfo);
-VNET_DEFINE(struct inpcbhead, ulitecb);
-VNET_DEFINE(struct inpcbinfo, ulitecbinfo);
static VNET_DEFINE(uma_zone_t, udpcb_zone);
#define V_udpcb_zone VNET(udpcb_zone)
@@ -186,16 +181,6 @@
return (0);
}
-static int
-udplite_inpcb_init(void *mem, int size, int flags)
-{
- struct inpcb *inp;
-
- inp = mem;
- INP_LOCK_INIT(inp, "inp", "udpliteinp");
- return (0);
-}
-
void
udp_init(void)
{
@@ -210,15 +195,6 @@
EVENTHANDLER_PRI_ANY);
}
-void
-udplite_init(void)
-{
-
- in_pcbinfo_init(&V_ulitecbinfo, "udplite", &V_ulitecb, UDBHASHSIZE,
- UDBHASHSIZE, "udplite_inpcb", udplite_inpcb_init, NULL,
- UMA_ZONE_NOFREE, IPI_HASHFIELDS_2TUPLE);
-}
-
/*
* Kernel module interface for updating udpstat. The argument is an index
* into udpstat treated as an array of u_long. While this encodes the
@@ -260,13 +236,6 @@
in_pcbinfo_destroy(&V_udbinfo);
uma_zdestroy(V_udpcb_zone);
}
-
-void
-udplite_destroy(void)
-{
-
- in_pcbinfo_destroy(&V_ulitecbinfo);
-}
#endif
#ifdef INET
@@ -370,14 +339,11 @@
struct ifnet *ifp;
struct inpcb *inp;
int len;
- struct inpcbinfo *pcbinfo;
struct ip save_ip;
struct sockaddr_in udp_in;
#ifdef IPFIREWALL_FORWARD
struct m_tag *fwd_tag;
#endif
- int cscov_partial;
- uint8_t pr;
ifp = m->m_pkthdr.rcvif;
UDPSTAT_INC(udps_ipackets);
@@ -397,7 +363,7 @@
*/
ip = mtod(m, struct ip *);
if (m->m_len < iphlen + sizeof(struct udphdr)) {
- if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == NULL) {
+ if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == 0) {
UDPSTAT_INC(udps_hdrops);
return;
}
@@ -404,8 +370,6 @@
ip = mtod(m, struct ip *);
}
uh = (struct udphdr *)((caddr_t)ip + iphlen);
- pr = ip->ip_p;
- cscov_partial = (pr == IPPROTO_UDPLITE) ? 1 : 0;
/*
* Destination port of 0 is illegal, based on RFC768.
@@ -428,18 +392,13 @@
* reflect UDP length, drop.
*/
len = ntohs((u_short)uh->uh_ulen);
- if (pr == IPPROTO_UDPLITE && len == 0) {
- /* Zero means checksum over the complete packet. */
- len = ip->ip_len;
- cscov_partial = 0;
- }
if (ip->ip_len != len) {
if (len > ip->ip_len || len < sizeof(struct udphdr)) {
UDPSTAT_INC(udps_badlen);
goto badunlocked;
}
- if (pr == IPPROTO_UDP)
- m_adj(m, len - ip->ip_len);
+ m_adj(m, len - ip->ip_len);
+ /* ip->ip_len = len; */
}
/*
@@ -457,14 +416,13 @@
if (uh->uh_sum) {
u_short uh_sum;
- if ((m->m_pkthdr.csum_flags & CSUM_DATA_VALID) &&
- !cscov_partial) {
+ if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) {
if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
uh_sum = m->m_pkthdr.csum_data;
else
uh_sum = in_pseudo(ip->ip_src.s_addr,
ip->ip_dst.s_addr, htonl((u_short)len +
- m->m_pkthdr.csum_data + pr));
+ m->m_pkthdr.csum_data + IPPROTO_UDP));
uh_sum ^= 0xffff;
} else {
char b[9];
@@ -471,8 +429,7 @@
bcopy(((struct ipovly *)ip)->ih_x1, b, 9);
bzero(((struct ipovly *)ip)->ih_x1, 9);
- ((struct ipovly *)ip)->ih_len = (pr == IPPROTO_UDP) ?
- uh->uh_ulen : htons(ip->ip_len);
+ ((struct ipovly *)ip)->ih_len = uh->uh_ulen;
uh_sum = in_cksum(m, len + sizeof (struct ip));
bcopy(b, ((struct ipovly *)ip)->ih_x1, 9);
}
@@ -484,17 +441,14 @@
} else
UDPSTAT_INC(udps_nosum);
- pcbinfo = get_inpcbinfo(pr);
if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
in_broadcast(ip->ip_dst, ifp)) {
struct inpcb *last;
- struct inpcbhead *pcblist;
struct ip_moptions *imo;
- INP_INFO_RLOCK(pcbinfo);
- pcblist = get_pcblist(pr);
+ INP_INFO_RLOCK(&V_udbinfo);
last = NULL;
- LIST_FOREACH(inp, pcblist, inp_list) {
+ LIST_FOREACH(inp, &V_udb, inp_list) {
if (inp->inp_lport != uh->uh_dport)
continue;
#ifdef INET6
@@ -580,12 +534,12 @@
UDPSTAT_INC(udps_noportbcast);
if (inp)
INP_RUNLOCK(inp);
- INP_INFO_RUNLOCK(pcbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
goto badunlocked;
}
udp_append(last, ip, m, iphlen, &udp_in);
INP_RUNLOCK(last);
- INP_INFO_RUNLOCK(pcbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
return;
}
@@ -606,7 +560,7 @@
* Transparently forwarded. Pretend to be the destination.
* Already got one like this?
*/
- inp = in_pcblookup_mbuf(pcbinfo, ip->ip_src, uh->uh_sport,
+ inp = in_pcblookup_mbuf(&V_udbinfo, ip->ip_src, uh->uh_sport,
ip->ip_dst, uh->uh_dport, INPLOOKUP_RLOCKPCB, ifp, m);
if (!inp) {
/*
@@ -614,7 +568,7 @@
* Because we've rewritten the destination address,
* any hardware-generated hash is ignored.
*/
- inp = in_pcblookup(pcbinfo, ip->ip_src,
+ inp = in_pcblookup(&V_udbinfo, ip->ip_src,
uh->uh_sport, next_hop->sin_addr,
next_hop->sin_port ? htons(next_hop->sin_port) :
uh->uh_dport, INPLOOKUP_WILDCARD |
@@ -624,7 +578,7 @@
m_tag_delete(m, fwd_tag);
} else
#endif /* IPFIREWALL_FORWARD */
- inp = in_pcblookup_mbuf(pcbinfo, ip->ip_src, uh->uh_sport,
+ inp = in_pcblookup_mbuf(&V_udbinfo, ip->ip_src, uh->uh_sport,
ip->ip_dst, uh->uh_dport, INPLOOKUP_WILDCARD |
INPLOOKUP_RLOCKPCB, ifp, m);
if (inp == NULL) {
@@ -661,17 +615,6 @@
m_freem(m);
return;
}
- if (cscov_partial) {
- struct udpcb *up;
-
- up = intoudpcb(inp);
- if (up->u_rxcslen > len) {
- INP_RUNLOCK(inp);
- m_freem(m);
- return;
- }
- }
-
udp_append(inp, ip, m, iphlen, &udp_in);
INP_RUNLOCK(inp);
return;
@@ -704,9 +647,8 @@
}
#ifdef INET
-static void
-udp_common_ctlinput(int cmd, struct sockaddr *sa, void *vip,
- struct inpcbinfo *pcbinfo)
+void
+udp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
{
struct ip *ip = vip;
struct udphdr *uh;
@@ -735,7 +677,7 @@
return;
if (ip != NULL) {
uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2));
- inp = in_pcblookup(pcbinfo, faddr, uh->uh_dport,
+ inp = in_pcblookup(&V_udbinfo, faddr, uh->uh_dport,
ip->ip_src, uh->uh_sport, INPLOOKUP_RLOCKPCB, NULL);
if (inp != NULL) {
INP_RLOCK_ASSERT(inp);
@@ -745,22 +687,9 @@
INP_RUNLOCK(inp);
}
} else
- in_pcbnotifyall(pcbinfo, faddr, inetctlerrmap[cmd],
+ in_pcbnotifyall(&V_udbinfo, faddr, inetctlerrmap[cmd],
udp_notify);
}
-void
-udp_ctlinput(int cmd, struct sockaddr *sa, void *vip)
-{
-
- return (udp_common_ctlinput(cmd, sa, vip, &V_udbinfo));
-}
-
-void
-udplite_ctlinput(int cmd, struct sockaddr *sa, void *vip)
-{
-
- return (udp_common_ctlinput(cmd, sa, vip, &V_ulitecbinfo));
-}
#endif /* INET */
static int
@@ -916,16 +845,16 @@
int
udp_ctloutput(struct socket *so, struct sockopt *sopt)
{
+ int error = 0, optval;
struct inpcb *inp;
+#ifdef IPSEC_NAT_T
struct udpcb *up;
- int isudplite, error, optval;
+#endif
- error = 0;
- isudplite = (so->so_proto->pr_protocol == IPPROTO_UDPLITE) ? 1 : 0;
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("%s: inp == NULL", __func__));
INP_WLOCK(inp);
- if (sopt->sopt_level != so->so_proto->pr_protocol) {
+ if (sopt->sopt_level != IPPROTO_UDP) {
#ifdef INET6
if (INP_CHECK_SOCKAF(so, AF_INET6)) {
INP_WUNLOCK(inp);
@@ -983,34 +912,6 @@
}
INP_WUNLOCK(inp);
break;
- case UDPLITE_SEND_CSCOV:
- case UDPLITE_RECV_CSCOV:
- if (!isudplite) {
- INP_WUNLOCK(inp);
- error = ENOPROTOOPT;
- break;
- }
- INP_WUNLOCK(inp);
- error = sooptcopyin(sopt, &optval, sizeof(optval),
- sizeof(optval));
- if (error != 0)
- break;
- inp = sotoinpcb(so);
- KASSERT(inp != NULL, ("%s: inp == NULL", __func__));
- INP_WLOCK(inp);
- up = intoudpcb(inp);
- KASSERT(up != NULL, ("%s: up == NULL", __func__));
- if (optval != 0 && optval < 8) {
- INP_WUNLOCK(inp);
- error = EINVAL;
- break;
- }
- if (sopt->sopt_name == UDPLITE_SEND_CSCOV)
- up->u_txcslen = optval;
- else
- up->u_rxcslen = optval;
- INP_WUNLOCK(inp);
- break;
default:
INP_WUNLOCK(inp);
error = ENOPROTOOPT;
@@ -1028,22 +929,6 @@
error = sooptcopyout(sopt, &optval, sizeof optval);
break;
#endif
- case UDPLITE_SEND_CSCOV:
- case UDPLITE_RECV_CSCOV:
- if (!isudplite) {
- INP_WUNLOCK(inp);
- error = ENOPROTOOPT;
- break;
- }
- up = intoudpcb(inp);
- KASSERT(up != NULL, ("%s: up == NULL", __func__));
- if (sopt->sopt_name == UDPLITE_SEND_CSCOV)
- optval = up->u_txcslen;
- else
- optval = up->u_rxcslen;
- INP_WUNLOCK(inp);
- error = sooptcopyout(sopt, &optval, sizeof(optval));
- break;
default:
INP_WUNLOCK(inp);
error = ENOPROTOOPT;
@@ -1066,16 +951,12 @@
int len = m->m_pkthdr.len;
struct in_addr faddr, laddr;
struct cmsghdr *cm;
- struct inpcbinfo *pcbinfo;
struct sockaddr_in *sin, src;
- int cscov_partial = 0;
int error = 0;
int ipflags;
u_short fport, lport;
int unlock_udbinfo;
u_char tos;
- uint8_t pr;
- uint16_t cscov = 0;
/*
* udp_output() may need to temporarily bind or connect the current
@@ -1170,14 +1051,12 @@
*
* XXXRW: Check that hash locking update here is correct.
*/
- pr = inp->inp_socket->so_proto->pr_protocol;
- pcbinfo = get_inpcbinfo(pr);
sin = (struct sockaddr_in *)addr;
if (sin != NULL &&
(inp->inp_laddr.s_addr == INADDR_ANY && inp->inp_lport == 0)) {
INP_RUNLOCK(inp);
INP_WLOCK(inp);
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
unlock_udbinfo = UH_WLOCKED;
} else if ((sin != NULL && (
(sin->sin_addr.s_addr == INADDR_ANY) ||
@@ -1185,7 +1064,7 @@
(inp->inp_laddr.s_addr == INADDR_ANY) ||
(inp->inp_lport == 0))) ||
(src.sin_family == AF_INET)) {
- INP_HASH_RLOCK(pcbinfo);
+ INP_HASH_RLOCK(&V_udbinfo);
unlock_udbinfo = UH_RLOCKED;
} else
unlock_udbinfo = UH_UNLOCKED;
@@ -1198,7 +1077,7 @@
laddr = inp->inp_laddr;
lport = inp->inp_lport;
if (src.sin_family == AF_INET) {
- INP_HASH_LOCK_ASSERT(pcbinfo);
+ INP_HASH_LOCK_ASSERT(&V_udbinfo);
if ((lport == 0) ||
(laddr.s_addr == INADDR_ANY &&
src.sin_addr.s_addr == INADDR_ANY)) {
@@ -1249,7 +1128,7 @@
inp->inp_lport == 0 ||
sin->sin_addr.s_addr == INADDR_ANY ||
sin->sin_addr.s_addr == INADDR_BROADCAST) {
- INP_HASH_LOCK_ASSERT(pcbinfo);
+ INP_HASH_LOCK_ASSERT(&V_udbinfo);
error = in_pcbconnect_setup(inp, addr, &laddr.s_addr,
&lport, &faddr.s_addr, &fport, NULL,
td->td_ucred);
@@ -1264,7 +1143,7 @@
if (inp->inp_laddr.s_addr == INADDR_ANY &&
inp->inp_lport == 0) {
INP_WLOCK_ASSERT(inp);
- INP_HASH_WLOCK_ASSERT(pcbinfo);
+ INP_HASH_WLOCK_ASSERT(&V_udbinfo);
/*
* Remember addr if jailed, to prevent
* rebinding.
@@ -1313,31 +1192,13 @@
*/
ui = mtod(m, struct udpiphdr *);
bzero(ui->ui_x1, sizeof(ui->ui_x1)); /* XXX still needed? */
- ui->ui_pr = pr;
+ ui->ui_pr = IPPROTO_UDP;
ui->ui_src = laddr;
ui->ui_dst = faddr;
ui->ui_sport = lport;
ui->ui_dport = fport;
ui->ui_ulen = htons((u_short)len + sizeof(struct udphdr));
- if (pr == IPPROTO_UDPLITE) {
- struct udpcb *up;
- uint16_t plen;
- up = intoudpcb(inp);
- cscov = up->u_txcslen;
- plen = (u_short)len + sizeof(struct udphdr);
- if (cscov >= plen)
- cscov = 0;
- ui->ui_len = htons(plen);
- ui->ui_ulen = htons(cscov);
- /*
- * For UDP-Lite, checksum coverage length of zero means
- * the entire UDPLite packet is covered by the checksum.
- */
- cscov_partial = (cscov == 0) ? 0 : 1;
- } else
-/* TODO: where in the world ui->ui_v = IPVERSION << 4; */
-
/*
* Set the Don't Fragment bit in the IP header.
*/
@@ -1363,25 +1224,15 @@
/*
* Set up checksum and output datagram.
*/
- ui->ui_sum = 0;
- if (pr == IPPROTO_UDPLITE) {
+ if (V_udp_cksum) {
if (inp->inp_flags & INP_ONESBCAST)
faddr.s_addr = INADDR_BROADCAST;
- if (cscov_partial) {
- if ((ui->ui_sum = in_cksum(m, sizeof(struct ip) + cscov)) == 0)
- ui->ui_sum = 0xffff;
- } else {
- if ((ui->ui_sum = in_cksum(m, sizeof(struct udpiphdr) + len)) == 0)
- ui->ui_sum = 0xffff;
- }
- } else if (V_udp_cksum) {
- if (inp->inp_flags & INP_ONESBCAST)
- faddr.s_addr = INADDR_BROADCAST;
ui->ui_sum = in_pseudo(ui->ui_src.s_addr, faddr.s_addr,
- htons((u_short)len + sizeof(struct udphdr) + pr));
+ htons((u_short)len + sizeof(struct udphdr) + IPPROTO_UDP));
m->m_pkthdr.csum_flags = CSUM_UDP;
m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum);
- }
+ } else
+ ui->ui_sum = 0;
((struct ip *)ui)->ip_len = sizeof (struct udpiphdr) + len;
((struct ip *)ui)->ip_ttl = inp->inp_ip_ttl; /* XXX */
((struct ip *)ui)->ip_tos = tos; /* XXX */
@@ -1388,9 +1239,9 @@
UDPSTAT_INC(udps_opackets);
if (unlock_udbinfo == UH_WLOCKED)
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
else if (unlock_udbinfo == UH_RLOCKED)
- INP_HASH_RUNLOCK(pcbinfo);
+ INP_HASH_RUNLOCK(&V_udbinfo);
error = ip_output(m, inp->inp_options, NULL, ipflags,
inp->inp_moptions, inp);
if (unlock_udbinfo == UH_WLOCKED)
@@ -1401,10 +1252,10 @@
release:
if (unlock_udbinfo == UH_WLOCKED) {
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
INP_WUNLOCK(inp);
} else if (unlock_udbinfo == UH_RLOCKED) {
- INP_HASH_RUNLOCK(pcbinfo);
+ INP_HASH_RUNLOCK(&V_udbinfo);
INP_RUNLOCK(inp);
} else
INP_RUNLOCK(inp);
@@ -1551,17 +1402,15 @@
udp_abort(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_abort: inp == NULL"));
INP_WLOCK(inp);
if (inp->inp_faddr.s_addr != INADDR_ANY) {
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in_pcbdisconnect(inp);
inp->inp_laddr.s_addr = INADDR_ANY;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
soisdisconnected(so);
}
INP_WUNLOCK(inp);
@@ -1571,19 +1420,17 @@
udp_attach(struct socket *so, int proto, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp == NULL, ("udp_attach: inp != NULL"));
error = soreserve(so, udp_sendspace, udp_recvspace);
if (error)
return (error);
- INP_INFO_WLOCK(pcbinfo);
- error = in_pcballoc(so, pcbinfo);
+ INP_INFO_WLOCK(&V_udbinfo);
+ error = in_pcballoc(so, &V_udbinfo);
if (error) {
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (error);
}
@@ -1595,12 +1442,12 @@
if (error) {
in_pcbdetach(inp);
in_pcbfree(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (error);
}
INP_WUNLOCK(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (0);
}
#endif /* INET */
@@ -1631,16 +1478,14 @@
udp_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_bind: inp == NULL"));
INP_WLOCK(inp);
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
error = in_pcbbind(inp, nam, td->td_ucred);
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
INP_WUNLOCK(inp);
return (error);
}
@@ -1649,17 +1494,15 @@
udp_close(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_close: inp == NULL"));
INP_WLOCK(inp);
if (inp->inp_faddr.s_addr != INADDR_ANY) {
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in_pcbdisconnect(inp);
inp->inp_laddr.s_addr = INADDR_ANY;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
soisdisconnected(so);
}
INP_WUNLOCK(inp);
@@ -1669,11 +1512,9 @@
udp_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
+ int error;
struct sockaddr_in *sin;
- int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_connect: inp == NULL"));
INP_WLOCK(inp);
@@ -1687,9 +1528,9 @@
INP_WUNLOCK(inp);
return (error);
}
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
error = in_pcbconnect(inp, nam, td->td_ucred);
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
if (error == 0)
soisconnected(so);
INP_WUNLOCK(inp);
@@ -1700,15 +1541,13 @@
udp_detach(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
struct udpcb *up;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_detach: inp == NULL"));
KASSERT(inp->inp_faddr.s_addr == INADDR_ANY,
("udp_detach: not disconnected"));
- INP_INFO_WLOCK(pcbinfo);
+ INP_INFO_WLOCK(&V_udbinfo);
INP_WLOCK(inp);
up = intoudpcb(inp);
KASSERT(up != NULL, ("%s: up == NULL", __func__));
@@ -1715,7 +1554,7 @@
inp->inp_ppcb = NULL;
in_pcbdetach(inp);
in_pcbfree(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
udp_discardcb(up);
}
@@ -1723,9 +1562,7 @@
udp_disconnect(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp_disconnect: inp == NULL"));
INP_WLOCK(inp);
@@ -1733,10 +1570,10 @@
INP_WUNLOCK(inp);
return (ENOTCONN);
}
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in_pcbdisconnect(inp);
inp->inp_laddr.s_addr = INADDR_ANY;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
SOCK_LOCK(so);
so->so_state &= ~SS_ISCONNECTED; /* XXX */
SOCK_UNLOCK(so);
Modified: trunk/sys/netinet/udp_var.h
===================================================================
--- trunk/sys/netinet/udp_var.h 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/udp_var.h 2015-02-06 13:57:11 UTC (rev 6962)
@@ -59,8 +59,6 @@
struct udpcb {
udp_tun_func_t u_tun_func; /* UDP kernel tunneling callback. */
u_int u_flags; /* Generic UDP flags. */
- uint16_t u_rxcslen; /* Coverage for incoming datagrams. */
- uint16_t u_txcslen; /* Coverage for outgoing datagrams. */
};
#define intoudpcb(ip) ((struct udpcb *)(ip)->inp_ppcb)
@@ -133,12 +131,8 @@
extern struct pr_usrreqs udp_usrreqs;
VNET_DECLARE(struct inpcbhead, udb);
VNET_DECLARE(struct inpcbinfo, udbinfo);
-VNET_DECLARE(struct inpcbhead, ulitecb);
-VNET_DECLARE(struct inpcbinfo, ulitecbinfo);
#define V_udb VNET(udb)
#define V_udbinfo VNET(udbinfo)
-#define V_ulitecb VNET(ulitecb)
-#define V_ulitecbinfo VNET(ulitecbinfo)
extern u_long udp_sendspace;
extern u_long udp_recvspace;
@@ -150,37 +144,20 @@
#define V_udp_blackhole VNET(udp_blackhole)
extern int udp_log_in_vain;
-static __inline struct inpcbinfo *
-get_inpcbinfo(uint8_t protocol)
-{
- return (protocol == IPPROTO_UDP) ? &V_udbinfo : &V_ulitecbinfo;
-}
+int udp_newudpcb(struct inpcb *);
+void udp_discardcb(struct udpcb *);
-static __inline struct inpcbhead *
-get_pcblist(uint8_t protocol)
-{
- return (protocol == IPPROTO_UDP) ? &V_udb : &V_ulitecb;
-}
-
-int udp_newudpcb(struct inpcb *);
-void udp_discardcb(struct udpcb *);
-
-void udp_ctlinput(int, struct sockaddr *, void *);
-void udplite_ctlinput(int, struct sockaddr *, void *);
-int udp_ctloutput(struct socket *, struct sockopt *);
-void udp_init(void);
-void udplite_init(void);
+void udp_ctlinput(int, struct sockaddr *, void *);
+int udp_ctloutput(struct socket *, struct sockopt *);
+void udp_init(void);
#ifdef VIMAGE
-void udp_destroy(void);
-void udplite_destroy(void);
+void udp_destroy(void);
#endif
-void udp_input(struct mbuf *, int);
-void udplite_input(struct mbuf *, int);
+void udp_input(struct mbuf *, int);
struct inpcb *udp_notify(struct inpcb *inp, int errno);
-int udp_shutdown(struct socket *so);
+int udp_shutdown(struct socket *so);
-int udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f);
+int udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f);
+#endif
-#endif /* _KERNEL */
-
-#endif /* _NETINET_UDP_VAR_H_ */
+#endif
Modified: trunk/sys/netinet/udplite.h
===================================================================
--- trunk/sys/netinet/udplite.h 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet/udplite.h 2015-02-06 13:57:11 UTC (rev 6962)
@@ -36,3 +36,41 @@
#define UDPLITE_RECV_CSCOV 4 /* Receiver checksum coverage. */
#endif /* !_NETINET_UDPLITE_H_ */
+/*-
+ * Copyright (c) 2014, Kevin Lo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $MidnightBSD$
+ */
+
+#ifndef _NETINET_UDPLITE_H_
+#define _NETINET_UDPLITE_H_
+
+/*
+ * User-settable options (used with setsockopt).
+ */
+#define UDPLITE_SEND_CSCOV 2 /* Sender checksum coverage. */
+#define UDPLITE_RECV_CSCOV 4 /* Receiver checksum coverage. */
+
+#endif /* !_NETINET_UDPLITE_H_ */
Modified: trunk/sys/netinet6/in6_ifattach.c
===================================================================
--- trunk/sys/netinet6/in6_ifattach.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet6/in6_ifattach.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -838,7 +838,6 @@
}
in6_pcbpurgeif0(&V_udbinfo, ifp);
- in6_pcbpurgeif0(&V_ulitecbinfo, ifp);
in6_pcbpurgeif0(&V_ripcbinfo, ifp);
/* leave from all multicast groups joined */
in6_purgemaddrs(ifp);
Modified: trunk/sys/netinet6/in6_proto.c
===================================================================
--- trunk/sys/netinet6/in6_proto.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet6/in6_proto.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -211,7 +211,7 @@
.pr_protocol = IPPROTO_SCTP,
.pr_flags = PR_WANTRCVD,
.pr_input = sctp6_input,
- .pr_ctlinput = sctp6_ctlinput,
+ .pr_ctlinput = sctp6_ctlinput,
.pr_ctloutput = sctp_ctloutput,
.pr_drain = sctp_drain,
.pr_usrreqs = &sctp6_usrreqs
@@ -218,19 +218,6 @@
},
#endif /* SCTP */
{
- .pr_type = SOCK_DGRAM,
- .pr_domain = &inet6domain,
- .pr_protocol = IPPROTO_UDPLITE,
- .pr_flags = PR_ATOMIC|PR_ADDR,
- .pr_input = udp6_input,
- .pr_ctlinput = udplite6_ctlinput,
- .pr_ctloutput = udp_ctloutput,
-#ifndef INET /* Do not call initialization twice. */
- .pr_init = udplite_init,
-#endif
- .pr_usrreqs = &udp6_usrreqs,
-},
-{
.pr_type = SOCK_RAW,
.pr_domain = &inet6domain,
.pr_protocol = IPPROTO_RAW,
Modified: trunk/sys/netinet6/udp6_usrreq.c
===================================================================
--- trunk/sys/netinet6/udp6_usrreq.c 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet6/udp6_usrreq.c 2015-02-06 13:57:11 UTC (rev 6962)
@@ -1,7 +1,6 @@
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (c) 2010-2011 Juniper Networks, Inc.
- * Copyright (c) 2014 Kevin Lo
* All rights reserved.
*
* Portions of this software were developed by Robert N. M. Watson under
@@ -107,7 +106,6 @@
#include <netinet/ip_var.h>
#include <netinet/udp.h>
#include <netinet/udp_var.h>
-#include <netinet/udplite.h>
#include <netinet6/ip6protosw.h>
#include <netinet6/ip6_var.h>
@@ -180,10 +178,8 @@
struct ip6_hdr *ip6;
struct udphdr *uh;
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
struct udpcb *up;
int off = *offp;
- int cscov_partial;
int plen, ulen;
struct sockaddr_in6 fromsa;
#ifdef IPFIREWALL_FORWARD
@@ -190,7 +186,6 @@
struct m_tag *fwd_tag;
#endif
uint16_t uh_sum;
- uint8_t nxt;
ifp = m->m_pkthdr.rcvif;
ip6 = mtod(m, struct ip6_hdr *);
@@ -222,13 +217,6 @@
plen = ntohs(ip6->ip6_plen) - off + sizeof(*ip6);
ulen = ntohs((u_short)uh->uh_ulen);
- nxt = ip6->ip6_nxt;
- cscov_partial = (nxt == IPPROTO_UDPLITE) ? 1 : 0;
- if (nxt == IPPROTO_UDPLITE && ulen == 0) {
- /* Zero means checksum over the complete packet. */
- ulen = plen;
- cscov_partial = 0;
- }
if (plen != ulen) {
UDPSTAT_INC(udps_badlen);
goto badunlocked;
@@ -238,22 +226,19 @@
* Checksum extended UDP header and data.
*/
if (uh->uh_sum == 0) {
- if (ulen > plen || ulen < sizeof(struct udphdr)) {
- UDPSTAT_INC(udps_nosum);
- goto badunlocked;
- }
+ UDPSTAT_INC(udps_nosum);
+ goto badunlocked;
}
- if ((m->m_pkthdr.csum_flags & CSUM_DATA_VALID_IPV6) &&
- !cscov_partial) {
+ if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID_IPV6) {
if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR)
uh_sum = m->m_pkthdr.csum_data;
else
- uh_sum = in6_cksum_pseudo(ip6, ulen, nxt,
- m->m_pkthdr.csum_data);
+ uh_sum = in6_cksum_pseudo(ip6, ulen,
+ IPPROTO_UDP, m->m_pkthdr.csum_data);
uh_sum ^= 0xffff;
} else
- uh_sum = in6_cksum(m, nxt, off, ulen);
+ uh_sum = in6_cksum(m, IPPROTO_UDP, off, ulen);
if (uh_sum != 0) {
UDPSTAT_INC(udps_badsum);
@@ -266,13 +251,11 @@
init_sin6(&fromsa, m);
fromsa.sin6_port = uh->uh_sport;
- pcbinfo = get_inpcbinfo(nxt);
if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) {
struct inpcb *last;
- struct inpcbhead *pcblist;
struct ip6_moptions *imo;
- INP_INFO_RLOCK(pcbinfo);
+ INP_INFO_RLOCK(&V_udbinfo);
/*
* In the event that laddr should be set to the link-local
* address (this happens in RIPng), the multicast address
@@ -288,9 +271,8 @@
* here. We need udphdr for IPsec processing so we do that
* later.
*/
- pcblist = get_pcblist(nxt);
last = NULL;
- LIST_FOREACH(inp, pcblist, inp_list) {
+ LIST_FOREACH(inp, &V_udb, inp_list) {
if ((inp->inp_vflag & INP_IPV6) == 0)
continue;
if (inp->inp_lport != uh->uh_dport)
@@ -395,7 +377,7 @@
goto badheadlocked;
}
INP_RLOCK(last);
- INP_INFO_RUNLOCK(pcbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
up = intoudpcb(last);
if (up->u_tun_func == NULL) {
udp6_append(last, m, off, &fromsa);
@@ -425,8 +407,8 @@
* Transparently forwarded. Pretend to be the destination.
* Already got one like this?
*/
- inp = in6_pcblookup_mbuf(pcbinfo, &ip6->ip6_src,
- uh->uh_sport, &ip6->ip6_dst, uh->uh_dport,
+ inp = in6_pcblookup_mbuf(&V_udbinfo,
+ &ip6->ip6_src, uh->uh_sport, &ip6->ip6_dst, uh->uh_dport,
INPLOOKUP_RLOCKPCB, m->m_pkthdr.rcvif, m);
if (!inp) {
/*
@@ -434,7 +416,7 @@
* Because we've rewritten the destination address,
* any hardware-generated hash is ignored.
*/
- inp = in6_pcblookup(pcbinfo, &ip6->ip6_src,
+ inp = in6_pcblookup(&V_udbinfo, &ip6->ip6_src,
uh->uh_sport, &next_hop6->sin6_addr,
next_hop6->sin6_port ? htons(next_hop6->sin6_port) :
uh->uh_dport, INPLOOKUP_WILDCARD |
@@ -444,7 +426,7 @@
m_tag_delete(m, fwd_tag);
} else
#endif /* IPFIREWALL_FORWARD */
- inp = in6_pcblookup_mbuf(pcbinfo, &ip6->ip6_src,
+ inp = in6_pcblookup_mbuf(&V_udbinfo, &ip6->ip6_src,
uh->uh_sport, &ip6->ip6_dst, uh->uh_dport,
INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB,
m->m_pkthdr.rcvif, m);
@@ -475,13 +457,6 @@
}
INP_RLOCK_ASSERT(inp);
up = intoudpcb(inp);
- if (cscov_partial) {
- if (up->u_rxcslen > ulen) {
- INP_RUNLOCK(inp);
- m_freem(m);
- return (IPPROTO_DONE);
- }
- }
if (up->u_tun_func == NULL) {
udp6_append(inp, m, off, &fromsa);
} else {
@@ -495,7 +470,7 @@
return (IPPROTO_DONE);
badheadlocked:
- INP_INFO_RUNLOCK(pcbinfo);
+ INP_INFO_RUNLOCK(&V_udbinfo);
badunlocked:
if (m)
m_freem(m);
@@ -502,9 +477,8 @@
return (IPPROTO_DONE);
}
-static void
-udp6_common_ctlinput(int cmd, struct sockaddr *sa, void *d,
- struct inpcbinfo *pcbinfo)
+void
+udp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
{
struct udphdr uh;
struct ip6_hdr *ip6;
@@ -560,28 +534,14 @@
bzero(&uh, sizeof(uh));
m_copydata(m, off, sizeof(*uhp), (caddr_t)&uh);
- (void)in6_pcbnotify(pcbinfo, sa, uh.uh_dport,
+ (void) in6_pcbnotify(&V_udbinfo, sa, uh.uh_dport,
(struct sockaddr *)ip6cp->ip6c_src, uh.uh_sport, cmd,
cmdarg, notify);
} else
- (void)in6_pcbnotify(pcbinfo, sa, 0,
+ (void) in6_pcbnotify(&V_udbinfo, sa, 0,
(const struct sockaddr *)sa6_src, 0, cmd, cmdarg, notify);
}
-void
-udp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
-{
-
- return (udp6_common_ctlinput(cmd, sa, d, &V_udbinfo));
-}
-
-void
-udplite6_ctlinput(int cmd, struct sockaddr *sa, void *d)
-{
-
- return (udp6_common_ctlinput(cmd, sa, d, &V_ulitecbinfo));
-}
-
static int
udp6_getcred(SYSCTL_HANDLER_ARGS)
{
@@ -639,12 +599,9 @@
struct in6_addr *laddr, *faddr, in6a;
struct sockaddr_in6 *sin6 = NULL;
struct ifnet *oifp = NULL;
- int cscov_partial = 0;
int scope_ambiguous = 0;
u_short fport;
int error = 0;
- uint8_t nxt;
- uint16_t cscov = 0;
struct ip6_pktopts *optp, opt;
int af = AF_INET6, hlen = sizeof(struct ip6_hdr);
int flags;
@@ -803,25 +760,10 @@
/*
* Stuff checksum and output datagram.
*/
- nxt = (inp->inp_socket->so_proto->pr_protocol == IPPROTO_UDP) ?
- IPPROTO_UDP : IPPROTO_UDPLITE;
udp6 = (struct udphdr *)(mtod(m, caddr_t) + hlen);
udp6->uh_sport = inp->inp_lport; /* lport is always set in the PCB */
udp6->uh_dport = fport;
- if (nxt == IPPROTO_UDPLITE) {
- struct udpcb *up;
-
- up = intoudpcb(inp);
- cscov = up->u_txcslen;
- if (cscov >= plen)
- cscov = 0;
- udp6->uh_ulen = htons(cscov);
- /*
- * For UDP-Lite, checksum coverage length of zero means
- * the entire UDPLite packet is covered by the checksum.
- */
- cscov_partial = (cscov == 0) ? 0 : 1;
- } else if (plen <= 0xffff)
+ if (plen <= 0xffff)
udp6->uh_ulen = htons((u_short)plen);
else
udp6->uh_ulen = 0;
@@ -836,20 +778,14 @@
#if 0 /* ip6_plen will be filled in ip6_output. */
ip6->ip6_plen = htons((u_short)plen);
#endif
- ip6->ip6_nxt = nxt;
+ ip6->ip6_nxt = IPPROTO_UDP;
ip6->ip6_hlim = in6_selecthlim(inp, NULL);
ip6->ip6_src = *laddr;
ip6->ip6_dst = *faddr;
- if (cscov_partial) {
- if ((udp6->uh_sum = in6_cksum(m, 0,
- sizeof(struct ip6_hdr), cscov)) == 0)
- udp6->uh_sum = 0xffff;
- } else {
- udp6->uh_sum = in6_cksum_pseudo(ip6, plen, nxt, 0);
- m->m_pkthdr.csum_flags = CSUM_UDP_IPV6;
- m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum);
- }
+ udp6->uh_sum = in6_cksum_pseudo(ip6, plen, IPPROTO_UDP, 0);
+ m->m_pkthdr.csum_flags = CSUM_UDP_IPV6;
+ m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum);
flags = 0;
@@ -878,9 +814,7 @@
udp6_abort(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_abort: inp == NULL"));
@@ -896,10 +830,10 @@
INP_WLOCK(inp);
if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in6_pcbdisconnect(inp);
inp->in6p_laddr = in6addr_any;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
soisdisconnected(so);
}
INP_WUNLOCK(inp);
@@ -909,10 +843,8 @@
udp6_attach(struct socket *so, int proto, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp == NULL, ("udp6_attach: inp != NULL"));
@@ -921,10 +853,10 @@
if (error)
return (error);
}
- INP_INFO_WLOCK(pcbinfo);
- error = in_pcballoc(so, pcbinfo);
+ INP_INFO_WLOCK(&V_udbinfo);
+ error = in_pcballoc(so, &V_udbinfo);
if (error) {
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (error);
}
inp = (struct inpcb *)so->so_pcb;
@@ -945,11 +877,11 @@
if (error) {
in_pcbdetach(inp);
in_pcbfree(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (error);
}
INP_WUNLOCK(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
return (0);
}
@@ -957,15 +889,13 @@
udp6_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_bind: inp == NULL"));
INP_WLOCK(inp);
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
inp->inp_vflag &= ~INP_IPV4;
inp->inp_vflag |= INP_IPV6;
if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0) {
@@ -993,7 +923,7 @@
#ifdef INET
out:
#endif
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
INP_WUNLOCK(inp);
return (error);
}
@@ -1002,9 +932,7 @@
udp6_close(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_close: inp == NULL"));
@@ -1019,10 +947,10 @@
#endif
INP_WLOCK(inp);
if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in6_pcbdisconnect(inp);
inp->in6p_laddr = in6addr_any;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
soisdisconnected(so);
}
INP_WUNLOCK(inp);
@@ -1032,11 +960,9 @@
udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
struct sockaddr_in6 *sin6;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
sin6 = (struct sockaddr_in6 *)nam;
KASSERT(inp != NULL, ("udp6_connect: inp == NULL"));
@@ -1063,10 +989,10 @@
error = prison_remote_ip4(td->td_ucred, &sin.sin_addr);
if (error != 0)
goto out;
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
error = in_pcbconnect(inp, (struct sockaddr *)&sin,
td->td_ucred);
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
if (error == 0)
soisconnected(so);
goto out;
@@ -1081,9 +1007,9 @@
error = prison_remote_ip6(td->td_ucred, &sin6->sin6_addr);
if (error != 0)
goto out;
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
error = in6_pcbconnect(inp, nam, td->td_ucred);
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
if (error == 0)
soisconnected(so);
out:
@@ -1095,20 +1021,18 @@
udp6_detach(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
struct udpcb *up;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_detach: inp == NULL"));
- INP_INFO_WLOCK(pcbinfo);
+ INP_INFO_WLOCK(&V_udbinfo);
INP_WLOCK(inp);
up = intoudpcb(inp);
KASSERT(up != NULL, ("%s: up == NULL", __func__));
in_pcbdetach(inp);
in_pcbfree(inp);
- INP_INFO_WUNLOCK(pcbinfo);
+ INP_INFO_WUNLOCK(&V_udbinfo);
udp_discardcb(up);
}
@@ -1116,10 +1040,8 @@
udp6_disconnect(struct socket *so)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_disconnect: inp == NULL"));
@@ -1140,10 +1062,10 @@
goto out;
}
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
in6_pcbdisconnect(inp);
inp->in6p_laddr = in6addr_any;
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
SOCK_LOCK(so);
so->so_state &= ~SS_ISCONNECTED; /* XXX */
SOCK_UNLOCK(so);
@@ -1157,10 +1079,8 @@
struct sockaddr *addr, struct mbuf *control, struct thread *td)
{
struct inpcb *inp;
- struct inpcbinfo *pcbinfo;
int error = 0;
- pcbinfo = get_inpcbinfo(so->so_proto->pr_protocol);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("udp6_send: inp == NULL"));
@@ -1212,9 +1132,9 @@
#ifdef MAC
mac_inpcb_create_mbuf(inp, m);
#endif
- INP_HASH_WLOCK(pcbinfo);
+ INP_HASH_WLOCK(&V_udbinfo);
error = udp6_output(inp, m, addr, control, td);
- INP_HASH_WUNLOCK(pcbinfo);
+ INP_HASH_WUNLOCK(&V_udbinfo);
#ifdef INET
#endif
INP_WUNLOCK(inp);
Modified: trunk/sys/netinet6/udp6_var.h
===================================================================
--- trunk/sys/netinet6/udp6_var.h 2015-01-14 22:53:09 UTC (rev 6961)
+++ trunk/sys/netinet6/udp6_var.h 2015-02-06 13:57:11 UTC (rev 6962)
@@ -69,7 +69,6 @@
extern struct pr_usrreqs udp6_usrreqs;
void udp6_ctlinput(int, struct sockaddr *, void *);
-void udplite6_ctlinput(int, struct sockaddr *, void *);
int udp6_input(struct mbuf **, int *, int);
#endif
More information about the Midnightbsd-cvs
mailing list