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/sys/socket.h,v
retrieving revision 1.5.4.1
retrieving revision 1.6
diff -u -p -r1.5.4.1 -r1.6
--- src/sys/sys/socket.h	1993/11/10 19:53:14	1.5.4.1
+++ src/sys/sys/socket.h	1994/05/04 10:59:14	1.6
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)socket.h	7.13 (Berkeley) 4/20/91
- *	$Id: socket.h,v 1.5.4.1 1993/11/10 19:53:14 mycroft Exp $
+ *	$Id: socket.h,v 1.6 1994/05/04 10:59:14 mycroft Exp $
  */
 
 #ifndef _SYS_SOCKET_H_
@@ -92,8 +92,7 @@ struct	linger {
  * Address families.
  */
 #define	AF_UNSPEC	0		/* unspecified */
-#define	AF_LOCAL	1		/* local to host (pipes, portals) */
-#define	AF_UNIX		AF_LOCAL
+#define	AF_UNIX		1		/* local to host (pipes, portals) */
 #define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
 #define	AF_IMPLINK	3		/* arpanet imp addresses */
 #define	AF_PUP		4		/* pup protocols: e.g. BSP */
@@ -139,8 +138,7 @@ struct sockproto {
  * Protocol families, same as address families for now.
  */
 #define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		AF_LOCAL
+#define	PF_UNIX		AF_UNIX
 #define	PF_INET		AF_INET
 #define	PF_IMPLINK	AF_IMPLINK
 #define	PF_PUP		AF_PUP
@@ -242,26 +240,52 @@ struct omsghdr {
 
 /* structure prototypes */
 struct socket;
+struct sockbuf;
 struct mbuf;
 
 /* function prototypes */
-int	socreate __P((int dom, struct socket **aso, int type, int proto));
-int	sobind __P((struct socket *so, struct mbuf *nam));
-int	solisten __P((struct socket *so, int backlog));
-int	sofree __P((struct socket *so));
-int	soclose __P((struct socket *so));
+void	sbappend __P((struct sockbuf *sb, struct mbuf *m));
+int	sbappendaddr __P((struct sockbuf *sb, struct sockaddr *asa,
+	    struct mbuf *m0, struct mbuf *control));
+int	sbappendcontrol __P((struct sockbuf *sb, struct mbuf *m0,
+	    struct mbuf *control));
+void	sbappendrecord __P((struct sockbuf *sb, struct mbuf *m0));
+void	sbcheck __P((struct sockbuf *sb));
+void	sbcompress __P((struct sockbuf *sb, struct mbuf *m, struct mbuf *n));
+void	sbdrop __P((struct sockbuf *sb, int len));
+void	sbdroprecord __P((struct sockbuf *sb));
+void	sbflush __P((struct sockbuf *sb));
+void	sbinsertoob __P((struct sockbuf *sb, struct mbuf *m0));
+void	sbrelease __P((struct sockbuf *sb));
+int	sbreserve __P((struct sockbuf *sb, u_long cc));
+int	sbwait __P((struct sockbuf *sb));
+int	sb_lock __P((struct sockbuf *sb));
 int	soabort __P((struct socket *so));
 int	soaccept __P((struct socket *so, struct mbuf *nam));
+int	sobind __P((struct socket *so, struct mbuf *nam));
+void	socantrcvmore __P((struct socket *so));
+void	socantsendmore __P((struct socket *so));
+int	soclose __P((struct socket *so));
 int	soconnect __P((struct socket *so, struct mbuf *nam));
 int	soconnect2 __P((struct socket *so1, struct socket *so2));
+int	socreate __P((int dom, struct socket **aso, int type, int proto));
 int	sodisconnect __P((struct socket *so));
-int	sosend __P((struct socket *so, struct mbuf *addr, struct uio *uio,
-		struct mbuf *top, struct mbuf *control, int flags));
+int	sofree __P((struct socket *so));
+void	soisconnected __P((struct socket *so));
+void	soisconnecting __P((struct socket *so));
+void	soisdisconnected __P((struct socket *so));
+void	soisdisconnecting __P((struct socket *so));
+int	solisten __P((struct socket *so, int backlog));
+struct socket *
+	sonewconn1 __P((struct socket *head, int connstatus));
+void	soqinsque __P((struct socket *head, struct socket *so, int q));
+int	soqremque __P((struct socket *so, int q));
 int	soreceive __P((struct socket *so, struct mbuf **paddr, struct uio *uio,
 		struct mbuf **mp0, struct mbuf **controlp, int *flagsp));
-
-void	socantsendmore __P((struct socket *so));
-void	socantrcvmore __P((struct socket *so));
+int	soreserve __P((struct socket *so, u_long sndcc, u_long rcvcc));
+int	sosend __P((struct socket *so, struct mbuf *addr, struct uio *uio,
+		struct mbuf *top, struct mbuf *control, int flags));
+void	sowakeup __P((struct socket *so, struct sockbuf *sb));
 
 #else	/* !KERNEL */