X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/093384576e476238be9960b59fa8cb3ad14d3621..15d436e0ed8d8c3d1d6dae157d8d010bbc94f48e:/usr/src/sys/kern/uipc_socket.c

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 1ad745caae..645dd3be07 100644
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -1,24 +1,32 @@
-/*	uipc_socket.c	6.5	84/08/21	*/
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/file.h"
-#include "../h/inode.h"
-#include "../h/buf.h"
-#include "../h/mbuf.h"
-#include "../h/un.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/stat.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
-#include "../net/route.h"
-#include "../netinet/in.h"
-#include "../net/if.h"
+/*
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *	@(#)uipc_socket.c	7.14 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "user.h"
+#include "proc.h"
+#include "file.h"
+#include "malloc.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
 
 /*
  * Socket operation routines.
@@ -28,10 +36,8 @@
  * switching out to the protocol specific routines.
  *
  * TODO:
- *	sostat
  *	test socketpair
- *	PR_RIGHTS
- *	clean up select, async
+ *	clean up async
  *	out-of-band is a kludge
  */
 /*ARGSUSED*/
@@ -42,30 +48,25 @@ socreate(dom, aso, type, proto)
 {
 	register struct protosw *prp;
 	register struct socket *so;
-	register struct mbuf *m;
 	register int error;
 
 	if (proto)
-		prp = pffindproto(dom, proto);
+		prp = pffindproto(dom, proto, type);
 	else
 		prp = pffindtype(dom, type);
 	if (prp == 0)
 		return (EPROTONOSUPPORT);
 	if (prp->pr_type != type)
 		return (EPROTOTYPE);
-	m = m_getclr(M_WAIT, MT_SOCKET);
-	if (m == 0)
-		return (ENOBUFS);
-	so = mtod(m, struct socket *);
-	so->so_options = 0;
-	so->so_state = 0;
+	MALLOC(so, struct socket *, sizeof(*so), M_SOCKET, M_WAIT);
+	bzero((caddr_t)so, sizeof(*so));
 	so->so_type = type;
 	if (u.u_uid == 0)
 		so->so_state = SS_PRIV;
 	so->so_proto = prp;
 	error =
 	    (*prp->pr_usrreq)(so, PRU_ATTACH,
-		(struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
+		(struct mbuf *)0, (struct mbuf *)proto, (struct mbuf *)0);
 	if (error) {
 		so->so_state |= SS_NOFDREF;
 		sofree(so);
@@ -109,7 +110,7 @@ solisten(so, backlog)
 	}
 	if (backlog < 0)
 		backlog = 0;
-	so->so_qlimit = MIN(backlog, SOMAXCONN);
+	so->so_qlimit = min(backlog, SOMAXCONN);
 	splx(s);
 	return (0);
 }
@@ -118,16 +119,16 @@ sofree(so)
 	register struct socket *so;
 {
 
+	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
+		return;
 	if (so->so_head) {
 		if (!soqremque(so, 0) && !soqremque(so, 1))
 			panic("sofree dq");
 		so->so_head = 0;
 	}
-	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0)
-		return;
 	sbrelease(&so->so_snd);
 	sorflush(so);
-	(void) m_free(dtom(so));
+	FREE(so, M_SOCKET);
 }
 
 /*
@@ -139,7 +140,7 @@ soclose(so)
 	register struct socket *so;
 {
 	int s = splnet();		/* conservative */
-	int error;
+	int error = 0;
 
 	if (so->so_options & SO_ACCEPTCONN) {
 		while (so->so_q0 != so)
@@ -151,7 +152,7 @@ soclose(so)
 		goto discard;
 	if (so->so_state & SS_ISCONNECTED) {
 		if ((so->so_state & SS_ISDISCONNECTING) == 0) {
-			error = sodisconnect(so, (struct mbuf *)0);
+			error = sodisconnect(so);
 			if (error)
 				goto drop;
 		}
@@ -212,16 +213,25 @@ soconnect(so, nam)
 	register struct socket *so;
 	struct mbuf *nam;
 {
-	int s = splnet();
+	int s;
 	int error;
 
-	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING)) {
+	if (so->so_options & SO_ACCEPTCONN)
+		return (EOPNOTSUPP);
+	s = splnet();
+	/*
+	 * If protocol is connection-based, can only connect once.
+	 * Otherwise, if connected, try to disconnect first.
+	 * This allows user to disconnect by connecting to, e.g.,
+	 * a null address.
+	 */
+	if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) &&
+	    ((so->so_proto->pr_flags & PR_CONNREQUIRED) ||
+	    (error = sodisconnect(so))))
 		error = EISCONN;
