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.19 retrieving revision 1.33 diff -u -p -r1.19 -r1.33 --- src/sys/netinet/udp_usrreq.c 1995/06/12 06:24:22 1.19 +++ src/sys/netinet/udp_usrreq.c 1996/05/23 17:05:45 1.33 @@ -1,4 +1,4 @@ -/* $NetBSD: udp_usrreq.c,v 1.19 1995/06/12 06:24:22 mycroft Exp $ */ +/* $NetBSD: udp_usrreq.c,v 1.33 1996/05/23 17:05:45 mycroft Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 @@ -43,6 +43,11 @@ #include #include #include +#include +#include + +#include +#include #include #include @@ -57,6 +62,8 @@ #include #include +#include + /* * UDP protocol implementation. * Per RFC 768, August, 1980. @@ -68,23 +75,30 @@ int udpcksum = 0; /* XXX */ #endif struct sockaddr_in udp_in = { sizeof(udp_in), AF_INET }; -struct inpcb *udp_last_inpcb = 0; -static void udp_detach __P((struct inpcb *)); static void udp_notify __P((struct inpcb *, int)); static struct mbuf *udp_saveopt __P((caddr_t, int, int)); +#ifndef UDBHASHSIZE +#define UDBHASHSIZE 128 +#endif +int udbhashsize = UDBHASHSIZE; + void udp_init() { - in_pcbinit(&udbtable); + in_pcbinit(&udbtable, udbhashsize); } void -udp_input(m, iphlen) - register struct mbuf *m; - int iphlen; +#if __STDC__ +udp_input(struct mbuf *m, ...) +#else +udp_input(m, va_alist) + struct mbuf *m; + va_dcl +#endif { register struct ip *ip; register struct udphdr *uh; @@ -92,6 +106,12 @@ udp_input(m, iphlen) struct mbuf *opts = 0; int len; struct ip save_ip; + int iphlen; + va_list ap; + + va_start(ap, m); + iphlen = va_arg(ap, int); + va_end(ap); udpstat.udps_ipackets++; @@ -141,12 +161,11 @@ udp_input(m, iphlen) /* * Checksum extended UDP header and data. */ - if (udpcksum && uh->uh_sum) { - ((struct ipovly *)ip)->ih_next = 0; - ((struct ipovly *)ip)->ih_prev = 0; - ((struct ipovly *)ip)->ih_x1 = 0; + if (uh->uh_sum) { + bzero(((struct ipovly *)ip)->ih_x1, + sizeof ((struct ipovly *)ip)->ih_x1); ((struct ipovly *)ip)->ih_len = uh->uh_ulen; - if (uh->uh_sum = in_cksum(m, len + sizeof (struct ip))) { + if ((uh->uh_sum = in_cksum(m, len + sizeof (struct ip))) != 0) { udpstat.udps_badsum++; m_freem(m); return; @@ -184,8 +203,9 @@ udp_input(m, iphlen) * (Algorithm copied from raw_intr().) */ last = NULL; - for (inp = udbtable.inpt_list.lh_first; inp != 0; - inp = inp->inp_list.le_next) { + for (inp = udbtable.inpt_queue.cqh_first; + inp != (struct inpcb *)&udbtable.inpt_queue; + inp = inp->inp_queue.cqe_next) { if (inp->inp_lport != uh->uh_dport) continue; if (inp->inp_laddr.s_addr != INADDR_ANY) { @@ -222,7 +242,7 @@ udp_input(m, iphlen) * port. It * assumes that an application will never * clear these options after setting them. */ - if ((last->so_options&(SO_REUSEPORT|SO_REUSEADDR) == 0)) + if ((last->so_options&(SO_REUSEPORT|SO_REUSEADDR)) == 0) break; } @@ -246,13 +266,10 @@ udp_input(m, iphlen) /* * Locate pcb for datagram. */ - inp = udp_last_inpcb; - if (inp == 0 || - inp->inp_lport != uh->uh_dport || - inp->inp_fport != uh->uh_sport || - inp->inp_faddr.s_addr != ip->ip_src.s_addr || - inp->inp_laddr.s_addr != ip->ip_dst.s_addr) { - udpstat.udpps_pcbcachemiss++; + inp = in_pcbhashlookup(&udbtable, ip->ip_src, uh->uh_sport, + ip->ip_dst, uh->uh_dport); + if (inp == 0) { + ++udpstat.udps_pcbhashmiss; inp = in_pcblookup(&udbtable, ip->ip_src, uh->uh_sport, ip->ip_dst, uh->uh_dport, INPLOOKUP_WILDCARD); if (inp == 0) { @@ -266,7 +283,6 @@ udp_input(m, iphlen) icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0); return; } - udp_last_inpcb = inp; } /* @@ -357,66 +373,55 @@ udp_notify(inp, errno) sowwakeup(inp->inp_socket); } -void -udp_ctlinput(cmd, sa, ip) +void * +udp_ctlinput(cmd, sa, v) int cmd; struct sockaddr *sa; - register struct ip *ip; + void *v; { + register struct ip *ip = v; register struct udphdr *uh; - extern struct in_addr zeroin_addr; - extern u_char inetctlerrmap[]; + extern int inetctlerrmap[]; void (*notify) __P((struct inpcb *, int)) = udp_notify; + int errno; + if ((unsigned)cmd >= PRC_NCMDS) + return NULL; + errno = inetctlerrmap[cmd]; if (PRC_IS_REDIRECT(cmd)) notify = in_rtchange, ip = 0; else if (cmd == PRC_HOSTDEAD) ip = 0; - else if ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0) - return; + else if (errno == 0) + return NULL; if (ip) { uh = (struct udphdr *)((caddr_t)ip + (ip->ip_hl << 2)); in_pcbnotify(&udbtable, sa, uh->uh_dport, ip->ip_src, - uh->uh_sport, cmd, notify); + uh->uh_sport, errno, notify); } else - in_pcbnotifyall(&udbtable, sa, cmd, notify); + in_pcbnotifyall(&udbtable, sa, errno, notify); + return NULL; } int -udp_output(inp, m, addr, control) - register struct inpcb *inp; - register struct mbuf *m; - struct mbuf *addr, *control; +#if __STDC__ +udp_output(struct mbuf *m, ...) +#else +udp_output(m, va_alist) + struct mbuf *m; + va_dcl +#endif { + register struct inpcb *inp; register struct udpiphdr *ui; register int len = m->m_pkthdr.len; - struct in_addr laddr; - int s, error = 0; + int error = 0; + va_list ap; - if (control) - m_freem(control); /* XXX */ + va_start(ap, m); + inp = va_arg(ap, struct inpcb *); + va_end(ap); - if (addr) { - laddr = inp->inp_laddr; - if (inp->inp_faddr.s_addr != INADDR_ANY) { - error = EISCONN; - goto release; - } - /* - * Must block input while temporarily connected. - */ - s = splnet(); - error = in_pcbconnect(inp, addr); - if (error) { - splx(s); - goto release; - } - } else { - if (inp->inp_faddr.s_addr == INADDR_ANY) { - error = ENOTCONN; - goto release; - } - } /* * Calculate data length and get a mbuf * for UDP and IP headers. @@ -432,8 +437,7 @@ udp_output(inp, m, addr, control) * and addresses and length put into network format. */ ui = mtod(m, struct udpiphdr *); - ui->ui_next = ui->ui_prev = 0; - ui->ui_x1 = 0; + bzero(ui->ui_x1, sizeof ui->ui_x1); ui->ui_pr = IPPROTO_UDP; ui->ui_len = htons((u_int16_t)len + sizeof (struct udphdr)); ui->ui_src = inp->inp_laddr; @@ -454,16 +458,9 @@ udp_output(inp, m, addr, control) ((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++; - error = ip_output(m, inp->inp_options, &inp->inp_route, + return (ip_output(m, inp->inp_options, &inp->inp_route, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST), - inp->inp_moptions); - - if (addr) { - in_pcbdisconnect(inp); - inp->inp_laddr = laddr; - splx(s); - } - return (error); + inp->inp_moptions)); release: m_freem(m); @@ -476,22 +473,31 @@ u_long udp_recvspace = 40 * (1024 + size /*ARGSUSED*/ int -udp_usrreq(so, req, m, addr, control) +udp_usrreq(so, req, m, nam, control, p) struct socket *so; int req; - struct mbuf *m, *addr, *control; + struct mbuf *m, *nam, *control; + struct proc *p; { - struct inpcb *inp = sotoinpcb(so); - int error = 0; + register struct inpcb *inp; int s; + register int error = 0; if (req == PRU_CONTROL) - return (in_control(so, (long)m, (caddr_t)addr, - (struct ifnet *)control)); - if (inp == NULL && req != PRU_ATTACH) { + return (in_control(so, (long)m, (caddr_t)nam, + (struct ifnet *)control, p)); + + s = splsoftnet(); + inp = sotoinpcb(so); +#ifdef DIAGNOSTIC + if (req != PRU_SEND && req != PRU_SENDOOB && control) + panic("udp_usrreq: unexpected control mbuf"); +#endif + if (inp == 0 && req != PRU_ATTACH) { error = EINVAL; goto release; } + /* * Note: need to block udp_input while changing * the udp pcb queue and/or pcb addresses. @@ -499,29 +505,28 @@ udp_usrreq(so, req, m, addr, control) switch (req) { case PRU_ATTACH: - if (inp != NULL) { - error = EINVAL; + if (inp != 0) { + error = EISCONN; break; } - s = splnet(); + if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { + error = soreserve(so, udp_sendspace, udp_recvspace); + if (error) + break; + } error = in_pcballoc(so, &udbtable); - splx(s); - if (error) - break; - error = soreserve(so, udp_sendspace, udp_recvspace); if (error) break; - ((struct inpcb *) so->so_pcb)->inp_ip.ip_ttl = ip_defttl; + inp = sotoinpcb(so); + inp->inp_ip.ip_ttl = ip_defttl; break; case PRU_DETACH: - udp_detach(inp); + in_pcbdetach(inp); break; case PRU_BIND: - s = splnet(); - error = in_pcbbind(inp, addr); - splx(s); + error = in_pcbbind(inp, nam, p); break; case PRU_LISTEN: @@ -529,104 +534,105 @@ udp_usrreq(so, req, m, addr, control) break; case PRU_CONNECT: - if (inp->inp_faddr.s_addr != INADDR_ANY) { - error = EISCONN; + error = in_pcbconnect(inp, nam); + if (error) break; - } - s = splnet(); - error = in_pcbconnect(inp, addr); - splx(s); - if (error == 0) - soisconnected(so); + soisconnected(so); break; case PRU_CONNECT2: error = EOPNOTSUPP; break; - case PRU_ACCEPT: - error = EOPNOTSUPP; - break; - case PRU_DISCONNECT: - if (inp->inp_faddr.s_addr == INADDR_ANY) { - error = ENOTCONN; - break; - } - s = splnet(); + /*soisdisconnected(so);*/ + so->so_state &= ~SS_ISCONNECTED; /* XXX */ in_pcbdisconnect(inp); - inp->inp_laddr.s_addr = INADDR_ANY; - splx(s); - so->so_state &= ~SS_ISCONNECTED; /* XXX */ + inp->inp_laddr.s_addr = INADDR_ANY; /* XXX */ break; case PRU_SHUTDOWN: socantsendmore(so); break; - case PRU_SEND: - return (udp_output(inp, m, addr, control)); - - case PRU_ABORT: - soisdisconnected(so); - udp_detach(inp); + case PRU_RCVD: + error = EOPNOTSUPP; break; - case PRU_SOCKADDR: - in_setsockaddr(inp, addr); - break; + case PRU_SEND: + if (control && control->m_len) { + m_freem(control); + m_freem(m); + error = EINVAL; + break; + } + { + struct in_addr laddr; - case PRU_PEERADDR: - in_setpeeraddr(inp, addr); + if (nam) { + laddr = inp->inp_laddr; + if ((so->so_state & SS_ISCONNECTED) != 0) { + error = EISCONN; + goto die; + } + error = in_pcbconnect(inp, nam); + if (error) { + die: + m_freem(m); + break; + } + } else { + if ((so->so_state & SS_ISCONNECTED) == 0) { + error = ENOTCONN; + goto die; + } + } + error = udp_output(m, inp); + if (nam) { + in_pcbdisconnect(inp); + inp->inp_laddr = laddr; + } + } break; case PRU_SENSE: /* * stat: don't bother with a blocksize. */ + splx(s); return (0); + case PRU_RCVOOB: + error = EOPNOTSUPP; + break; + case PRU_SENDOOB: - case PRU_FASTTIMO: - case PRU_SLOWTIMO: - case PRU_PROTORCV: - case PRU_PROTOSEND: + m_freem(control); + m_freem(m); error = EOPNOTSUPP; break; - case PRU_RCVD: - case PRU_RCVOOB: - return (EOPNOTSUPP); /* do not free mbuf's */ + case PRU_SOCKADDR: + in_setsockaddr(inp, nam); + break; + + case PRU_PEERADDR: + in_setpeeraddr(inp, nam); + break; default: panic("udp_usrreq"); } release: - if (control) { - printf("udp control data unexpectedly retained\n"); - m_freem(control); - } - if (m) - m_freem(m); - return (error); -} - -static void -udp_detach(inp) - struct inpcb *inp; -{ - int s = splnet(); - - if (inp == udp_last_inpcb) - udp_last_inpcb = 0; - in_pcbdetach(inp); splx(s); + return (error); } /* * Sysctl for udp variables. */ +int udp_sysctl(name, namelen, oldp, oldlenp, newp, newlen) int *name; u_int namelen;