don't free ioctl cmds

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

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index f95b30b..acca526 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -1,26 +1,35 @@
-/*     uipc_usrreq.c   1.11    83/06/12        */
-
-#include "../h/param.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/unpcb.h"
-#include "../h/un.h"
-#include "../h/inode.h"
-#include "../h/nami.h"
-#include "../h/file.h"
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)uipc_usrreq.c       6.17 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "dir.h"
+#include "user.h"
+#include "mbuf.h"
+#include "domain.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "unpcb.h"
+#include "un.h"
+#include "inode.h"
+#include "file.h"
+#include "stat.h"

 
 /*
  * Unix communications domain.
  *
  * TODO:
  *     SEQPACKET, RDM
 
 /*
  * Unix communications domain.
  *
  * TODO:
  *     SEQPACKET, RDM

- *     change for names in file system
+ *     rethink name space problems

  *     need a proper out-of-band
  */
  *     need a proper out-of-band
  */

+struct sockaddr sun_noname = { AF_UNIX };
+ino_t  unp_ino;                                /* fake inode numbers */

 
 /*ARGSUSED*/
 uipc_usrreq(so, req, m, nam, rights)
 
 /*ARGSUSED*/
 uipc_usrreq(so, req, m, nam, rights)


@@ -32,6 +41,8 @@ uipc_usrreq(so, req, m, nam, rights)
        register struct socket *so2;
        int error = 0;
 
        register struct socket *so2;
        int error = 0;
 

+       if (req == PRU_CONTROL)
+               return (EOPNOTSUPP);

        if (req != PRU_SEND && rights && rights->m_len) {
                error = EOPNOTSUPP;
                goto release;
        if (req != PRU_SEND && rights && rights->m_len) {
                error = EOPNOTSUPP;
                goto release;


@@ -67,12 +78,11 @@ uipc_usrreq(so, req, m, nam, rights)
                error = unp_connect(so, nam);
                break;
 
                error = unp_connect(so, nam);
                break;
 

-#ifdef notdef

        case PRU_CONNECT2:
        case PRU_CONNECT2:

-               error = unp_connect2(so, (struct mbuf *)0, (struct socket *)nam);
+               error = unp_connect2(so, (struct mbuf *)0,
+                   (struct socket *)nam);

                break;
 
                break;
 

-#endif

        case PRU_DISCONNECT:
                unp_disconnect(unp);
                break;
        case PRU_DISCONNECT:
                unp_disconnect(unp);
                break;


@@ -109,7 +119,7 @@ uipc_usrreq(so, req, m, nam, rights)
                        rcv->sb_mbmax = rcv->sb_mbcnt;
                        snd->sb_hiwat += rcv->sb_hiwat - rcv->sb_cc;
                        rcv->sb_hiwat = rcv->sb_cc;
                        rcv->sb_mbmax = rcv->sb_mbcnt;
                        snd->sb_hiwat += rcv->sb_hiwat - rcv->sb_cc;
                        rcv->sb_hiwat = rcv->sb_cc;

-                       sbwakeup(snd);
+                       sowwakeup(so2);

 #undef snd
 #undef rcv
                        break;
 #undef snd
 #undef rcv
                        break;


@@ -145,11 +155,16 @@ uipc_usrreq(so, req, m, nam, rights)
                                        break;
                        }
                        if (sbspace(&so2->so_rcv) > 0) {
                                        break;
                        }
                        if (sbspace(&so2->so_rcv) > 0) {

-                               (void) sbappendaddr(&so2->so_rcv,
-                                   mtod(nam, struct sockaddr *), m,
-                                   rights);
-                               sbwakeup(&so2->so_rcv);
-                               m = 0;
+                               /*
+                                * There's no record of source socket's
+                                * name, so send null name for the moment.
+                                */
+                               if (sbappendaddr(&so2->so_rcv,
+                                   &sun_noname, m, rights)) {
+                                       sorwakeup(so2);
+                                       m = 0;
+                               } else
+                                       error = ENOBUFS;

                        }
                        /* END XXX */
                        if (nam)
                        }
                        /* END XXX */
                        if (nam)


@@ -163,6 +178,10 @@ uipc_usrreq(so, req, m, nam, rights)
                                error = EOPNOTSUPP;
                                break;
                        }
                                error = EOPNOTSUPP;
                                break;
                        }

