use rdwri()

[unix-history] / usr / src / sys / kern / uipc_syscalls.c

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index 745e37e..b5d4931 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*     uipc_syscalls.c 4.14    82/02/25        */
+/*     uipc_syscalls.c 4.24    82/08/22        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -14,6 +14,86 @@
 #include "../h/socketvar.h"
 #include "../net/in.h"
 #include "../net/in_systm.h"
 #include "../h/socketvar.h"
 #include "../net/in.h"
 #include "../net/in_systm.h"

+#include "../h/descrip.h"
+#include "../h/uio.h"
+
+ssocreate()
+/*###21 [lint] ssocreate defined( sys_socket.c(21) ), but never used%%%*/
+{
+
+}
+
+ssobind()
+/*###26 [lint] ssobind defined( sys_socket.c(26) ), but never used%%%*/
+{
+
+}
+
+ssolisten()
+/*###31 [lint] ssolisten defined( sys_socket.c(31) ), but never used%%%*/
+{
+
+}
+
+ssoaccept()
+/*###36 [lint] ssoaccept defined( sys_socket.c(36) ), but never used%%%*/
+{
+
+}
+
+ssoconnect()
+/*###41 [lint] ssoconnect defined( sys_socket.c(41) ), but never used%%%*/
+{
+
+}
+
+ssocreatepair()
+/*###46 [lint] ssocreatepair defined( sys_socket.c(46) ), but never used%%%*/
+{
+
+}
+
+ssosendto()
+/*###51 [lint] ssosendto defined( sys_socket.c(51) ), but never used%%%*/
+{
+
+}
+
+ssosend()
+/*###56 [lint] ssosend defined( sys_socket.c(56) ), but never used%%%*/
+{
+
+}
+
+ssorecvfrom()
+/*###61 [lint] ssorecvfrom defined( sys_socket.c(61) ), but never used%%%*/
+{
+
+}
+
+ssorecv()
+/*###66 [lint] ssorecv defined( sys_socket.c(66) ), but never used%%%*/
+{
+
+}
+
+ssosendm()
+/*###71 [lint] ssosendm defined( sys_socket.c(71) ), but never used%%%*/
+{
+
+}
+
+ssorecvm()
+/*###76 [lint] ssorecvm defined( sys_socket.c(76) ), but never used%%%*/
+{
+
+}
+
+ssoshutdown()
+/*###81 [lint] ssoshutdown defined( sys_socket.c(81) ), but never used%%%*/
+{
+
+}

 
 /*
  * Socket system call interface.
 
 /*
  * Socket system call interface.


@@ -34,7 +114,6 @@ spipe()
        register struct file *rf, *wf;
        struct socket *rso, *wso;
        int r;
        register struct file *rf, *wf;
        struct socket *rso, *wso;
        int r;

-COUNT(SPIPE);

        
        u.u_error = socreate(&rso, SOCK_STREAM,
            &localproto, (struct sockaddr *)0, 0);
        
        u.u_error = socreate(&rso, SOCK_STREAM,
            &localproto, (struct sockaddr *)0, 0);


@@ -48,12 +127,14 @@ COUNT(SPIPE);
        if (rf == NULL)
                goto free2;
        r = u.u_r.r_val1;
        if (rf == NULL)
                goto free2;
        r = u.u_r.r_val1;

-       rf->f_flag = FREAD|FSOCKET;
+       rf->f_flag = FREAD;
+       rf->f_type = DTYPE_SOCKET;

        rf->f_socket = rso;
        wf = falloc();
        if (wf == NULL)
                goto free3;
        rf->f_socket = rso;
        wf = falloc();
        if (wf == NULL)
                goto free3;

-       wf->f_flag = FWRITE|FSOCKET;
+       wf->f_flag = FWRITE;
+       wf->f_type = DTYPE_SOCKET;

        wf->f_socket = wso;
        u.u_r.r_val2 = u.u_r.r_val1;
        u.u_r.r_val1 = r;
        wf->f_socket = wso;
        u.u_r.r_val2 = u.u_r.r_val1;
        u.u_r.r_val1 = r;


@@ -62,57 +143,18 @@ COUNT(SPIPE);
        return;
 free4:
        wf->f_count = 0;
        return;
 free4:
        wf->f_count = 0;

-       u.u_ofile[u.u_r.r_val1] = 0;
+       u.u_ofile[u.u_r.r_val2] = 0;

 free3:
        rf->f_count = 0;
        u.u_ofile[r] = 0;
 free2:
 free3:
        rf->f_count = 0;
        u.u_ofile[r] = 0;
 free2:

-       wso->so_state |= SS_USERGONE;
+       wso->so_state |= SS_NOFDREF;

        sofree(wso);
 free:
        sofree(wso);
 free:

-       rso->so_state |= SS_USERGONE;
+       rso->so_state |= SS_NOFDREF;

        sofree(rso);
 }
 
        sofree(rso);
 }
 

-/*
- * Splice system call interface.
- */
-ssplice()
-{
-       register struct a {
-               int     fd1;
-               int     fd2;
-       } *ap = (struct a *)u.u_ap;
-       struct file *f1, *f2;
-COUNT(SSPLICE);
-
-       f1 = getf(ap->fd1);
-       if (f1 == NULL)
-               return;
-       f2 = getf(ap->fd2);
-       if (f2 == NULL)
-               return;
-       if (f1 == f2) {
-               u.u_error = EINVAL;
-               return;
-       }
-       if ((f1->f_flag & FSOCKET) == 0 || (f2->f_flag & FSOCKET) == 0) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       if (f1->f_count > 1 || f2->f_count > 1) {
-               u.u_error = ETOOMANYREFS;
-               return;
-       }
-       u.u_error = sosplice(f1->f_socket, f2->f_socket);
-       if (u.u_error)
-               return;
-       u.u_ofile[ap->fd1] = 0;
-       u.u_ofile[ap->fd2] = 0;
-       f1->f_count = 0;
-       f2->f_count = 0;
-}
-

 /*
  * Socket system call interface.  Copy sa arguments
  * set up file descriptor and call internal socket
 /*
  * Socket system call interface.  Copy sa arguments
  * set up file descriptor and call internal socket


@@ -130,15 +172,15 @@ ssocket()
        struct sockaddr sa;
        struct socket *so;
        register struct file *fp;
        struct sockaddr sa;
        struct socket *so;
        register struct file *fp;

-COUNT(SSOCKET);

 
        if ((fp = falloc()) == NULL)
                return;
 
        if ((fp = falloc()) == NULL)
                return;

-       fp->f_flag = FSOCKET|FREAD|FWRITE;
+       fp->f_flag = FREAD|FWRITE;
+       fp->f_type = DTYPE_SOCKET;

        if (uap->asp && copyin((caddr_t)uap->asp, (caddr_t)&sp, sizeof (sp)) ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
        if (uap->asp && copyin((caddr_t)uap->asp, (caddr_t)&sp, sizeof (sp)) ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;

-               return;
+               goto bad;

        }
        u.u_error = socreate(&so, uap->type,
            uap->asp ? &sp : 0, uap->asa ? &sa : 0, uap->options);
        }
        u.u_error = socreate(&so, uap->type,
            uap->asp ? &sp : 0, uap->asa ? &sa : 0, uap->options);


@@ -164,7 +206,6 @@ saccept()
        register struct file *fp;
        struct socket *so;
        int s;
        register struct file *fp;
        struct socket *so;
        int s;

-COUNT(SACCEPT);

 
        if (uap->asa && useracc((caddr_t)uap->asa, sizeof (sa), B_WRITE)==0) {
                u.u_error = EFAULT;
 
        if (uap->asa && useracc((caddr_t)uap->asa, sizeof (sa), B_WRITE)==0) {
                u.u_error = EFAULT;


@@ -173,34 +214,62 @@ COUNT(SACCEPT);
        fp = getf(uap->fdes);
        if (fp == 0)
                return;
        fp = getf(uap->fdes);
        if (fp == 0)
                return;

-       if ((fp->f_flag & FSOCKET) == 0) {
+       if (fp->f_type != DTYPE_SOCKET) {

                u.u_error = ENOTSOCK;
                return;
        }
        s = splnet();
        so = fp->f_socket;
                u.u_error = ENOTSOCK;
                return;
        }
        s = splnet();
        so = fp->f_socket;

-       if ((so->so_options & SO_NONBLOCKING) &&
-           (so->so_state & SS_CONNAWAITING) == 0) {
+       if ((so->so_options & SO_ACCEPTCONN) == 0) {
+               u.u_error = EINVAL;
+               splx(s);
+               return;
+       }
+       if ((so->so_state & SS_NBIO) && so->so_qlen == 0) {

                u.u_error = EWOULDBLOCK;
                splx(s);
                return;
        }
                u.u_error = EWOULDBLOCK;
                splx(s);
                return;
        }

-       while ((so->so_state & SS_CONNAWAITING) == 0 && so->so_error == 0)
+       while (so->so_qlen == 0 && so->so_error == 0) {
+               if (so->so_state & SS_CANTRCVMORE) {
+                       so->so_error = ECONNABORTED;
+                       break;
+               }

                sleep((caddr_t)&so->so_timeo, PZERO+1);
                sleep((caddr_t)&so->so_timeo, PZERO+1);

+       }

        if (so->so_error) {
                u.u_error = so->so_error;
                splx(s);
                return;
        }
        if (so->so_error) {
                u.u_error = so->so_error;
                splx(s);
                return;
        }

-       u.u_error = soaccept(so, &sa);
-       if (u.u_error) {
+       if ((so->so_options & SO_NEWFDONCONN) == 0) {
+               struct socket *nso = so->so_q;
+               (void) soqremque(nso, 1);
+               soclose(so, 1);
+               fp->f_socket = nso;
+               nso->so_q = 0;
+               so = nso;
+               goto ret;
+       }
+       if (ufalloc() < 0) {
+               splx(s);
+               return;
+       }
+       fp = falloc();
+       if (fp == 0) {
+               u.u_ofile[u.u_r.r_val1] = 0;

                splx(s);
                return;
        }
                splx(s);
                return;
        }

+       fp->f_type = DTYPE_SOCKET;
+       fp->f_flag = FREAD|FWRITE;
+       fp->f_socket = so->so_q;
+       so->so_q = so->so_q->so_q;
+       so->so_qlen--;
+ret:
+       soaccept(so, &sa);

        if (uap->asa)
                (void) copyout((caddr_t)&sa, (caddr_t)uap->asa, sizeof (sa));
        if (uap->asa)
                (void) copyout((caddr_t)&sa, (caddr_t)uap->asa, sizeof (sa));

-       /* deal with new file descriptor case */
-       /* u.u_r.r_val1 = ... */

        splx(s);
 }
 
        splx(s);
 }
 


