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/kern/uipc_socket.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.46 retrieving revision 1.54.2.2 diff -u -p -r1.46 -r1.54.2.2 --- src/sys/kern/uipc_socket.c 1999/05/15 22:36:34 1.46 +++ src/sys/kern/uipc_socket.c 2001/04/09 01:57:58 1.54.2.2 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.46 1999/05/15 22:36:34 sommerfeld Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.54.2.2 2001/04/09 01:57:58 nathanw Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -52,10 +53,13 @@ #include #include -struct pool socket_pool; +struct pool socket_pool; + +extern int somaxconn; /* patchable (XXX sysctl) */ +int somaxconn = SOMAXCONN; void -soinit() +soinit(void) { pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, @@ -71,18 +75,14 @@ soinit() */ /*ARGSUSED*/ int -socreate(dom, aso, type, proto) - int dom; - struct socket **aso; - register int type; - int proto; +socreate(int dom, struct socket **aso, int type, int proto) { - struct proc *p = curproc; /* XXX */ - register struct protosw *prp; - register struct socket *so; - register int error; - int s; + struct proc *p; + struct protosw *prp; + struct socket *so; + int error, s; + p = curproc->l_proc; /* XXX */ if (proto) prp = pffindproto(dom, proto, type); else @@ -123,14 +123,11 @@ socreate(dom, aso, type, proto) } int -sobind(so, nam) - struct socket *so; - struct mbuf *nam; +sobind(struct socket *so, struct mbuf *nam, struct proc *p) { - struct proc *p = curproc; /* XXX */ - int s = splsoftnet(); - int error; + int s, error; + s = splsoftnet(); error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, (struct mbuf *)0, nam, (struct mbuf *)0, p); splx(s); @@ -138,12 +135,11 @@ sobind(so, nam) } int -solisten(so, backlog) - register struct socket *so; - int backlog; +solisten(struct socket *so, int backlog) { - int s = splsoftnet(), error; + int s, error; + s = splsoftnet(); error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); if (error) { @@ -154,14 +150,13 @@ solisten(so, backlog) so->so_options |= SO_ACCEPTCONN; if (backlog < 0) backlog = 0; - so->so_qlimit = min(backlog, SOMAXCONN); + so->so_qlimit = min(backlog, somaxconn); splx(s); return (0); } void -sofree(so) - register struct socket *so; +sofree(struct socket *so) { if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) @@ -186,13 +181,13 @@ sofree(so) * Free socket when disconnect complete. */ int -soclose(so) - register struct socket *so; +soclose(struct socket *so) { - struct socket *so2; - int s = splsoftnet(); /* conservative */ - int error = 0; + struct socket *so2; + int s, error; + error = 0; + s = splsoftnet(); /* conservative */ if (so->so_options & SO_ACCEPTCONN) { while ((so2 = so->so_q0.tqh_first) != 0) { (void) soqremque(so2, 0); @@ -224,7 +219,7 @@ soclose(so) } } } -drop: + drop: if (so->so_pcb) { int error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, @@ -232,7 +227,7 @@ drop: if (error == 0) error = error2; } -discard: + discard: if (so->so_state & SS_NOFDREF) panic("soclose: NOFDREF"); so->so_state |= SS_NOFDREF; @@ -245,8 +240,7 @@ discard: * Must be called at splsoftnet... */ int -soabort(so) - struct socket *so; +soabort(struct socket *so) { return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, (struct mbuf *)0, @@ -254,34 +248,33 @@ soabort(so) } int -soaccept(so, nam) - register struct socket *so; - struct mbuf *nam; +soaccept(struct socket *so, struct mbuf *nam) { - int s = splsoftnet(); - int error; + int s, error; + error = 0; + s = splsoftnet(); if ((so->so_state & SS_NOFDREF) == 0) panic("soaccept: !NOFDREF"); so->so_state &= ~SS_NOFDREF; - if ((so->so_state & SS_ISDISCONNECTED) == 0) + if ((so->so_state & SS_ISDISCONNECTED) == 0 || + (so->so_proto->pr_flags & PR_ABRTACPTDIS) == 0) error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT, (struct mbuf *)0, nam, (struct mbuf *)0, (struct proc *)0); else - error = 0; + error = ECONNABORTED; + splx(s); return (error); } int -soconnect(so, nam) - register struct socket *so; - struct mbuf *nam; +soconnect(struct socket *so, struct mbuf *nam) { - struct proc *p = curproc; /* XXX */ - int s; - int error; + struct proc *p; + int s, error; + p = curproc->l_proc; /* XXX */ if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); s = splsoftnet(); @@ -303,13 +296,11 @@ soconnect(so, nam) } int -soconnect2(so1, so2) - register struct socket *so1; - struct socket *so2; +soconnect2(struct socket *so1, struct socket *so2) { - int s = splsoftnet(); - int error; + int s, error; + s = splsoftnet(); error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2, (struct mbuf *)0, (struct mbuf *)so2, (struct mbuf *)0, (struct proc *)0); @@ -318,12 +309,11 @@ soconnect2(so1, so2) } int -sodisconnect(so) - register struct socket *so; +sodisconnect(struct socket *so) { - int s = splsoftnet(); - int error; + int s, error; + s = splsoftnet(); if ((so->so_state & SS_ISCONNECTED) == 0) { error = ENOTCONN; goto bad; @@ -335,7 +325,7 @@ sodisconnect(so) error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); -bad: + bad: splx(s); return (error); } @@ -359,21 +349,17 @@ bad: * Data and control buffers are freed on return. */ int -sosend(so, addr, uio, top, control, flags) - register struct socket *so; - struct mbuf *addr; - struct uio *uio; - struct mbuf *top; - struct mbuf *control; - int flags; +sosend(struct socket *so, struct mbuf *addr, struct uio *uio, struct mbuf *top, + struct mbuf *control, int flags) { - struct proc *p = curproc; /* XXX */ - struct mbuf **mp; - register struct mbuf *m; - register long space, len, resid; - int clen = 0, error, s, dontroute, mlen; - int atomic = sosendallatonce(so) || top; - + struct proc *p; + struct mbuf **mp, *m; + long space, len, resid; + int clen, error, s, dontroute, mlen, atomic; + + p = curproc->l_proc; /* XXX */ + clen = 0; + atomic = sosendallatonce(so) || top; if (uio) resid = uio->uio_resid; else @@ -397,15 +383,19 @@ sosend(so, addr, uio, top, control, flag clen = control->m_len; #define snderr(errno) { error = errno; splx(s); goto release; } -restart: + restart: if ((error = sblock(&so->so_snd, SBLOCKWAIT(flags))) != 0) goto out; do { s = splsoftnet(); if (so->so_state & SS_CANTSENDMORE) snderr(EPIPE); - if (so->so_error) - snderr(so->so_error); + if (so->so_error) { + error = so->so_error; + so->so_error = 0; + splx(s); + goto release; + } if ((so->so_state & SS_ISCONNECTED) == 0) { if (so->so_proto->pr_flags & PR_CONNREQUIRED) { if ((so->so_state & SS_ISCONFIRMING) == 0 && @@ -461,7 +451,8 @@ restart: len = min(MCLBYTES, resid); #else if (atomic && top == 0) { - len = min(MCLBYTES - max_hdr, resid); + len = min(MCLBYTES - max_hdr, + resid); m->m_data += max_hdr; } else len = min(MCLBYTES, resid); @@ -478,7 +469,8 @@ nopages: if (atomic && top == 0 && len < mlen) MH_ALIGN(m, len); } - error = uiomove(mtod(m, caddr_t), (int)len, uio); + error = uiomove(mtod(m, caddr_t), (int)len, + uio); resid = uio->uio_resid; m->m_len = len; *mp = m; @@ -493,15 +485,6 @@ nopages: } } while (space > 0 && atomic); -#ifdef TEST_FOR_PANIC_UIPC_3_RACE_CONDITION - { - extern struct domain unixdomain; - - if (so->so_proto->pr_domain == &unixdomain) - sleep(&lbolt, PVFS); - } -#endif - s = splsoftnet(); if (so->so_state & SS_CANTSENDMORE) @@ -529,9 +512,9 @@ nopages: } while (resid && space > 0); } while (resid); -release: + release: sbunlock(&so->so_snd); -out: + out: if (top) m_freem(top); if (control) @@ -556,22 +539,18 @@ out: * only for the count in uio_resid. */ int -soreceive(so, paddr, uio, mp0, controlp, flagsp) - register struct socket *so; - struct mbuf **paddr; - struct uio *uio; - struct mbuf **mp0; - struct mbuf **controlp; - int *flagsp; +soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio, + struct mbuf **mp0, struct mbuf **controlp, int *flagsp) { - register struct mbuf *m, **mp; - register int flags, len, error, s, offset; - struct protosw *pr = so->so_proto; - struct mbuf *nextrecord; - int moff, type = 0; - int orig_resid = uio->uio_resid; + struct mbuf *m, **mp; + int flags, len, error, s, offset, moff, type, orig_resid; + struct protosw *pr; + struct mbuf *nextrecord; + pr = so->so_proto; mp = mp0; + type = 0; + orig_resid = uio->uio_resid; if (paddr) *paddr = 0; if (controlp) @@ -592,7 +571,7 @@ soreceive(so, paddr, uio, mp0, controlp, (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); } while (uio->uio_resid && error == 0 && m); -bad: + bad: if (m) m_freem(m); return (error); @@ -603,7 +582,7 @@ bad: (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); -restart: + restart: if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) return (error); s = splsoftnet(); @@ -666,7 +645,7 @@ restart: return (error); goto restart; } -dontblock: + dontblock: #ifdef notyet /* XXXX */ if (uio->uio_procp) uio->uio_procp->p_stats->p_ru.ru_msgrcv++; @@ -851,19 +830,18 @@ dontblock: if (flagsp) *flagsp |= flags; -release: + release: sbunlock(&so->so_rcv); splx(s); return (error); } int -soshutdown(so, how) - struct socket *so; - int how; +soshutdown(struct socket *so, int how) { - struct protosw *pr = so->so_proto; + struct protosw *pr; + pr = so->so_proto; if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) return (EINVAL); @@ -876,14 +854,14 @@ soshutdown(so, how) } void -sorflush(so) - register struct socket *so; +sorflush(struct socket *so) { - register struct sockbuf *sb = &so->so_rcv; - register struct protosw *pr = so->so_proto; - register int s; - struct sockbuf asb; + struct sockbuf *sb, asb; + struct protosw *pr; + int s; + sb = &so->so_rcv; + pr = so->so_proto; sb->sb_flags |= SB_NOINTR; (void) sblock(sb, M_WAITOK); s = splimp(); @@ -898,14 +876,13 @@ sorflush(so) } int -sosetopt(so, level, optname, m0) - register struct socket *so; - int level, optname; - struct mbuf *m0; +sosetopt(struct socket *so, int level, int optname, struct mbuf *m0) { - int error = 0; - register struct mbuf *m = m0; + int error; + struct mbuf *m; + error = 0; + m = m0; if (level != SOL_SOCKET) { if (so->so_proto && so->so_proto->pr_ctloutput) return ((*so->so_proto->pr_ctloutput) @@ -1032,19 +1009,16 @@ sosetopt(so, level, optname, m0) m = NULL; /* freed by protocol */ } } -bad: + bad: if (m) (void) m_free(m); return (error); } int -sogetopt(so, level, optname, mp) - register struct socket *so; - int level, optname; - struct mbuf **mp; +sogetopt(struct socket *so, int level, int optname, struct mbuf **mp) { - register struct mbuf *m; + struct mbuf *m; if (level != SOL_SOCKET) { if (so->so_proto && so->so_proto->pr_ctloutput) { @@ -1125,8 +1099,7 @@ sogetopt(so, level, optname, mp) } void -sohasoutofband(so) - register struct socket *so; +sohasoutofband(struct socket *so) { struct proc *p;