aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/conf/NOTES7
-rw-r--r--sys/conf/files20
-rw-r--r--sys/fs/fifofs/fifo_vnops.c6
-rw-r--r--sys/fs/portalfs/portal_vnops.c4
-rw-r--r--sys/i386/conf/LINT7
-rw-r--r--sys/i386/conf/NOTES7
-rw-r--r--sys/kern/uipc_socket.c4
-rw-r--r--sys/kern/uipc_syscalls.c12
-rw-r--r--sys/miscfs/fifofs/fifo_vnops.c6
-rw-r--r--sys/miscfs/portal/portal_vnops.c4
-rw-r--r--sys/netipx/spx_debug.c4
-rw-r--r--sys/nfs/nfs_socket.c6
-rw-r--r--sys/nfs/nfs_vfsops.c4
-rw-r--r--sys/nfsclient/nfs_socket.c6
-rw-r--r--sys/nfsclient/nfs_vfsops.c4
-rw-r--r--sys/nfsserver/nfs_srvsock.c6
-rw-r--r--sys/sys/socketvar.h37
17 files changed, 75 insertions, 69 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0d3f6496885f..eb6dc9a5cd05 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.237 1996/02/03 11:48:12 phk Exp $
+# $Id: LINT,v 1.238 1996/02/06 20:57:46 wollman Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -129,7 +129,6 @@ options UCONSOLE
# try to ensure that it actually compiles.
#
options INET #Internet communications protocols
-options NS #Xerox NS communications protocols
options IPX #IPX/SPX communications protocols
options IPXIP #IPX in IP encapsulation (not available)
@@ -146,6 +145,8 @@ options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information
#options LLC #X.25 link layer for Ethernets
#options HDLC #X.25 link layer for serial lines
#options EON #ISO CLNP over IP
+#options NS #Xerox NS protocols
+#options NSIP #XNS over IP
#
# Network interfaces:
@@ -177,8 +178,6 @@ pseudo-device bpfilter 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver(user process ppp)
-options NSIP #XNS over IP
-
#
# Internet family options:
#
diff --git a/sys/conf/files b/sys/conf/files
index f7abd9aa888e..97e4a37fe98a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -270,16 +270,16 @@ netipx/spx_usrreq.c optional ipx
#netiso/tuba_subr.c optional iso tuba
#netiso/tuba_table.c optional iso tuba
#netiso/tuba_usrreq.c optional iso tuba
-netns/idp_usrreq.c optional ns
-netns/ns.c optional ns
-netns/ns_error.c optional ns
-netns/ns_input.c optional ns
-netns/ns_ip.c optional ns
-netns/ns_output.c optional ns
-netns/ns_pcb.c optional ns
-netns/ns_proto.c optional ns
-netns/spp_debug.c optional ns
-netns/spp_usrreq.c optional ns
+#netns/idp_usrreq.c optional ns
+#netns/ns.c optional ns
+#netns/ns_error.c optional ns
+#netns/ns_input.c optional ns
+#netns/ns_ip.c optional ns
+#netns/ns_output.c optional ns
+#netns/ns_pcb.c optional ns
+#netns/ns_proto.c optional ns
+#netns/spp_debug.c optional ns
+#netns/spp_usrreq.c optional ns
nfs/nfs_bio.c optional nfs
nfs/nfs_node.c optional nfs
nfs/nfs_nqlease.c optional nfs
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index a0a34f740d98..e6f1feed14d8 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.14 1995/12/11 10:26:34 phk Exp $
+ * $Id: fifo_vnops.c,v 1.15 1995/12/14 09:53:03 phk Exp $
*/
#include <sys/param.h>
@@ -157,14 +157,14 @@ fifo_open(ap)
if ((fip = vp->v_fifoinfo) == NULL) {
MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
vp->v_fifoinfo = fip;
- error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0, ap->a_p);
if (error) {
free(fip, M_VNODE);
vp->v_fifoinfo = NULL;
return (error);
}
fip->fi_readsock = rso;
- error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0, ap->a_p);
if (error) {
(void)soclose(rso);
free(fip, M_VNODE);
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 816f5fa32a51..27780bf42b2c 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94
*
- * $Id: portal_vnops.c,v 1.9 1995/12/03 14:54:29 bde Exp $
+ * $Id: portal_vnops.c,v 1.10 1995/12/11 09:24:45 phk Exp $
*/
/*
@@ -242,7 +242,7 @@ portal_open(ap)
/*
* Create a new socket.
*/
- error = socreate(AF_UNIX, &so, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &so, SOCK_STREAM, 0, ap->a_p);
if (error)
goto bad;
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 0d3f6496885f..eb6dc9a5cd05 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.237 1996/02/03 11:48:12 phk Exp $
+# $Id: LINT,v 1.238 1996/02/06 20:57:46 wollman Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -129,7 +129,6 @@ options UCONSOLE
# try to ensure that it actually compiles.
#
options INET #Internet communications protocols
-options NS #Xerox NS communications protocols
options IPX #IPX/SPX communications protocols
options IPXIP #IPX in IP encapsulation (not available)
@@ -146,6 +145,8 @@ options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information
#options LLC #X.25 link layer for Ethernets
#options HDLC #X.25 link layer for serial lines
#options EON #ISO CLNP over IP
+#options NS #Xerox NS protocols
+#options NSIP #XNS over IP
#
# Network interfaces:
@@ -177,8 +178,6 @@ pseudo-device bpfilter 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver(user process ppp)
-options NSIP #XNS over IP
-
#
# Internet family options:
#
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0d3f6496885f..eb6dc9a5cd05 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.237 1996/02/03 11:48:12 phk Exp $
+# $Id: LINT,v 1.238 1996/02/06 20:57:46 wollman Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -129,7 +129,6 @@ options UCONSOLE
# try to ensure that it actually compiles.
#
options INET #Internet communications protocols
-options NS #Xerox NS communications protocols
options IPX #IPX/SPX communications protocols
options IPXIP #IPX in IP encapsulation (not available)
@@ -146,6 +145,8 @@ options IPX_ERRPRINTFS=0 #IPX/SPX Console Debugging Information
#options LLC #X.25 link layer for Ethernets
#options HDLC #X.25 link layer for serial lines
#options EON #ISO CLNP over IP
+#options NS #Xerox NS protocols
+#options NSIP #XNS over IP
#
# Network interfaces:
@@ -177,8 +178,6 @@ pseudo-device bpfilter 4 #Berkeley packet filter
pseudo-device disc #Discard device
pseudo-device tun 1 #Tunnel driver(user process ppp)
-options NSIP #XNS over IP
-
#
# Internet family options:
#
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index d05c6a696a34..87c3c59e41e2 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -61,13 +61,13 @@ SYSCTL_INT(_kern, KERN_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, "");
*/
/*ARGSUSED*/
int
-socreate(dom, aso, type, proto)
+socreate(dom, aso, type, proto, p)
int dom;
struct socket **aso;
register int type;
int proto;
+ struct proc *p;
{
- struct proc *p = curproc; /* XXX */
register struct protosw *prp;
register struct socket *so;
register int error;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 0595f90928e3..f994a40f5564 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.12 1996/01/03 21:42:21 wollman Exp $
+ * $Id: uipc_syscalls.c,v 1.13 1996/01/28 23:41:40 dyson Exp $
*/
#include "opt_ktrace.h"
@@ -97,7 +97,7 @@ socket(p, uap, retval)
fp->f_flag = FREAD|FWRITE;
fp->f_type = DTYPE_SOCKET;
fp->f_ops = &socketops;
- error = socreate(uap->domain, &so, uap->type, uap->protocol);
+ error = socreate(uap->domain, &so, uap->type, uap->protocol, p);
if (error) {
fdp->fd_ofiles[fd] = 0;
ffree(fp);
@@ -332,10 +332,10 @@ socketpair(p, uap, retval)
struct socket *so1, *so2;
int fd, error, sv[2];
- error = socreate(uap->domain, &so1, uap->type, uap->protocol);
+ error = socreate(uap->domain, &so1, uap->type, uap->protocol, p);
if (error)
return (error);
- error = socreate(uap->domain, &so2, uap->type, uap->protocol);
+ error = socreate(uap->domain, &so2, uap->type, uap->protocol, p);
if (error)
goto free1;
error = falloc(p, &fp1, &fd);
@@ -1033,10 +1033,10 @@ pipe(p, uap, retval)
struct socket *rso, *wso;
int fd, error;
- error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0, p);
if (error)
return (error);
- error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0, p);
if (error)
goto free1;
error = falloc(p, &rf, &fd);
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index a0a34f740d98..e6f1feed14d8 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.14 1995/12/11 10:26:34 phk Exp $
+ * $Id: fifo_vnops.c,v 1.15 1995/12/14 09:53:03 phk Exp $
*/
#include <sys/param.h>
@@ -157,14 +157,14 @@ fifo_open(ap)
if ((fip = vp->v_fifoinfo) == NULL) {
MALLOC(fip, struct fifoinfo *, sizeof(*fip), M_VNODE, M_WAITOK);
vp->v_fifoinfo = fip;
- error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0, ap->a_p);
if (error) {
free(fip, M_VNODE);
vp->v_fifoinfo = NULL;
return (error);
}
fip->fi_readsock = rso;
- error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0, ap->a_p);
if (error) {
(void)soclose(rso);
free(fip, M_VNODE);
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 816f5fa32a51..27780bf42b2c 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94
*
- * $Id: portal_vnops.c,v 1.9 1995/12/03 14:54:29 bde Exp $
+ * $Id: portal_vnops.c,v 1.10 1995/12/11 09:24:45 phk Exp $
*/
/*
@@ -242,7 +242,7 @@ portal_open(ap)
/*
* Create a new socket.
*/
- error = socreate(AF_UNIX, &so, SOCK_STREAM, 0);
+ error = socreate(AF_UNIX, &so, SOCK_STREAM, 0, ap->a_p);
if (error)
goto bad;
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index ca376a2943c0..524faf9d91e0 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -33,7 +33,7 @@
*
* @(#)spx_debug.c
*
- * $Id: spx_debug.c,v 1.2 1995/10/31 23:36:43 julian Exp $
+ * $Id: spx_debug.c,v 1.3 1995/11/04 09:03:32 julian Exp $
*/
#include <sys/param.h>
@@ -102,7 +102,7 @@ spx_trace(act, ostate, sp, si, req)
printf("%x %s:", sp, tcpstates[ostate]);
else
printf("???????? ");
- printf("%s ", sanames[act]);
+ printf("%s ", spxnames[act]);
switch (act) {
case SA_RESPOND:
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index cbda2778e337..0f9c8c143ebb 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.13 1995/12/17 21:12:25 phk Exp $
+ * $Id: nfs_socket.c,v 1.14 1996/01/13 23:27:52 phk Exp $
*/
/*
@@ -192,14 +192,16 @@ nfs_connect(nmp, rep)
struct sockaddr_in *sin;
struct mbuf *m;
u_short tport;
+ struct proc *p = &proc0; /* only used for socreate */
nmp->nm_so = (struct socket *)0;
saddr = mtod(nmp->nm_nam, struct sockaddr *);
error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
- nmp->nm_soproto);
+ nmp->nm_soproto, p);
if (error)
goto bad;
so = nmp->nm_so;
+ so->so_state &= ~SS_PRIV; /* don't need it */
nmp->nm_soflags = so->so_proto->pr_flags;
/*
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index df4a562b3229..e19c8e61753a 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.25 1995/12/22 15:57:38 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.26 1995/12/28 21:56:49 phk Exp $
*/
#include <sys/param.h>
@@ -343,7 +343,7 @@ nfs_mountroot()
* Do enough of ifconfig(8) so that the critical net interface can
* talk to the server.
*/
- error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0);
+ error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0, p);
if (error)
panic("nfs_mountroot: socreate(%04x): %d",
nd->myif.ifra_addr.sa_family, error);
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index cbda2778e337..0f9c8c143ebb 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.13 1995/12/17 21:12:25 phk Exp $
+ * $Id: nfs_socket.c,v 1.14 1996/01/13 23:27:52 phk Exp $
*/
/*
@@ -192,14 +192,16 @@ nfs_connect(nmp, rep)
struct sockaddr_in *sin;
struct mbuf *m;
u_short tport;
+ struct proc *p = &proc0; /* only used for socreate */
nmp->nm_so = (struct socket *)0;
saddr = mtod(nmp->nm_nam, struct sockaddr *);
error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
- nmp->nm_soproto);
+ nmp->nm_soproto, p);
if (error)
goto bad;
so = nmp->nm_so;
+ so->so_state &= ~SS_PRIV; /* don't need it */
nmp->nm_soflags = so->so_proto->pr_flags;
/*
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index df4a562b3229..e19c8e61753a 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.25 1995/12/22 15:57:38 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.26 1995/12/28 21:56:49 phk Exp $
*/
#include <sys/param.h>
@@ -343,7 +343,7 @@ nfs_mountroot()
* Do enough of ifconfig(8) so that the critical net interface can
* talk to the server.
*/
- error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0);
+ error = socreate(nd->myif.ifra_addr.sa_family, &so, SOCK_DGRAM, 0, p);
if (error)
panic("nfs_mountroot: socreate(%04x): %d",
nd->myif.ifra_addr.sa_family, error);
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index cbda2778e337..0f9c8c143ebb 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.13 1995/12/17 21:12:25 phk Exp $
+ * $Id: nfs_socket.c,v 1.14 1996/01/13 23:27:52 phk Exp $
*/
/*
@@ -192,14 +192,16 @@ nfs_connect(nmp, rep)
struct sockaddr_in *sin;
struct mbuf *m;
u_short tport;
+ struct proc *p = &proc0; /* only used for socreate */
nmp->nm_so = (struct socket *)0;
saddr = mtod(nmp->nm_nam, struct sockaddr *);
error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype,
- nmp->nm_soproto);
+ nmp->nm_soproto, p);
if (error)
goto bad;
so = nmp->nm_so;
+ so->so_state &= ~SS_PRIV; /* don't need it */
nmp->nm_soflags = so->so_proto->pr_flags;
/*
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index e2de7ecc6d36..5cc175e75430 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socketvar.h 8.1 (Berkeley) 6/2/93
- * $Id: socketvar.h,v 1.9 1995/12/14 22:51:13 bde Exp $
+ * $Id: socketvar.h,v 1.10 1996/01/30 23:01:25 mpp Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
@@ -217,13 +217,14 @@ void sbrelease __P((struct sockbuf *));
void sbappend __P((struct sockbuf *, struct mbuf *));
void sbappendrecord __P((struct sockbuf *, struct mbuf *));
int sbappendcontrol __P((struct sockbuf *, struct mbuf *, struct mbuf *));
-int sbappendaddr __P((struct sockbuf *, struct sockaddr *, struct mbuf *, struct mbuf *));
+int sbappendaddr __P((struct sockbuf *, struct sockaddr *,
+ struct mbuf *, struct mbuf *));
void sbdroprecord __P((struct sockbuf *));
void sbcompress __P((struct sockbuf *, struct mbuf *, struct mbuf *));
void sbflush __P((struct sockbuf *));
void sbinsertoob __P((struct sockbuf *, struct mbuf *));
-int sbreserve __P((struct sockbuf *,u_long));
-int soreserve __P((struct socket *,u_long,u_long));
+int sbreserve __P((struct sockbuf *, u_long));
+int soreserve __P((struct socket *, u_long, u_long));
int sb_lock __P((struct sockbuf *));
int sbwait __P((struct sockbuf *));
void sbdrop __P((struct sockbuf *, int));
@@ -237,20 +238,22 @@ void soisconnecting __P((struct socket *));
void soisdisconnecting __P((struct socket *));
void sohasoutofband __P((struct socket *));
int sodisconnect __P((struct socket *));
-int sosend __P((struct socket *,struct mbuf *, struct uio *, struct mbuf *, struct mbuf *, int));
-int socreate __P((int, struct socket **,int,int));
-int getsock __P((struct filedesc *,int,struct file **));
-int sockargs __P((struct mbuf **,caddr_t,int,int));
-int sobind __P((struct socket *,struct mbuf *));
-int solisten __P((struct socket *,int));
-int soaccept __P((struct socket *,struct mbuf *));
-int soconnect __P((struct socket *,struct mbuf *));
-int soconnect2 __P((struct socket *,struct socket *));
+int sosend __P((struct socket *, struct mbuf *, struct uio *,
+ struct mbuf *, struct mbuf *, int));
+int socreate __P((int, struct socket **, int, int, struct proc *));
+int getsock __P((struct filedesc *, int, struct file **));
+int sockargs __P((struct mbuf **, caddr_t, int, int));
+int sobind __P((struct socket *, struct mbuf *));
+int solisten __P((struct socket *, int));
+int soaccept __P((struct socket *, struct mbuf *));
+int soconnect __P((struct socket *, struct mbuf *));
+int soconnect2 __P((struct socket *, struct socket *));
int soclose __P((struct socket *));
-int soshutdown __P((struct socket *,int));
-int soreceive __P((struct socket *,struct mbuf **,struct uio *,struct mbuf **,struct mbuf **,int *));
-int sosetopt __P((struct socket *,int, int, struct mbuf *));
-int sogetopt __P((struct socket *,int, int, struct mbuf **));
+int soshutdown __P((struct socket *, int));
+int soreceive __P((struct socket *, struct mbuf **, struct uio *,
+ struct mbuf **, struct mbuf **, int *));
+int sosetopt __P((struct socket *, int, int, struct mbuf *));
+int sogetopt __P((struct socket *, int, int, struct mbuf **));
#endif
#endif