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.23 retrieving revision 1.40 diff -u -p -r1.23 -r1.40 --- src/sys/kern/uipc_socket.c 1996/05/22 19:00:52 1.23 +++ src/sys/kern/uipc_socket.c 1998/12/16 00:26:10 1.40 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.23 1996/05/22 19:00:52 mycroft Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.40 1998/12/16 00:26:10 thorpej Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 @@ -32,9 +32,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 + * @(#)uipc_socket.c 8.6 (Berkeley) 5/2/95 */ +#include "opt_compat_sunos.h" + #include #include #include @@ -48,6 +50,17 @@ #include #include #include +#include + +struct pool socket_pool; + +void +soinit() +{ + + pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, + "sockpl", 0, NULL, NULL, M_SOCKET); +} /* * Socket operation routines. @@ -68,6 +81,7 @@ socreate(dom, aso, type, proto) register struct protosw *prp; register struct socket *so; register int error; + int s; if (proto) prp = pffindproto(dom, proto, type); @@ -77,15 +91,21 @@ socreate(dom, aso, type, proto) return (EPROTONOSUPPORT); if (prp->pr_type != type) return (EPROTOTYPE); - MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT); - bzero((caddr_t)so, sizeof(*so)); + s = splsoftnet(); + so = pool_get(&socket_pool, PR_WAITOK); + memset((caddr_t)so, 0, sizeof(*so)); + TAILQ_INIT(&so->so_q0); + TAILQ_INIT(&so->so_q); so->so_type = type; so->so_proto = prp; + so->so_send = sosend; + so->so_receive = soreceive; error = (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0, (struct mbuf *)(long)proto, (struct mbuf *)0, p); if (error) { so->so_state |= SS_NOFDREF; sofree(so); + splx(s); return (error); } #ifdef COMPAT_SUNOS @@ -95,6 +115,7 @@ socreate(dom, aso, type, proto) so->so_options |= SO_BROADCAST; } #endif + splx(s); *aso = so; return (0); } @@ -127,7 +148,7 @@ solisten(so, backlog) splx(s); return (error); } - if (so->so_q == 0) + if (so->so_q.tqh_first == NULL) so->so_options |= SO_ACCEPTCONN; if (backlog < 0) backlog = 0; @@ -150,7 +171,7 @@ sofree(so) } sbrelease(&so->so_snd); sorflush(so); - FREE(so, M_SOCKET); + pool_put(&socket_pool, so); } /* @@ -166,10 +187,10 @@ soclose(so) int error = 0; if (so->so_options & SO_ACCEPTCONN) { - while (so->so_q0) - (void) soabort(so->so_q0); - while (so->so_q) - (void) soabort(so->so_q); + while (so->so_q0.tqh_first) + (void) soabort(so->so_q0.tqh_first); + while (so->so_q.tqh_first) + (void) soabort(so->so_q.tqh_first); } if (so->so_pcb == 0) goto discard; @@ -186,7 +207,7 @@ soclose(so) while (so->so_state & SS_ISCONNECTED) { error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH, netcls, - so->so_linger); + so->so_linger * hz); if (error) break; } @@ -350,8 +371,10 @@ sosend(so, addr, uio, top, control, flag * of space and resid. On the other hand, a negative resid * causes us to loop sending 0-length segments to the protocol. */ - if (resid < 0) - return (EINVAL); + if (resid < 0) { + error = EINVAL; + goto out; + } dontroute = (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 && (so->so_proto->pr_flags & PR_ATOMIC); @@ -429,7 +452,7 @@ restart: } else len = min(MCLBYTES, resid); #endif - space -= MCLBYTES; + space -= len; } else { nopages: len = min(min(mlen, resid), space); @@ -457,13 +480,17 @@ nopages: } while (space > 0 && atomic); if (dontroute) so->so_options |= SO_DONTROUTE; + if (resid > 0) + so->so_state |= SS_MORETOCOME; s = splsoftnet(); /* XXX */ error = (*so->so_proto->pr_usrreq)(so, - (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, - top, addr, control, (struct proc *)0); + (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, + top, addr, control, p); splx(s); if (dontroute) so->so_options &= ~SO_DONTROUTE; + if (resid > 0) + so->so_state &= ~SS_MORETOCOME; clen = 0; control = 0; top = 0; @@ -803,15 +830,17 @@ release: int soshutdown(so, how) - register struct socket *so; - register int how; + struct socket *so; + int how; { - register struct protosw *pr = so->so_proto; + struct protosw *pr = so->so_proto; + + if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) + return (EINVAL); - how++; - if (how & FREAD) + if (how == SHUT_RD || how == SHUT_RDWR) sorflush(so); - if (how & FWRITE) + if (how == SHUT_WR || how == SHUT_RDWR) return (*pr->pr_usrreq)(so, PRU_SHUTDOWN, (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0, (struct proc *)0); return (0); @@ -832,7 +861,7 @@ sorflush(so) socantrcvmore(so); sbunlock(sb); asb = *sb; - bzero((caddr_t)sb, sizeof (*sb)); + memset((caddr_t)sb, 0, sizeof(*sb)); splx(s); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); @@ -857,7 +886,7 @@ sosetopt(so, level, optname, m0) switch (optname) { case SO_LINGER: - if (m == NULL || m->m_len != sizeof (struct linger)) { + if (m == NULL || m->m_len != sizeof(struct linger)) { error = EINVAL; goto bad; } @@ -872,7 +901,8 @@ sosetopt(so, level, optname, m0) case SO_REUSEADDR: case SO_REUSEPORT: case SO_OOBINLINE: - if (m == NULL || m->m_len < sizeof (int)) { + case SO_TIMESTAMP: + if (m == NULL || m->m_len < sizeof(int)) { error = EINVAL; goto bad; } @@ -886,30 +916,53 @@ sosetopt(so, level, optname, m0) case SO_RCVBUF: case SO_SNDLOWAT: case SO_RCVLOWAT: - if (m == NULL || m->m_len < sizeof (int)) { + { + int optval; + + if (m == NULL || m->m_len < sizeof(int)) { + error = EINVAL; + goto bad; + } + + /* + * Values < 1 make no sense for any of these + * options, so disallow them. + */ + optval = *mtod(m, int *); + if (optval < 1) { error = EINVAL; goto bad; } + switch (optname) { case SO_SNDBUF: case SO_RCVBUF: if (sbreserve(optname == SO_SNDBUF ? &so->so_snd : &so->so_rcv, - (u_long) *mtod(m, int *)) == 0) { + (u_long) optval) == 0) { error = ENOBUFS; goto bad; } break; + /* + * Make sure the low-water is never greater than + * the high-water. + */ case SO_SNDLOWAT: - so->so_snd.sb_lowat = *mtod(m, int *); + so->so_snd.sb_lowat = + (optval > so->so_snd.sb_hiwat) ? + so->so_snd.sb_hiwat : optval; break; case SO_RCVLOWAT: - so->so_rcv.sb_lowat = *mtod(m, int *); + so->so_rcv.sb_lowat = + (optval > so->so_rcv.sb_hiwat) ? + so->so_rcv.sb_hiwat : optval; break; } break; + } case SO_SNDTIMEO: case SO_RCVTIMEO: @@ -917,7 +970,7 @@ sosetopt(so, level, optname, m0) struct timeval *tv; short val; - if (m == NULL || m->m_len < sizeof (*tv)) { + if (m == NULL || m->m_len < sizeof(*tv)) { error = EINVAL; goto bad; } @@ -972,12 +1025,12 @@ sogetopt(so, level, optname, mp) return (ENOPROTOOPT); } else { m = m_get(M_WAIT, MT_SOOPTS); - m->m_len = sizeof (int); + m->m_len = sizeof(int); switch (optname) { case SO_LINGER: - m->m_len = sizeof (struct linger); + m->m_len = sizeof(struct linger); mtod(m, struct linger *)->l_onoff = so->so_options & SO_LINGER; mtod(m, struct linger *)->l_linger = so->so_linger; @@ -991,6 +1044,7 @@ sogetopt(so, level, optname, mp) case SO_REUSEPORT: case SO_BROADCAST: case SO_OOBINLINE: + case SO_TIMESTAMP: *mtod(m, int *) = so->so_options & optname; break; @@ -1028,7 +1082,7 @@ sogetopt(so, level, optname, mp) m->m_len = sizeof(struct timeval); mtod(m, struct timeval *)->tv_sec = val / hz; mtod(m, struct timeval *)->tv_usec = - (val % hz) / tick; + (val % hz) * tick; break; }