-		goto bad;
-	}
-	error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
-	    (struct mbuf *)0, nam, (struct mbuf *)0);
-bad:
+	else
+		error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT,
+		    (struct mbuf *)0, nam, (struct mbuf *)0);
 	splx(s);
 	return (error);
 }
@@ -239,9 +249,8 @@ soconnect2(so1, so2)
 	return (error);
 }
 
-sodisconnect(so, nam)
+sodisconnect(so)
 	register struct socket *so;
-	struct mbuf *nam;
 {
 	int s = splnet();
 	int error;
@@ -255,7 +264,7 @@ sodisconnect(so, nam)
 		goto bad;
 	}
 	error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT,
-	    (struct mbuf *)0, nam, (struct mbuf *)0);
+	    (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
 bad:
 	splx(s);
 	return (error);
@@ -270,54 +279,58 @@ bad:
  * inform user that this would block and do nothing.
  * Otherwise, if nonblocking, send as much as possible.
  */
-sosend(so, nam, uio, flags, rights)
+sosend(so, nam, uio, flags, rights, control)
 	register struct socket *so;
 	struct mbuf *nam;
 	register struct uio *uio;
 	int flags;
-	struct mbuf *rights;
+	struct mbuf *rights, *control;
 {
-	struct mbuf *top = 0;
-	register struct mbuf *m, **mp;
-	register int space;
-	int len, error = 0, s, dontroute, first = 1;
+	struct mbuf *top = 0, **mp;
+	register struct mbuf *m;
+	register int space, len;
+	int rlen = 0, error = 0, s, dontroute, first = 1, mlen;
+	int atomic = sosendallatonce(so);
 
-	if (sosendallatonce(so) && uio->uio_resid > so->so_snd.sb_hiwat)
+	if (atomic && uio->uio_resid > so->so_snd.sb_hiwat)
 		return (EMSGSIZE);
 	dontroute =
 	    (flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
 	    (so->so_proto->pr_flags & PR_ATOMIC);
 	u.u_ru.ru_msgsnd++;
+	if (rights)
+		rlen = rights->m_len;
 #define	snderr(errno)	{ error = errno; splx(s); goto release; }
 
 restart:
 	sblock(&so->so_snd);
 	do {
 		s = splnet();
-		if (so->so_state & SS_CANTSENDMORE) {
-			psignal(u.u_procp, SIGPIPE);
+		if (so->so_state & SS_CANTSENDMORE)
 			snderr(EPIPE);
-		}
-		if (so->so_error) {
-			error = so->so_error;
-			so->so_error = 0;			/* ??? */
-			splx(s);
-			goto release;
-		}
+		if (so->so_error)
+			snderr(so->so_error);
 		if ((so->so_state & SS_ISCONNECTED) == 0) {
-			if (so->so_proto->pr_flags & PR_CONNREQUIRED)
-				snderr(ENOTCONN);
-			if (nam == 0)
+			if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
+				if (!uio->uio_resid && !rights && control) {
+					snderr((*so->so_proto->pr_usrreq)(so,
+				    (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
+					    top, (caddr_t)0, rights, control));
+				} else if (so->so_state & SS_ISCONFIRMING)
+					/* is ok */;
+				else
+					snderr(ENOTCONN);
+			} else if (nam == 0)
 				snderr(EDESTADDRREQ);
 		}
 		if (flags & MSG_OOB)
 			space = 1024;
 		else {
 			space = sbspace(&so->so_snd);
-			if (space <= 0 ||
-			   (sosendallatonce(so) && space < uio->uio_resid) ||
-			   (uio->uio_resid >= CLBYTES && space < CLBYTES &&
-			   so->so_snd.sb_cc >= CLBYTES &&
+			if (space <= rlen ||
+			   (atomic && space < uio->uio_resid + rlen) ||
+			   (uio->uio_resid >= MCLBYTES && space < MCLBYTES &&
+			   so->so_snd.sb_cc >= MCLBYTES &&
 			   (so->so_state & SS_NBIO) == 0)) {
 				if (so->so_state & SS_NBIO) {
 					if (first)
@@ -333,94 +346,130 @@ restart:
 		}
 		splx(s);
 		mp = &top;
-		while (uio->uio_resid > 0 && space > 0) {
-			register struct iovec *iov = uio->uio_iov;
-
-			if (iov->iov_len == 0) {
-				uio->uio_iov++;
-				uio->uio_iovcnt--;
-				if (uio->uio_iovcnt < 0)
-					panic("sosend");
-				continue;
-			}
-			MGET(m, M_WAIT, MT_DATA);
-			if (m == NULL) {
-				error = ENOBUFS;		/* SIGPIPE? */
-				goto release;
+		space -= rlen;
+		do {
+		   do {
+			if (top == 0) {
+				MGETHDR(m, M_WAIT, MT_DATA);
+				mlen = MHLEN;
+				m->m_pkthdr.len = 0;
+				m->m_pkthdr.rcvif = (struct ifnet *)0;
+			} else {
+				MGET(m, M_WAIT, MT_DATA);
+				mlen = MLEN;
 			}
-			if (iov->iov_len >= CLBYTES && space >= CLBYTES) {
-				register struct mbuf *p;
-				MCLGET(p, 1);
-				if (p == 0)
+			if (uio->uio_resid >= MINCLSIZE && space >= MCLBYTES) {
+				MCLGET(m, M_WAIT);
+				if ((m->m_flags & M_EXT) == 0)
 					goto nopages;
-				m->m_off = (int)p - (int)m;
-				len = CLBYTES;
+				mlen = MCLBYTES;
+#ifdef	MAPPED_MBUFS
+				len = min(MCLBYTES, uio->uio_resid);
+				if (len < mlen - max_hdr)
+					m->m_data += max_hdr;
+#else
+				len = min(MCLBYTES - max_hdr, uio->uio_resid);
+				m->m_data += max_hdr;
+#endif
+				space -= MCLBYTES;
 			} else {
 nopages:
-				len = MIN(MLEN, iov->iov_len);
+				len = min(min(mlen, uio->uio_resid), space);
+				space -= len;
+				/*
+				 * For datagram protocols, leave room
+				 * for protocol headers in first mbuf.
+				 */
+				if (atomic && top == 0 && len < mlen)
+					MH_ALIGN(m, len);
 			}
-			error = uiomove(mtod(m, caddr_t), len, UIO_WRITE, uio);
+			error = uiomove(mtod(m, caddr_t), len, uio);
 			m->m_len = len;
 			*mp = m;
+			top->m_pkthdr.len += len;
 			if (error)
 				goto release;
 			mp = &m->m_next;
-			space -= len;
-		}
-		if (top) {
-			if (dontroute)
-				so->so_options |= SO_DONTROUTE;
-			s = splnet();
-			error = (*so->so_proto->pr_usrreq)(so,
-			    (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
-			    top, (caddr_t)nam, rights);
-			splx(s);
-			if (dontroute)
-				so->so_options &= ~SO_DONTROUTE;
-		}
-		top = 0;
-		first = 0;
-		if (error)
-			break;
+			if (uio->uio_resid <= 0) {
+				if ((flags & MSG_EOR) && top)
+					top->m_flags |= M_EOR;
+				break;
+			}
+		    } while (space > 0 && atomic);
+		    if (dontroute)
+			    so->so_options |= SO_DONTROUTE;
+		    s = splnet();				/* XXX */
+		    error = (*so->so_proto->pr_usrreq)(so,
+			(flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
+			top, (caddr_t)nam, rights, control);
+		    splx(s);
+		    if (dontroute)
+			    so->so_options &= ~SO_DONTROUTE;
+		    rights = 0;
+		    rlen = 0;
+		    top = 0;
+		    mp = &top;
+		    first = 0;
+		    if (error)
+			goto release;
+		} while (uio->uio_resid && space > 0);
 	} while (uio->uio_resid);
 
 release:
 	sbunlock(&so->so_snd);
 	if (top)
 		m_freem(top);
+	if (error == EPIPE)
+		psignal(u.u_procp, SIGPIPE);
 	return (error);
 }
 
-soreceive(so, aname, uio, flags, rightsp)
+/*
+ * Implement receive operations on a socket.
+ * We depend on the way that records are added to the sockbuf
+ * by sbappend*.  In particular, each record (mbufs linked through m_next)
+ * must begin with an address if the protocol so specifies,
+ * followed by an optional mbuf containing access rights if supported
+ * by the protocol, and then zero or more mbufs of data.
+ * In order to avoid blocking network interrupts for the entire time here,
+ * we splx() while doing the actual copy to user space.
+ * Although the sockbuf is locked, new data may still be appended,
+ * and thus we must maintain consistency of the sockbuf during that time.
+ */
+soreceive(so, aname, uio, flagsp, rightsp, controlp)
 	register struct socket *so;
 	struct mbuf **aname;
 	register struct uio *uio;
-	int flags;
-	struct mbuf **rightsp;
+	int *flagsp;
+	struct mbuf **rightsp, **controlp;
 {
-	register struct mbuf *m, *n;
-	register int len, error = 0, s, eor, tomark;
+	register struct mbuf *m;
+	register int flags, len, error = 0, s, offset;
 	struct protosw *pr = so->so_proto;
+	struct mbuf *nextrecord;
 	int moff;
 
 	if (rightsp)
 		*rightsp = 0;
 	if (aname)
 		*aname = 0;
+	if (controlp)
+		*controlp = 0;
+	if (flagsp)
+		flags = *flagsp &~ MSG_EOR;
+	else 
+		flags = 0;
 	if (flags & MSG_OOB) {
 		m = m_get(M_WAIT, MT_DATA);
-		if (m == 0)
-			return (ENOBUFS);
 		error = (*pr->pr_usrreq)(so, PRU_RCVOOB,
-		    m, (struct mbuf *)0, (struct mbuf *)0);
+		    m, (struct mbuf *)(flags & MSG_PEEK), (struct mbuf *)0);
 		if (error)
 			goto bad;
 		do {
 			len = uio->uio_resid;
 			if (len > m->m_len)
 				len = m->m_len;
-			error =
-			    uiomove(mtod(m, caddr_t), (int)len, UIO_READ, uio);
+			error = uiomove(mtod(m, caddr_t), (int)len, uio);
 			m = m_free(m);
 		} while (uio->uio_resid && error == 0 && m);
 bad:
@@ -428,152 +477,179 @@ bad:
 			m_freem(m);
 		return (error);
 	}
+	if (so->so_state & SS_ISCONFIRMING && uio->uio_resid)
+		(*pr->pr_usrreq)(so, PRU_RCVD, (struct mbuf *)0,
+		    (struct mbuf *)0, (struct mbuf *)0);
 
 restart:
 	sblock(&so->so_rcv);
 	s = splnet();
 
-#define	rcverr(errno)	{ error = errno; splx(s); goto release; }
-	if (so->so_rcv.sb_cc == 0) {
+	m = so->so_rcv.sb_mb;
+	if (m == 0) {
+		if (so->so_rcv.sb_cc)
+			panic("receive 1");
 		if (so->so_error) {
 			error = so->so_error;
 			so->so_error = 0;
-			splx(s);
 			goto release;
 		}
-		if (so->so_state & SS_CANTRCVMORE) {
-			splx(s);
+		if (so->so_state & SS_CANTRCVMORE)
 			goto release;
-		}
 		if ((so->so_state & SS_ISCONNECTED) == 0 &&
-		    (so->so_proto->pr_flags & PR_CONNREQUIRED))
-			rcverr(ENOTCONN);
-		if (so->so_state & SS_NBIO)
-			rcverr(EWOULDBLOCK);
+		    (so->so_proto->pr_flags & PR_CONNREQUIRED)) {
+			error = ENOTCONN;
+			goto release;
+		}
+		if (uio->uio_resid == 0)
+			goto release;
+		if (so->so_state & SS_NBIO) {
+			error = EWOULDBLOCK;
+			goto release;
+		}
 		sbunlock(&so->so_rcv);
 		sbwait(&so->so_rcv);
 		splx(s);
 		goto restart;
 	}
 	u.u_ru.ru_msgrcv++;
-	m = so->so_rcv.sb_mb;
-	if (m == 0)
-		panic("receive");
+if (m->m_type == 0)
+panic("receive 3a");
+	nextrecord = m->m_nextpkt;
 	if (pr->pr_flags & PR_ADDR) {
-		if ((flags & MSG_PEEK) == 0) {
-			so->so_rcv.sb_cc -= m->m_len;
-			so->so_rcv.sb_mbcnt -= MSIZE;
-		}
-		if (aname) {
-			if (flags & MSG_PEEK) {
+		if (m->m_type != MT_SONAME)
+			panic("receive 1a");
+		if (flags & MSG_PEEK) {
+			if (aname)
 				*aname = m_copy(m, 0, m->m_len);
-				if (*aname == NULL)
-					panic("receive 2");
-			} else
-				*aname = m;
 			m = m->m_next;
-			(*aname)->m_next = 0;
-		} else
-			if (flags & MSG_PEEK)
-				m = m->m_next;
-			else
-				m = m_free(m);
-		if (m == 0)
-			panic("receive 2a");
-		if (rightsp) {
-			if (m->m_len)
+		} else {
+			sbfree(&so->so_rcv, m);
+			if (aname) {
+				*aname = m;
+				so->so_rcv.sb_mb = m->m_next;
+				m->m_next = 0;
+				m = so->so_rcv.sb_mb;
+			} else {
+				MFREE(m, so->so_rcv.sb_mb);
+				m = so->so_rcv.sb_mb;
+			}
+		}
+	}
+	if (m && m->m_type == MT_RIGHTS) {
+		if ((pr->pr_flags & PR_RIGHTS) == 0)
+			panic("receive 2");
+		if (flags & MSG_PEEK) {
+			if (rightsp)
 				*rightsp = m_copy(m, 0, m->m_len);
-			else {
-				*rightsp = m_get(M_DONTWAIT, MT_SONAME);
-				if (*rightsp)
-					(*rightsp)->m_len = 0;
+			m = m->m_next;
+		} else {
+			sbfree(&so->so_rcv, m);
+			if (rightsp) {
+				*rightsp = m;
+				so->so_rcv.sb_mb = m->m_next;
+				m->m_next = 0;
+				m = so->so_rcv.sb_mb;
+			} else {
+				MFREE(m, so->so_rcv.sb_mb);
+				m = so->so_rcv.sb_mb;
 			}
-#ifdef notdef
-			if (*rightsp == NULL)
-				panic("receive 2b");
-#endif
 		}
-		if (flags & MSG_PEEK)
+	}
+	if (m && m->m_type == MT_CONTROL) {
+		if (flags & MSG_PEEK) {
+			if (controlp)
+				*controlp = m_copy(m, 0, m->m_len);
 			m = m->m_next;
-		else {
-			so->so_rcv.sb_cc -= m->m_len;
-			so->so_rcv.sb_mbcnt -= MSIZE;
-			m = m_free(m);
+		} else {
+			sbfree(&so->so_rcv, m);
+			if (controlp) {
+				*controlp = m;
+				so->so_rcv.sb_mb = m->m_next;
+				m->m_next = 0;
+				m = so->so_rcv.sb_mb;
+			} else {
+				MFREE(m, so->so_rcv.sb_mb);
+				m = so->so_rcv.sb_mb;
+			}
 		}
-		if (m == 0)
-			panic("receive 3");
-		if ((flags & MSG_PEEK) == 0)
-			so->so_rcv.sb_mb = m;
 	}
-	eor = 0;
+	if (m)
+		m->m_nextpkt = nextrecord;
 	moff = 0;
-	tomark = so->so_oobmark;
-	do {
-		if (uio->uio_resid <= 0)
-			break;
+	offset = 0;
+	while (m && uio->uio_resid > 0 && error == 0) {
+		if (m->m_type == MT_OOBDATA)
+			flags |= MSG_OOB;
+		else if (m->m_type != MT_DATA && m->m_type != MT_HEADER)
+			panic("receive 3");
+		if (m->m_flags & M_EOR)
+			flags |= MSG_EOR;
 		len = uio->uio_resid;
 		so->so_state &= ~SS_RCVATMARK;
-		if (tomark && len > tomark)
-			len = tomark;
-		if (moff+len > m->m_len - moff)
+		if (so->so_oobmark && len > so->so_oobmark - offset)
+			len = so->so_oobmark - offset;
+		if (len > m->m_len - moff)
 			len = m->m_len - moff;
 		splx(s);
-		error =
-		    uiomove(mtod(m, caddr_t) + moff, (int)len, UIO_READ, uio);
+		error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio);
 		s = splnet();
-		if (len == m->m_len) {
-			eor = (int)m->m_act;
-			if (flags & MSG_PEEK)
+		if (len == m->m_len - moff) {
+			if (flags & MSG_PEEK) {
 				m = m->m_next;
-			else {
+				moff = 0;
+			} else {
+				nextrecord = m->m_nextpkt;
 				sbfree(&so->so_rcv, m);
-				MFREE(m, n);
-				m = n;
-				so->so_rcv.sb_mb = m;
+				MFREE(m, so->so_rcv.sb_mb);
+				m = so->so_rcv.sb_mb;
+				if (m)
+					m->m_nextpkt = nextrecord;
 			}
-			moff = 0;
 		} else {
 			if (flags & MSG_PEEK)
 				moff += len;
 			else {
-				m->m_off += len;
+				m->m_data += len;
 				m->m_len -= len;
 				so->so_rcv.sb_cc -= len;
 			}
 		}
-		if ((flags & MSG_PEEK) == 0 && so->so_oobmark) {
-			so->so_oobmark -= len;
-			if (so->so_oobmark == 0) {
-				so->so_state |= SS_RCVATMARK;
-				break;
-			}
+		if (so->so_oobmark) {
+			if ((flags & MSG_PEEK) == 0) {
+				so->so_oobmark -= len;
+				if (so->so_oobmark == 0) {
+					so->so_state |= SS_RCVATMARK;
+					break;
+				}
+			} else
+				offset += len;
 		}
-		if (tomark) {
-			tomark -= len;
-			if (tomark == 0)
-				break;
+	}
+	if (m && (flags & MSG_EOR)) {
+		flags &= ~MSG_EOR;
+		if ((flags & MSG_PEEK) == 0)
+			m->m_flags |= M_EOR;
+	}
+	if ((flags & MSG_PEEK) == 0) {
+		if (m == 0)
+			so->so_rcv.sb_mb = nextrecord;
+		else if (pr->pr_flags & PR_ATOMIC) {
+			flags |= MSG_TRUNC;
+			(void) sbdroprecord(&so->so_rcv);
 		}
-	} while (m && error == 0 && !eor);
-	if (flags & MSG_PEEK)
-		goto release;
-	if ((so->so_proto->pr_flags & PR_ATOMIC) && eor == 0)
-		do {
-			if (m == 0)
-				panic("receive 4");
-			sbfree(&so->so_rcv, m);
-			eor = (int)m->m_act;
-			so->so_rcv.sb_mb = m->m_next;
-			MFREE(m, n);
-			m = n;
-		} while (eor == 0);
-	if ((so->so_proto->pr_flags & PR_WANTRCVD) && so->so_pcb)
-		(*so->so_proto->pr_usrreq)(so, PRU_RCVD,
-		    (struct mbuf *)0, (struct mbuf *)0, (struct mbuf *)0);
+		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 *)0);
+		if (error == 0 && rightsp && *rightsp &&
+		    pr->pr_domain->dom_externalize)
+			error = (*pr->pr_domain->dom_externalize)(*rightsp);
+	}
+	if (flagsp)
+		*flagsp |= flags;
 release:
 	sbunlock(&so->so_rcv);
-	if (error == 0 && rightsp &&
-	    *rightsp && so->so_proto->pr_family == AF_UNIX)
-		error = unp_externalize(*rightsp);
 	splx(s);
 	return (error);
 }
@@ -608,89 +684,190 @@ sorflush(so)
 	asb = *sb;
 	bzero((caddr_t)sb, sizeof (*sb));
 	splx(s);
-	if (pr->pr_family == AF_UNIX && (pr->pr_flags & PR_RIGHTS))
-		unp_scan(asb.sb_mb, unp_discard);
+	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
+		(*pr->pr_domain->dom_dispose)(asb.sb_mb);
 	sbrelease(&asb);
 }
 
-sosetopt(so, level, optname, m)
+sosetopt(so, level, optname, m0)
 	register struct socket *so;
 	int level, optname;
-	register struct mbuf *m;
+	struct mbuf *m0;
 {
+	int error = 0;
+	register struct mbuf *m = m0;
+
+	if (level != SOL_SOCKET) {
+		if (so->so_proto && so->so_proto->pr_ctloutput)
+			return ((*so->so_proto->pr_ctloutput)
+				  (PRCO_SETOPT, so, level, optname, &m0));
+		error = ENOPROTOOPT;
+	} else {
+		switch (optname) {
+
+		case SO_LINGER:
+			if (m == NULL || m->m_len != sizeof (struct linger)) {
+				error = EINVAL;
+				goto bad;
+			}
+			so->so_linger = mtod(m, struct linger *)->l_linger;
+			/* fall thru... */
+
+		case SO_DEBUG:
+		case SO_KEEPALIVE:
+		case SO_DONTROUTE:
+		case SO_USELOOPBACK:
+		case SO_BROADCAST:
+		case SO_REUSEADDR:
+		case SO_OOBINLINE:
+			if (m == NULL || m->m_len < sizeof (int)) {
+				error = EINVAL;
+				goto bad;
+			}
+			if (*mtod(m, int *))
+				so->so_options |= optname;
+			else
+				so->so_options &= ~optname;
+			break;
 
-	if (level != SOL_SOCKET)
-		return (EINVAL);	/* XXX */
-	switch (optname) {
-
-	case SO_DEBUG:
-	case SO_KEEPALIVE:
-	case SO_DONTROUTE:
-	case SO_USELOOPBACK:
-	case SO_REUSEADDR:
-		so->so_options |= optname;
-		break;
-
-	case SO_LINGER:
-		if (m == NULL || m->m_len != sizeof (int))
-			return (EINVAL);
-		so->so_options |= SO_LINGER;
-		so->so_linger = *mtod(m, int *);
-		break;
-
-	case SO_DONTLINGER:
-		so->so_options &= ~SO_LINGER;
-		so->so_linger = 0;
-		break;
-
-	default:
-		return (EINVAL);
+		case SO_SNDBUF:
+		case SO_RCVBUF:
+		case SO_SNDLOWAT:
+		case SO_RCVLOWAT:
+		case SO_SNDTIMEO:
+		case SO_RCVTIMEO:
+			if (m == NULL || m->m_len < sizeof (int)) {
+				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) {
+					error = ENOBUFS;
+					goto bad;
+				}
+				break;
+
+			case SO_SNDLOWAT:
+				so->so_snd.sb_lowat = *mtod(m, int *);
+				break;
+			case SO_RCVLOWAT:
+				so->so_rcv.sb_lowat = *mtod(m, int *);
+				break;
+			case SO_SNDTIMEO:
+				so->so_snd.sb_timeo = *mtod(m, int *);
+				break;
+			case SO_RCVTIMEO:
+				so->so_rcv.sb_timeo = *mtod(m, int *);
+				break;
+			}
+			break;
+
+		default:
+			error = ENOPROTOOPT;
+			break;
+		}
 	}
-	return (0);
+bad:
+	if (m)
+		(void) m_free(m);
+	return (error);
 }
 
-sogetopt(so, level, optname, m)
+sogetopt(so, level, optname, mp)
 	register struct socket *so;
 	int level, optname;
-	register struct mbuf *m;
+	struct mbuf **mp;
 {
+	register struct mbuf *m;
 
-	if (level != SOL_SOCKET)
-		return (EINVAL);	/* XXX */
-	switch (optname) {
-
-	case SO_USELOOPBACK:
-	case SO_DONTROUTE:
-	case SO_DEBUG:
-	case SO_KEEPALIVE:
-	case SO_LINGER:
-	case SO_REUSEADDR:
-		if ((so->so_options & optname) == 0)
+	if (level != SOL_SOCKET) {
+		if (so->so_proto && so->so_proto->pr_ctloutput) {
+			return ((*so->so_proto->pr_ctloutput)
+				  (PRCO_GETOPT, so, level, optname, mp));
+		} else 
 			return (ENOPROTOOPT);
-		if (optname == SO_LINGER && m != NULL) {
-			*mtod(m, int *) = so->so_linger;
-			m->m_len = sizeof (so->so_linger);
-		}
-		break;
+	} else {
+		m = m_get(M_WAIT, MT_SOOPTS);
+		m->m_len = sizeof (int);
+
+		switch (optname) {
+
+		case SO_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;
+			break;
+
+		case SO_USELOOPBACK:
+		case SO_DONTROUTE:
+		case SO_DEBUG:
+		case SO_KEEPALIVE:
+		case SO_REUSEADDR:
+		case SO_BROADCAST:
+		case SO_OOBINLINE:
+			*mtod(m, int *) = so->so_options & optname;
+			break;
+
+		case SO_TYPE:
+			*mtod(m, int *) = so->so_type;
+			break;
+
+		case SO_ERROR:
+			*mtod(m, int *) = so->so_error;
+			so->so_error = 0;
+			break;
+
+		case SO_SNDBUF:
+			*mtod(m, int *) = so->so_snd.sb_hiwat;
+			break;
+
+		case SO_RCVBUF:
+			*mtod(m, int *) = so->so_rcv.sb_hiwat;
+			break;
 
-	default:
-		return (EINVAL);
+		case SO_SNDLOWAT:
+			*mtod(m, int *) = so->so_snd.sb_lowat;
+			break;
+
+		case SO_RCVLOWAT:
+			*mtod(m, int *) = so->so_rcv.sb_lowat;
+			break;
+
+		case SO_SNDTIMEO:
+			*mtod(m, int *) = so->so_snd.sb_timeo;
+			break;
+
+		case SO_RCVTIMEO:
+			*mtod(m, int *) = so->so_rcv.sb_timeo;
+			break;
+
+		default:
+			(void)m_free(m);
+			return (ENOPROTOOPT);
+		}
+		*mp = m;
+		return (0);
 	}
-	return (0);
 }
 
 sohasoutofband(so)
 	register struct socket *so;
 {
-
-	if (so->so_pgrp == 0)
-		return;
-	if (so->so_pgrp > 0)
-		gsignal(so->so_pgrp, SIGURG);
-	else {
-		struct proc *p = pfind(-so->so_pgrp);
-
-		if (p)
-			psignal(p, SIGURG);
+	struct proc *p;
+
+	if (so->so_pgid < 0)
+		gsignal(-so->so_pgid, SIGURG);
+	else if (so->so_pgid > 0 && (p = pfind(so->so_pgid)) != 0)
+		psignal(p, SIGURG);
+	if (so->so_rcv.sb_sel) {
+		selwakeup(so->so_rcv.sb_sel, so->so_rcv.sb_flags & SB_COLL);
+		so->so_rcv.sb_sel = 0;
+		so->so_rcv.sb_flags &= ~SB_COLL;
 	}
 }