@@ -218,7 +287,6 @@ sconnect()
        register struct file *fp;
        register struct socket *so;
        int s;
        register struct file *fp;
        register struct socket *so;
        int s;

-COUNT(SCONNECT);

 
        if (copyin((caddr_t)uap->a, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
 
        if (copyin((caddr_t)uap->a, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;


@@ -227,7 +295,7 @@ COUNT(SCONNECT);
        fp = getf(uap->fdes);
        if (fp == 0)
                return;
        fp = getf(uap->fdes);
        if (fp == 0)
                return;

-       if ((fp->f_flag & FSOCKET) == 0) {
+       if (fp->f_type != DTYPE_SOCKET) {

                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }


@@ -236,7 +304,7 @@ COUNT(SCONNECT);
        if (u.u_error)
                return;
        s = splnet();
        if (u.u_error)
                return;
        s = splnet();

-       if ((so->so_options & SO_NONBLOCKING) &&
+       if ((so->so_state & SS_NBIO) &&

            (so->so_state & SS_ISCONNECTING)) {
                u.u_error = EINPROGRESS;
                splx(s);
            (so->so_state & SS_ISCONNECTING)) {
                u.u_error = EINPROGRESS;
                splx(s);


@@ -249,51 +317,6 @@ COUNT(SCONNECT);
        splx(s);
 }
 
        splx(s);
 }
 

-/*
- * Disconnect socket from foreign peer; system call
- * interface.  Copy sa arguments and call internal routine.
- */
-sdisconnect()
-{
-       register struct a {
-               int     fdes;
-               struct  sockaddr *asa;
-       } *uap = (struct a *)u.u_ap;
-       struct sockaddr sa;
-       register struct file *fp;
-       register struct socket *so;
-       int s;
-COUNT(SDISCONNECT);
-
-       if (uap->asa &&
-           copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
-               u.u_error = EFAULT;
-               return;
-       }
-       fp = getf(uap->fdes);
-       if (fp == 0)
-               return;
-       if ((fp->f_flag & FSOCKET) == 0) {
-               u.u_error = ENOTSOCK;
-               return;
-       }
-       so = fp->f_socket;
-       u.u_error = sodisconnect(so, uap->asa ? &sa : 0);
-       if (u.u_error)
-               return;
-       s = splnet();
-       if ((so->so_options&SO_NONBLOCKING) && (so->so_state&SS_ISDISCONNECTING)) {
-               u.u_error = EINPROGRESS;
-               splx(s);
-               return;
-       }
-       while ((so->so_state & SS_ISDISCONNECTING) && so->so_error == 0)
-               sleep((caddr_t)&so->so_timeo, PZERO+1);
-       u.u_error = so->so_error;
-       so->so_error = 0;
-       splx(s);
-}
-

 /*
  * Send data on socket.
  */
 /*
  * Send data on socket.
  */


@@ -307,25 +330,30 @@ ssend()
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;
        struct sockaddr sa;
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;
        struct sockaddr sa;

-COUNT(SSEND);
+       struct uio auio;
+       struct iovec aiov;

 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;
 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;

-       if ((fp->f_flag & FSOCKET) == 0) {
+       if (fp->f_type != DTYPE_SOCKET) {

                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

-       u.u_base = uap->cbuf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
+       auio.uio_iov = &aiov;
+       auio.uio_iovcnt = 1;
+       aiov.iov_base = uap->cbuf;
+       aiov.iov_len = uap->count;
+       auio.uio_resid = uap->count;
+       auio.uio_segflg = 0;
+       auio.uio_offset = 0;    /* XXX */

        if (useracc(uap->cbuf, uap->count, B_READ) == 0 ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
                return;
        }
        if (useracc(uap->cbuf, uap->count, B_READ) == 0 ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
                return;
        }

-       u.u_error = sosend(fp->f_socket, uap->asa ? &sa : 0);
-       u.u_r.r_val1 = uap->count - u.u_count;
+       u.u_error = sosend(fp->f_socket, uap->asa ? &sa : 0, &auio);
+       u.u_r.r_val1 = uap->count - auio.uio_resid;

 }
 
 /*
 }
 
 /*


@@ -341,29 +369,34 @@ sreceive()
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;
        struct sockaddr sa;
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;
        struct sockaddr sa;

-COUNT(SRECEIVE);
+       struct uio auio;
+       struct iovec aiov;

 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;
 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;

-       if ((fp->f_flag & FSOCKET) == 0) {
+       if (fp->f_type != DTYPE_SOCKET) {

                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

-       u.u_base = uap->cbuf;
-       u.u_count = uap->count;
-       u.u_segflg = 0;
+       auio.uio_iov = &aiov;
+       auio.uio_iovcnt = 1;
+       aiov.iov_base = uap->cbuf;
+       aiov.iov_len = uap->count;
+       auio.uio_resid = uap->count;
+       auio.uio_segflg = 0;
+       auio.uio_offset = 0;    /* XXX */

        if (useracc(uap->cbuf, uap->count, B_WRITE) == 0 ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
                return;
        }
        if (useracc(uap->cbuf, uap->count, B_WRITE) == 0 ||
            uap->asa && copyin((caddr_t)uap->asa, (caddr_t)&sa, sizeof (sa))) {
                u.u_error = EFAULT;
                return;
        }

-       u.u_error = soreceive(fp->f_socket, uap->asa ? &sa : 0);
+       u.u_error = soreceive(fp->f_socket, uap->asa ? &sa : 0, &auio);

        if (u.u_error)
                return;
        if (uap->asa)
                (void) copyout((caddr_t)&sa, (caddr_t)uap->asa, sizeof (sa));
        if (u.u_error)
                return;
        if (uap->asa)
                (void) copyout((caddr_t)&sa, (caddr_t)uap->asa, sizeof (sa));

-       u.u_r.r_val1 = uap->count - u.u_count;
+       u.u_r.r_val1 = uap->count - auio.uio_resid;

 }
 
 /*
 }
 
 /*


@@ -376,18 +409,21 @@ ssocketaddr()
                struct  sockaddr *asa;
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;
                struct  sockaddr *asa;
        } *uap = (struct a *)u.u_ap;
        register struct file *fp;

-COUNT(SSOCKETADDR);
+       register struct socket *so;
+       struct sockaddr addr;

 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;
 
        fp = getf(uap->fdes);
        if (fp == 0)
                return;

-       if ((fp->f_flag & FSOCKET) == 0) {
+       if (fp->f_type != DTYPE_SOCKET) {

                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

-       if (copyout((caddr_t)&fp->f_socket->so_addr, (caddr_t)uap->asa, 
-           sizeof (struct sockaddr))) {
-               u.u_error = EFAULT;
+       so = fp->f_socket;
+       u.u_error =
+               (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, (caddr_t)&addr);
+       if (u.u_error)

                return;
                return;

-       }
+       if (copyout((caddr_t)&addr, (caddr_t)uap->asa, sizeof (addr)))
+               u.u_error = EFAULT;

 }
 }