+                       if (so->so_state & SS_CANTSENDMORE) {
+                               error = EPIPE;
+                               break;
+                       }

                        if (unp->unp_conn == 0)
                                panic("uipc 3");
                        so2 = unp->unp_conn->unp_socket;
                        if (unp->unp_conn == 0)
                                panic("uipc 3");
                        so2 = unp->unp_conn->unp_socket;


@@ -176,7 +195,8 @@ uipc_usrreq(so, req, m, nam, rights)
                        rcv->sb_mbmax = rcv->sb_mbcnt;
                        snd->sb_hiwat -= rcv->sb_cc - rcv->sb_hiwat;
                        rcv->sb_hiwat = rcv->sb_cc;
                        rcv->sb_mbmax = rcv->sb_mbcnt;
                        snd->sb_hiwat -= rcv->sb_cc - rcv->sb_hiwat;
                        rcv->sb_hiwat = rcv->sb_cc;

-                       sbwakeup(rcv);
+                       sorwakeup(so2);
+                       m = 0;

 #undef snd
 #undef rcv
                        break;
 #undef snd
 #undef rcv
                        break;


@@ -184,31 +204,35 @@ uipc_usrreq(so, req, m, nam, rights)
                default:
                        panic("uipc 4");
                }
                default:
                        panic("uipc 4");
                }

-               m = 0;

                break;
 
        case PRU_ABORT:
                unp_drop(unp, ECONNABORTED);
                break;
 
                break;
 
        case PRU_ABORT:
                unp_drop(unp, ECONNABORTED);
                break;
 

-/* SOME AS YET UNIMPLEMENTED HOOKS */
-       case PRU_CONTROL:
-               return (EOPNOTSUPP);
-

        case PRU_SENSE:
        case PRU_SENSE:

-               error = EOPNOTSUPP;
-               break;
-/* END UNIMPLEMENTED HOOKS */
+               ((struct stat *) m)->st_blksize = so->so_snd.sb_hiwat;
+               if (so->so_type == SOCK_STREAM && unp->unp_conn != 0) {
+                       so2 = unp->unp_conn->unp_socket;
+                       ((struct stat *) m)->st_blksize += so2->so_rcv.sb_cc;
+               }
+               ((struct stat *) m)->st_dev = NODEV;
+               ((struct stat *) m)->st_ino = unp_ino++;
+               return (0);

 
        case PRU_RCVOOB:
 
        case PRU_RCVOOB:

-               break;
+               return (EOPNOTSUPP);

 
        case PRU_SENDOOB:
 
        case PRU_SENDOOB:

+               error = EOPNOTSUPP;

                break;
 
        case PRU_SOCKADDR:
                break;
 
                break;
 
        case PRU_SOCKADDR:
                break;
 

+       case PRU_PEERADDR:
+               break;
+

        case PRU_SLOWTIMO:
                break;
 
        case PRU_SLOWTIMO:
                break;
 


@@ -221,9 +245,18 @@ release:
        return (error);
 }
 
        return (error);
 }
 

-/* SHOULD BE PIPSIZ and 0 */
-int    unp_sendspace = 1024*2;
-int    unp_recvspace = 1024*2;
+/*
+ * We assign all buffering for stream sockets to the source,
+ * as that is where the flow control is implemented.
+ * Datagram sockets really use the sendspace as the maximum datagram size,
+ * and don't really want to reserve the sendspace.  Their recvspace should
+ * be large enough for at least one max-size datagram plus address.
+ */
+#define        PIPSIZ  4096
+int    unpst_sendspace = PIPSIZ;
+int    unpst_recvspace = 0;
+int    unpdg_sendspace = 2*1024;       /* really max datagram size */
+int    unpdg_recvspace = 4*1024;

 
 unp_attach(so)
        struct socket *so;
 
 unp_attach(so)
        struct socket *so;


@@ -232,7 +265,16 @@ unp_attach(so)
        register struct unpcb *unp;
        int error;
        
        register struct unpcb *unp;
        int error;
        

