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.6.2.2 retrieving revision 1.20 diff -u -p -r1.6.2.2 -r1.20 --- src/sys/kern/uipc_socket.c 1993/11/06 00:07:55 1.6.2.2 +++ src/sys/kern/uipc_socket.c 1995/08/12 23:59:11 1.20 @@ -1,6 +1,8 @@ +/* $NetBSD: uipc_socket.c,v 1.20 1995/08/12 23:59:11 mycroft Exp $ */ + /* - * Copyright (c) 1982, 1986, 1988, 1990 Regents of the University of California. - * All rights reserved. + * Copyright (c) 1982, 1986, 1988, 1990, 1993 + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)uipc_socket.c 7.28 (Berkeley) 5/4/91 - * $Id: uipc_socket.c,v 1.6.2.2 1993/11/06 00:07:55 mycroft Exp $ + * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 */ #include @@ -42,14 +43,11 @@ #include #include #include -#include #include #include #include #include -#include - /* * Socket operation routines. * These routines are called by the routines in @@ -60,6 +58,7 @@ /*ARGSUSED*/ int socreate(dom, aso, type, proto) + int dom; struct socket **aso; register int type; int proto; @@ -73,7 +72,7 @@ socreate(dom, aso, type, proto) prp = pffindproto(dom, proto, type); else prp = pffindtype(dom, type); - if (!prp || !prp->pr_usrreq) + if (prp == 0 || prp->pr_usrreq == 0) return (EPROTONOSUPPORT); if (prp->pr_type != type) return (EPROTOTYPE); @@ -84,13 +83,20 @@ socreate(dom, aso, type, proto) so->so_state = SS_PRIV; so->so_proto = prp; error = - (*prp->pr_usrreq)(so, PRU_ATTACH, - (struct mbuf *)0, (struct mbuf *)proto, (struct mbuf *)0); + (*prp->pr_usrreq)(so, PRU_ATTACH, (struct mbuf *)0, + (struct mbuf *)(long)proto, (struct mbuf *)0); if (error) { so->so_state |= SS_NOFDREF; sofree(so); return (error); } +#ifdef COMPAT_SUNOS + { + extern struct emul emul_sunos; + if (p->p_emul == &emul_sunos && type == SOCK_DGRAM) + so->so_options |= SO_BROADCAST; + } +#endif *aso = so; return (0); } @@ -100,7 +106,7 @@ sobind(so, nam) struct socket *so; struct mbuf *nam; { - int s = splnet(); + int s = splsoftnet(); int error; error = @@ -115,7 +121,7 @@ solisten(so, backlog) register struct socket *so; int backlog; { - int s = splnet(), error; + int s = splsoftnet(), error; error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, @@ -159,7 +165,7 @@ int soclose(so) register struct socket *so; { - int s = splnet(); /* conservative */ + int s = splsoftnet(); /* conservative */ int error = 0; if (so->so_options & SO_ACCEPTCONN) { @@ -204,7 +210,7 @@ discard: } /* - * Must be called at splnet... + * Must be called at splsoftnet... */ int soabort(so) @@ -221,7 +227,7 @@ soaccept(so, nam) register struct socket *so; struct mbuf *nam; { - int s = splnet(); + int s = splsoftnet(); int error; if ((so->so_state & SS_NOFDREF) == 0) @@ -243,7 +249,7 @@ soconnect(so, nam) if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); - s = splnet(); + s = splsoftnet(); /* * If protocol is connection-based, can only connect once. * Otherwise, if connected, try to disconnect first. @@ -266,7 +272,7 @@ soconnect2(so1, so2) register struct socket *so1; struct socket *so2; { - int s = splnet(); + int s = splsoftnet(); int error; error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2, @@ -279,7 +285,7 @@ int sodisconnect(so) register struct socket *so; { - int s = splnet(); + int s = splsoftnet(); int error; if ((so->so_state & SS_ISCONNECTED) == 0) { @@ -297,6 +303,7 @@ bad: return (error); } +#define SBLOCKWAIT(f) (((f) & MSG_DONTWAIT) ? M_NOWAIT : M_WAITOK) /* * Send on a socket. * If send must go all at once and message is larger than @@ -352,10 +359,10 @@ sosend(so, addr, uio, top, control, flag #define snderr(errno) { error = errno; splx(s); goto release; } restart: - if (error = sblock(&so->so_snd)) + if (error = sblock(&so->so_snd, SBLOCKWAIT(flags))) goto out; do { - s = splnet(); + s = splsoftnet(); if (so->so_state & SS_CANTSENDMORE) snderr(EPIPE); if (so->so_error) @@ -371,11 +378,11 @@ restart: space = sbspace(&so->so_snd); if (flags & MSG_OOB) space += 1024; - if (space < resid + clen && + if (atomic && resid > so->so_snd.sb_hiwat || + clen > so->so_snd.sb_hiwat) + snderr(EMSGSIZE); + if (space < resid + clen && uio && (atomic || space < so->so_snd.sb_lowat || space < clen)) { - if (atomic && resid > so->so_snd.sb_hiwat || - clen > so->so_snd.sb_hiwat) - snderr(EMSGSIZE); if (so->so_state & SS_NBIO) snderr(EWOULDBLOCK); sbunlock(&so->so_snd); @@ -406,15 +413,25 @@ restart: MGET(m, M_WAIT, MT_DATA); mlen = MLEN; } - if (resid >= MINCLSIZE) { + if (resid >= MINCLSIZE && space >= MCLBYTES) { MCLGET(m, M_WAIT); if ((m->m_flags & M_EXT) == 0) goto nopages; mlen = MCLBYTES; - len = min(min(mlen, resid), space); +#ifdef MAPPED_MBUFS + len = min(MCLBYTES, resid); +#else + if (atomic && top == 0) { + len = min(MCLBYTES - max_hdr, resid); + m->m_data += max_hdr; + } else + len = min(MCLBYTES, resid); +#endif + space -= MCLBYTES; } else { nopages: len = min(min(mlen, resid), space); + space -= len; /* * For datagram protocols, leave room * for protocol headers in first mbuf. @@ -422,7 +439,6 @@ nopages: if (atomic && top == 0 && len < mlen) MH_ALIGN(m, len); } - space -= len; error = uiomove(mtod(m, caddr_t), (int)len, uio); resid = uio->uio_resid; m->m_len = len; @@ -439,7 +455,7 @@ nopages: } while (space > 0 && atomic); if (dontroute) so->so_options |= SO_DONTROUTE; - s = splnet(); /* XXX */ + s = splsoftnet(); /* XXX */ error = (*so->so_proto->pr_usrreq)(so, (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, top, addr, control); @@ -490,7 +506,6 @@ soreceive(so, paddr, uio, mp0, controlp, struct mbuf **controlp; int *flagsp; { - struct proc *p = curproc; /* XXX */ register struct mbuf *m, **mp; register int flags, len, error, s, offset; struct protosw *pr = so->so_proto; @@ -509,8 +524,8 @@ soreceive(so, paddr, uio, mp0, controlp, flags = 0; if (flags & MSG_OOB) { m = m_get(M_WAIT, MT_DATA); - error = (*pr->pr_usrreq)(so, PRU_RCVOOB, - m, (struct mbuf *)(flags & MSG_PEEK), (struct mbuf *)0); + error = (*pr->pr_usrreq)(so, PRU_RCVOOB, m, + (struct mbuf *)(long)(flags & MSG_PEEK), (struct mbuf *)0); if (error) goto bad; do { @@ -530,22 +545,24 @@ bad: (struct mbuf *)0, (struct mbuf *)0); restart: - if (error = sblock(&so->so_rcv)) + if (error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) return (error); - s = splnet(); + s = splsoftnet(); m = so->so_rcv.sb_mb; /* * If we have less data than requested, block awaiting more * (subject to any timeout) if: - * 1. the current count is less than the low water mark, or + * 1. the current count is less than the low water mark, * 2. MSG_WAITALL is set, and it is possible to do the entire - * receive operation at once if we block (resid <= hiwat). + * receive operation at once if we block (resid <= hiwat), or + * 3. MSG_DONTWAIT is not set. * If MSG_WAITALL is set but resid is larger than the receive buffer, * we have to do the receive in sections, and thus risk returning * a short count if a timeout or signal occurs after we start. */ - while (m == 0 || so->so_rcv.sb_cc < uio->uio_resid && + if (m == 0 || ((flags & MSG_DONTWAIT) == 0 && + so->so_rcv.sb_cc < uio->uio_resid) && (so->so_rcv.sb_cc < so->so_rcv.sb_lowat || ((flags & MSG_WAITALL) && uio->uio_resid <= so->so_rcv.sb_hiwat)) && m->m_nextpkt == 0 && (pr->pr_flags & PR_ATOMIC) == 0) { @@ -555,7 +572,7 @@ restart: #endif if (so->so_error) { if (m) - break; + goto dontblock; error = so->so_error; if ((flags & MSG_PEEK) == 0) so->so_error = 0; @@ -563,7 +580,7 @@ restart: } if (so->so_state & SS_CANTRCVMORE) { if (m) - break; + goto dontblock; else goto release; } @@ -579,7 +596,7 @@ restart: } if (uio->uio_resid == 0) goto release; - if (so->so_state & SS_NBIO) { + if ((so->so_state & SS_NBIO) || (flags & MSG_DONTWAIT)) { error = EWOULDBLOCK; goto release; } @@ -591,7 +608,10 @@ restart: goto restart; } dontblock: - p->p_stats->p_ru.ru_msgrcv++; +#ifdef notyet /* XXXX */ + if (uio->uio_procp) + uio->uio_procp->p_stats->p_ru.ru_msgrcv++; +#endif nextrecord = m->m_nextpkt; if (pr->pr_flags & PR_ADDR) { #ifdef DIAGNOSTIC @@ -678,7 +698,7 @@ dontblock: if (mp == 0) { splx(s); error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); - s = splnet(); + s = splsoftnet(); } else uio->uio_resid -= len; if (len == m->m_len - moff) { @@ -760,7 +780,7 @@ dontblock: so->so_rcv.sb_mb = nextrecord; if (pr->pr_flags & PR_WANTRCVD && so->so_pcb) (*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0, - (struct mbuf *)flags, (struct mbuf *)0, + (struct mbuf *)(long)flags, (struct mbuf *)0, (struct mbuf *)0); } if (orig_resid == uio->uio_resid && orig_resid && @@ -778,6 +798,7 @@ release: return (error); } +int soshutdown(so, how) register struct socket *so; register int how; @@ -793,6 +814,7 @@ soshutdown(so, how) return (0); } +void sorflush(so) register struct socket *so; { @@ -802,7 +824,7 @@ sorflush(so) struct sockbuf asb; sb->sb_flags |= SB_NOINTR; - (void) sblock(sb); + (void) sblock(sb, M_WAITOK); s = splimp(); socantrcvmore(so); sbunlock(sb); @@ -814,6 +836,7 @@ sorflush(so) sbrelease(&asb); } +int sosetopt(so, level, optname, m0) register struct socket *so; int level, optname; @@ -844,6 +867,7 @@ sosetopt(so, level, optname, m0) case SO_USELOOPBACK: case SO_BROADCAST: case SO_REUSEADDR: + case SO_REUSEPORT: case SO_OOBINLINE: if (m == NULL || m->m_len < sizeof (int)) { error = EINVAL; @@ -895,7 +919,7 @@ sosetopt(so, level, optname, m0) goto bad; } tv = mtod(m, struct timeval *); - if (tv->tv_sec > SHRT_MAX / hz - hz) { + if (tv->tv_sec * hz + tv->tv_usec / tick > SHRT_MAX) { error = EDOM; goto bad; } @@ -917,6 +941,11 @@ sosetopt(so, level, optname, m0) error = ENOPROTOOPT; break; } + if (error == 0 && so->so_proto && so->so_proto->pr_ctloutput) { + (void) ((*so->so_proto->pr_ctloutput) + (PRCO_SETOPT, so, level, optname, &m0)); + m = NULL; /* freed by protocol */ + } } bad: if (m) @@ -924,6 +953,7 @@ bad: return (error); } +int sogetopt(so, level, optname, mp) register struct socket *so; int level, optname; @@ -955,6 +985,7 @@ sogetopt(so, level, optname, mp) case SO_DEBUG: case SO_KEEPALIVE: case SO_REUSEADDR: + case SO_REUSEPORT: case SO_BROADCAST: case SO_OOBINLINE: *mtod(m, int *) = so->so_options & optname; @@ -1007,6 +1038,7 @@ sogetopt(so, level, optname, mp) } } +void sohasoutofband(so) register struct socket *so; {