shutdown; clear suid; get/set hostname; nbio in state not options fixes

[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 3e0ff00..13cae1a 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.6     81/11/20        */
+/*     uipc_syscalls.c 4.15    82/03/15        */

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


@@ -12,8 +12,8 @@
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../net/inet.h"
-#include "../net/inet_systm.h"
+#include "../net/in.h"
+#include "../net/in_systm.h"

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


@@ -25,7 +25,7 @@
  *     SO_INTNOTIFY
  */
 
  *     SO_INTNOTIFY
  */
 

-static struct sockproto localproto = { PF_LOCAL, 0 };
+static struct sockproto localproto = { PF_UNIX, 0 };

 /*
  * Pipe system call interface.
  */
 /*
  * Pipe system call interface.
  */


@@ -57,7 +57,7 @@ COUNT(SPIPE);
        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;

-       if (piconnect(rso, wso) == 0)
+       if (piconnect(wso, rso) == 0)

                goto free4;
        return;
 free4:
                goto free4;
        return;
 free4:


@@ -179,17 +179,26 @@ COUNT(SACCEPT);
        }
        s = splnet();
        so = fp->f_socket;
        }
        s = splnet();
        so = fp->f_socket;

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

            (so->so_state & SS_CONNAWAITING) == 0) {
                u.u_error = EWOULDBLOCK;
                splx(s);
                return;
        }
            (so->so_state & SS_CONNAWAITING) == 0) {
                u.u_error = EWOULDBLOCK;
                splx(s);
                return;
        }

+       while ((so->so_state & SS_CONNAWAITING) == 0 && so->so_error == 0)
+               sleep((caddr_t)&so->so_timeo, PZERO+1);
+       if (so->so_error) {
+               u.u_error = so->so_error;
+               splx(s);
+               return;
+       }

        u.u_error = soaccept(so, &sa);
        if (u.u_error) {
                splx(s);
                return;
        }
        u.u_error = soaccept(so, &sa);
        if (u.u_error) {
                splx(s);
                return;
        }

+       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);
        /* deal with new file descriptor case */
        /* u.u_r.r_val1 = ... */
        splx(s);


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

-       if ((so->so_options & SO_NBIO) &&
+       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);


@@ -273,12 +282,12 @@ COUNT(SDISCONNECT);
        if (u.u_error)
                return;
        s = splnet();
        if (u.u_error)
                return;
        s = splnet();

-       if ((so->so_options&SO_NBIO) && (so->so_state&SS_ISDISCONNECTING)) {
+       if ((so->so_state&SS_NBIO) && (so->so_state&SS_ISDISCONNECTING)) {

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

-       while (so->so_state & SS_ISDISCONNECTING)
+       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;
                sleep((caddr_t)&so->so_timeo, PZERO+1);
        u.u_error = so->so_error;
        so->so_error = 0;


@@ -307,6 +316,7 @@ COUNT(SSEND);
                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

+       u.u_base = uap->cbuf;

        u.u_count = uap->count;
        u.u_segflg = 0;
        if (useracc(uap->cbuf, uap->count, B_READ) == 0 ||
        u.u_count = uap->count;
        u.u_segflg = 0;
        if (useracc(uap->cbuf, uap->count, B_READ) == 0 ||


@@ -315,6 +325,7 @@ COUNT(SSEND);
                return;
        }
        u.u_error = sosend(fp->f_socket, uap->asa ? &sa : 0);
                return;
        }
        u.u_error = sosend(fp->f_socket, uap->asa ? &sa : 0);

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

 }
 
 /*
 }
 
 /*


@@ -339,6 +350,7 @@ COUNT(SRECEIVE);
                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

+       u.u_base = uap->cbuf;

        u.u_count = uap->count;
        u.u_segflg = 0;
        if (useracc(uap->cbuf, uap->count, B_WRITE) == 0 ||
        u.u_count = uap->count;
        u.u_segflg = 0;
        if (useracc(uap->cbuf, uap->count, B_WRITE) == 0 ||


@@ -351,6 +363,7 @@ COUNT(SRECEIVE);
                return;
        if (uap->asa)
                (void) copyout((caddr_t)&sa, (caddr_t)uap->asa, sizeof (sa));
                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;

 }
 
 /*
 }
 
 /*


@@ -372,4 +385,9 @@ COUNT(SSOCKETADDR);
                u.u_error = ENOTSOCK;
                return;
        }
                u.u_error = ENOTSOCK;
                return;
        }

-       copyout(fp->f_socket->f_
+       if (copyout((caddr_t)&fp->f_socket->so_addr, (caddr_t)uap->asa, 
+           sizeof (struct sockaddr))) {
+               u.u_error = EFAULT;
+               return;
+       }
+}