-       error = soreserve(so, unp_sendspace, unp_recvspace);
+       switch (so->so_type) {
+
+       case SOCK_STREAM:
+               error = soreserve(so, unpst_sendspace, unpst_recvspace);
+               break;
+
+       case SOCK_DGRAM:
+               error = soreserve(so, unpdg_sendspace, unpdg_recvspace);
+               break;
+       }

        if (error)
                return (error);
        m = m_getclr(M_DONTWAIT, MT_PCB);
        if (error)
                return (error);
        m = m_getclr(M_DONTWAIT, MT_PCB);


@@ -249,6 +291,7 @@ unp_detach(unp)
 {
        
        if (unp->unp_inode) {
 {
        
        if (unp->unp_inode) {

+               unp->unp_inode->i_socket = 0;

                irele(unp->unp_inode);
                unp->unp_inode = 0;
        }
                irele(unp->unp_inode);
                unp->unp_inode = 0;
        }


@@ -268,15 +311,17 @@ unp_bind(unp, nam)
 {
        struct sockaddr_un *soun = mtod(nam, struct sockaddr_un *);
        register struct inode *ip;
 {
        struct sockaddr_un *soun = mtod(nam, struct sockaddr_un *);
        register struct inode *ip;

-       extern schar();
+       register struct nameidata *ndp = &u.u_nd;

        int error;
 
        int error;
 

-       u.u_dirp = soun->sun_path;
-       if (nam->m_len == MLEN)
+       ndp->ni_dirp = soun->sun_path;
+       if (unp->unp_inode != NULL || nam->m_len == MLEN)

                return (EINVAL);
        *(mtod(nam, caddr_t) + nam->m_len) = 0;
 /* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */
                return (EINVAL);
        *(mtod(nam, caddr_t) + nam->m_len) = 0;
 /* SHOULD BE ABLE TO ADOPT EXISTING AND wakeup() ALA FIFO's */

-       ip = namei(schar, CREATE, 1);
+       ndp->ni_nameiop = CREATE | FOLLOW;
+       ndp->ni_segflg = UIO_SYSSPACE;
+       ip = namei(ndp);

        if (ip) {
                iput(ip);
                return (EADDRINUSE);
        if (ip) {
                iput(ip);
                return (EADDRINUSE);


@@ -285,7 +330,7 @@ unp_bind(unp, nam)
                u.u_error = 0;                  /* XXX */
                return (error);
        }
                u.u_error = 0;                  /* XXX */
                return (error);
        }

-       ip = maknode(IFSOCK | 0777);
+       ip = maknode(IFSOCK | 0777, ndp);

        if (ip == NULL) {
                error = u.u_error;              /* XXX */
                u.u_error = 0;                  /* XXX */
        if (ip == NULL) {
                error = u.u_error;              /* XXX */
                u.u_error = 0;                  /* XXX */


@@ -305,17 +350,25 @@ unp_connect(so, nam)
        register struct inode *ip;
        int error;
        register struct socket *so2;
        register struct inode *ip;
        int error;
        register struct socket *so2;

+       register struct nameidata *ndp = &u.u_nd;

 
 

-       u.u_dirp = soun->sun_path;
+       ndp->ni_dirp = soun->sun_path;

        if (nam->m_len + (nam->m_off - MMINOFF) == MLEN)
                return (EMSGSIZE);
        *(mtod(nam, caddr_t) + nam->m_len) = 0;
        if (nam->m_len + (nam->m_off - MMINOFF) == MLEN)
                return (EMSGSIZE);
        *(mtod(nam, caddr_t) + nam->m_len) = 0;

-       ip = namei(schar, LOOKUP, 1);
+       ndp->ni_nameiop = LOOKUP | FOLLOW;
+       ndp->ni_segflg = UIO_SYSSPACE;
+       ip = namei(ndp);

        if (ip == 0) {
                error = u.u_error;
                u.u_error = 0;
                return (error);         /* XXX */
        }
        if (ip == 0) {
                error = u.u_error;
                u.u_error = 0;
                return (error);         /* XXX */
        }

+       if (access(ip, IWRITE)) {
+               error = u.u_error;
+               u.u_error = 0;          /* XXX */
+               goto bad;
+       }

        if ((ip->i_mode&IFMT) != IFSOCK) {
                error = ENOTSOCK;
                goto bad;
        if ((ip->i_mode&IFMT) != IFSOCK) {
                error = ENOTSOCK;
                goto bad;


@@ -325,6 +378,16 @@ unp_connect(so, nam)
                error = ECONNREFUSED;
                goto bad;
        }
                error = ECONNREFUSED;
                goto bad;
        }

+       if (so->so_type != so2->so_type) {
+               error = EPROTOTYPE;
+               goto bad;
+       }
+       if (so->so_proto->pr_flags & PR_CONNREQUIRED &&
+           ((so2->so_options&SO_ACCEPTCONN) == 0 ||
+            (so2 = sonewconn(so2)) == 0)) {
+               error = ECONNREFUSED;
+               goto bad;
+       }

        error = unp_connect2(so, nam, so2);
 bad:
        iput(ip);
        error = unp_connect2(so, nam, so2);
 bad:
        iput(ip);


@@ -341,31 +404,27 @@ unp_connect2(so, sonam, so2)
 
        if (so2->so_type != so->so_type)
                return (EPROTOTYPE);
 
        if (so2->so_type != so->so_type)
                return (EPROTOTYPE);

+       unp2 = sotounpcb(so2);
+       unp->unp_conn = unp2;

        switch (so->so_type) {
 
        case SOCK_DGRAM:
        switch (so->so_type) {
 
        case SOCK_DGRAM:

-               unp2 = sotounpcb(so2);
-               unp->unp_conn = unp2;

                unp->unp_nextref = unp2->unp_refs;
                unp2->unp_refs = unp;
                unp->unp_nextref = unp2->unp_refs;
                unp2->unp_refs = unp;

+               soisconnected(so);

                break;
 
        case SOCK_STREAM:
                break;
 
        case SOCK_STREAM:

-               if ((so2->so_options&SO_ACCEPTCONN) == 0 ||
-                   (so2 = sonewconn(so2)) == 0)
-                       return (ECONNREFUSED);
-               unp2 = sotounpcb(so2);
-               unp->unp_conn = unp2;

                unp2->unp_conn = unp;
                if (sonam)
                        unp2->unp_remaddr = m_copy(sonam, 0, (int)M_COPYALL);
                unp2->unp_conn = unp;
                if (sonam)
                        unp2->unp_remaddr = m_copy(sonam, 0, (int)M_COPYALL);

+               soisconnected(so2);
+               soisconnected(so);

                break;
 
        default:
                panic("unp_connect2");
        }
                break;
 
        default:
                panic("unp_connect2");
        }

-       soisconnected(so2);
-       soisconnected(so);

        return (0);
 }
 
        return (0);
 }
 


@@ -377,7 +436,6 @@ unp_disconnect(unp)
        if (unp2 == 0)
                return;
        unp->unp_conn = 0;
        if (unp2 == 0)
                return;
        unp->unp_conn = 0;

-       soisdisconnected(unp->unp_socket);

        switch (unp->unp_socket->so_type) {
 
        case SOCK_DGRAM:
        switch (unp->unp_socket->so_type) {
 
        case SOCK_DGRAM:


@@ -395,9 +453,11 @@ unp_disconnect(unp)
                        unp2->unp_nextref = unp->unp_nextref;
                }
                unp->unp_nextref = 0;
                        unp2->unp_nextref = unp->unp_nextref;
                }
                unp->unp_nextref = 0;

+               unp->unp_socket->so_state &= ~SS_ISCONNECTED;

                break;
 
        case SOCK_STREAM:
                break;
 
        case SOCK_STREAM:

+               soisdisconnected(unp->unp_socket);

                unp2->unp_conn = 0;
                soisdisconnected(unp2->unp_socket);
                break;
                unp2->unp_conn = 0;
                soisdisconnected(unp2->unp_socket);
                break;


@@ -424,9 +484,16 @@ unp_drop(unp, errno)
        struct unpcb *unp;
        int errno;
 {
        struct unpcb *unp;
        int errno;
 {

+       struct socket *so = unp->unp_socket;

 
 

-       unp->unp_socket->so_error = errno;
+       so->so_error = errno;

        unp_disconnect(unp);
        unp_disconnect(unp);

+       if (so->so_head) {
+               so->so_pcb = (caddr_t) 0;
+               m_freem(unp->unp_remaddr);
+               (void) m_free(dtom(unp));
+               sofree(so);
+       }

 }
 
 #ifdef notdef
 }
 
 #ifdef notdef


@@ -460,7 +527,7 @@ unp_externalize(rights)
                fp = *rp;
                u.u_ofile[f] = fp;
                fp->f_msgcount--;
                fp = *rp;
                u.u_ofile[f] = fp;
                fp->f_msgcount--;

-               *(int *)rp = f;
+               *(int *)rp++ = f;

        }
        return (0);
 }
        }
        return (0);
 }


