From 200ce01ddb957dd8fd63c9d365d1cbfd06024f01 Mon Sep 17 00:00:00 2001 From: rwatson Date: Mon, 10 Sep 2007 14:22:15 +0000 Subject: Further UDPv4 cleanup: - Resort includes a bit. - Correct typos and wording problems in comments. - Rename udpcksum to udp_cksum to be consistent with other UDP-related configuration variables. - Remove indirection of udp_notify through local notify variable in udp_ctlinput(), which is presumably due to copying and pasting from TCP, where multiple notify routines exist. Approved by: re (kensmith) --- sys/netinet/udp_usrreq.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'sys/netinet/udp_usrreq.c') diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 5066e84..89bc420 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -32,12 +32,11 @@ */ #include "opt_ipfw.h" -#include "opt_ipsec.h" #include "opt_inet6.h" +#include "opt_ipsec.h" #include "opt_mac.h" #include -#include #include #include #include @@ -54,6 +53,7 @@ #include #include #include +#include #include @@ -61,8 +61,8 @@ #include #include -#include #include +#include #include #include #ifdef INET6 @@ -94,11 +94,11 @@ /* * BSD 4.2 defaulted the udp checksum to be off. Turning off udp checksums * removes the only data integrity mechanism for packets and malformed - * packets that would otherwise be discarded by bad checksums may cause - * problems (especially for NFS data blocks). + * packets that would otherwise be discarded due to bad checksums, and may + * cause problems (especially for NFS data blocks). */ -static int udpcksum = 1; -SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW, &udpcksum, +static int udp_cksum = 1; +SYSCTL_INT(_net_inet_udp, UDPCTL_CHECKSUM, checksum, CTLFLAG_RW, &udp_cksum, 0, ""); int udp_log_in_vain = 0; @@ -444,7 +444,7 @@ udp_input(struct mbuf *m, int off) * Check for a multicast source filter * entry on this socket for this group. * MCAST_EXCLUDE is the default - * behaviour. It means default accept; + * behaviour. It means default accept; * entries, if present, denote sources * to be excluded from delivery. */ @@ -579,7 +579,6 @@ udp_ctlinput(int cmd, struct sockaddr *sa, void *vip) { struct ip *ip = vip; struct udphdr *uh; - struct inpcb *(*notify)(struct inpcb *, int) = udp_notify; struct in_addr faddr; struct inpcb *inp; @@ -611,13 +610,14 @@ udp_ctlinput(int cmd, struct sockaddr *sa, void *vip) if (inp != NULL) { INP_LOCK(inp); if (inp->inp_socket != NULL) { - (*notify)(inp, inetctlerrmap[cmd]); + udp_notify(inp, inetctlerrmap[cmd]); } INP_UNLOCK(inp); } INP_INFO_RUNLOCK(&udbinfo); } else - in_pcbnotifyall(&udbinfo, faddr, inetctlerrmap[cmd], notify); + in_pcbnotifyall(&udbinfo, faddr, inetctlerrmap[cmd], + udp_notify); } static int @@ -629,7 +629,7 @@ udp_pcblist(SYSCTL_HANDLER_ARGS) struct xinpgen xig; /* - * The process of preparing the TCB list is too time-consuming and + * The process of preparing the PCB list is too time-consuming and * resource-intensive to repeat twice on every request. */ if (req->oldptr == 0) { @@ -770,9 +770,9 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr, /* * udp_output() may need to temporarily bind or connect the current - * inpcb. As such, we don't know up front what inpcb locks we will - * need. Do any work to decide what is needed up front before - * acquiring locks. + * inpcb. As such, we don't know up front whether we will need the + * pcbinfo lock or not. Do any work to decide what is needed up + * front before acquiring any locks. */ if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) { if (control) @@ -846,7 +846,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr, /* * If the IP_SENDSRCADDR control message was specified, override the - * source address for this datagram. Its use is invalidated if the + * source address for this datagram. Its use is invalidated if the * address thus specified is incomplete or clobbers other inpcbs. */ laddr = inp->inp_laddr; @@ -951,7 +951,7 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr, /* * Set up checksum and output datagram. */ - if (udpcksum) { + if (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, -- cgit v1.1