@@ -474,11 +541,11 @@ unp_internalize(rights)
        register struct file *fp;
 
        rp = mtod(rights, struct file **);
        register struct file *fp;
 
        rp = mtod(rights, struct file **);

-       for (i = 0; i < oldfds; i++) {
+       for (i = 0; i < oldfds; i++)

                if (getf(*(int *)rp++) == 0)
                        return (EBADF);
        rp = mtod(rights, struct file **);
                if (getf(*(int *)rp++) == 0)
                        return (EBADF);
        rp = mtod(rights, struct file **);

-       for (i = 0; i < oldfds; i++)
+       for (i = 0; i < oldfds; i++) {

                fp = getf(*(int *)rp);
                *rp++ = fp;
                fp->f_count++;
                fp = getf(*(int *)rp);
                *rp++ = fp;
                fp->f_count++;


@@ -489,6 +556,7 @@ unp_internalize(rights)
 
 int    unp_defer, unp_gcing;
 int    unp_mark();
 
 int    unp_defer, unp_gcing;
 int    unp_mark();

+extern struct domain unixdomain;

 
 unp_gc()
 {
 
 unp_gc()
 {


@@ -519,8 +587,8 @@ restart:
                        if (fp->f_type != DTYPE_SOCKET)
                                continue;
                        so = (struct socket *)fp->f_data;
                        if (fp->f_type != DTYPE_SOCKET)
                                continue;
                        so = (struct socket *)fp->f_data;

-                       if (so->so_proto->pr_family != AF_UNIX ||
-                           (so->so_proto->pr_flags&PR_ADDR) == 0)
+                       if (so->so_proto->pr_domain != &unixdomain ||
+                           (so->so_proto->pr_flags&PR_RIGHTS) == 0)

                                continue;
                        if (so->so_rcv.sb_flags & SB_LOCK) {
                                sbwait(&so->so_rcv);
                                continue;
                        if (so->so_rcv.sb_flags & SB_LOCK) {
                                sbwait(&so->so_rcv);


@@ -541,34 +609,35 @@ restart:
        unp_gcing = 0;
 }
 
        unp_gcing = 0;
 }
 

-unp_scan(m, op)
-       register struct mbuf *m;
+unp_dispose(m)
+       struct mbuf *m;
+{
+       int unp_discard();
+
+       if (m)
+               unp_scan(m, unp_discard);
+}
+
+unp_scan(m0, op)
+       register struct mbuf *m0;

        int (*op)();
 {
        int (*op)();
 {

+       register struct mbuf *m;

        register struct file **rp;
        register int i;
        int qfds;
 
        register struct file **rp;
        register int i;
        int qfds;
 

-       while (m) {
-               m = m->m_next;
-               if (m == 0)
-                       goto bad;
-               if (m->m_len) {
-                       qfds = m->m_len / sizeof (struct file *);
-                       rp = mtod(m, struct file **);
-                       for (i = 0; i < qfds; i++)
-                               (*op)(*rp++);
-               }
-               do {
-                       m = m->m_next;
-                       if (m == 0)
-                               goto bad;
-               } while (m->m_act == 0);
-               m = m->m_next;
+       while (m0) {
+               for (m = m0; m; m = m->m_next)
+                       if (m->m_type == MT_RIGHTS && m->m_len) {
+                               qfds = m->m_len / sizeof (struct file *);
+                               rp = mtod(m, struct file **);
+                               for (i = 0; i < qfds; i++)
+                                       (*op)(*rp++);
+                               break;          /* XXX, but saves time */
+                       }
+               m0 = m0->m_act;

        }
        }

-       return;
-bad:
-       panic("unp_gcscan");

 }
 
 unp_mark(fp)
 }
 
 unp_mark(fp)


@@ -586,5 +655,5 @@ unp_discard(fp)
 {
 
        fp->f_msgcount--;
 {
 
        fp->f_msgcount--;

-       closef(fp, 0);
+       closef(fp);

 }
 }