merge in vnode changes

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

diff --git a/usr/src/sys/kern/sys_socket.c b/usr/src/sys/kern/sys_socket.c
index 377bf24..3e69d8d 100644 (file)
--- a/usr/src/sys/kern/sys_socket.c
+++ b/usr/src/sys/kern/sys_socket.c
@@ -1,17 +1,34 @@
-/*     sys_socket.c    4.4     83/06/12        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/file.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
-#include "../h/stat.h"
+/*
+ * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)sys_socket.c        7.4 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "systm.h"
+#include "dir.h"
+#include "user.h"
+#include "file.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "ioctl.h"
+#include "uio.h"
+#include "stat.h"

 
 #include "../net/if.h"
 #include "../net/route.h"
 
 #include "../net/if.h"
 #include "../net/route.h"


@@ -27,9 +44,8 @@ soo_rw(fp, rw, uio)
 {
        int soreceive(), sosend();
 
 {
        int soreceive(), sosend();
 

-       return (
-           (*(rw==UIO_READ?soreceive:sosend))
-             ((struct socket *)fp->f_data, 0, uio, 0, 0));
+       return ((*(rw == UIO_READ ? soreceive : sosend))
+             ((struct socket *)fp->f_data, 0, uio, 0, 0, 0));

 }
 
 soo_ioctl(fp, cmd, data)
 }
 
 soo_ioctl(fp, cmd, data)


@@ -60,11 +76,11 @@ soo_ioctl(fp, cmd, data)
                return (0);
 
        case SIOCSPGRP:
                return (0);
 
        case SIOCSPGRP:

-               so->so_pgrp = *(int *)data;
+               so->so_pgid = *(int *)data;

                return (0);
 
        case SIOCGPGRP:
                return (0);
 
        case SIOCGPGRP:

-               *(int *)data = so->so_pgrp;
+               *(int *)data = so->so_pgid;

                return (0);
 
        case SIOCATMARK:
                return (0);
 
        case SIOCATMARK:


@@ -78,7 +94,7 @@ soo_ioctl(fp, cmd, data)
         */
 #define        cmdbyte(x)      (((x) >> 8) & 0xff)
        if (cmdbyte(cmd) == 'i')
         */
 #define        cmdbyte(x)      (((x) >> 8) & 0xff)
        if (cmdbyte(cmd) == 'i')

-               return (ifioctl(cmd, data));
+               return (ifioctl(so, cmd, data));

        if (cmdbyte(cmd) == 'r')
                return (rtioctl(cmd, data));
        return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, 
        if (cmdbyte(cmd) == 'r')
                return (rtioctl(cmd, data));
        return ((*so->so_proto->pr_usrreq)(so, PRU_CONTROL, 


@@ -109,49 +125,39 @@ soo_select(fp, which)
                }
                sbselqueue(&so->so_snd);
                break;
                }
                sbselqueue(&so->so_snd);
                break;

+
+       case 0:
+               if (so->so_oobmark ||
+                   (so->so_state & SS_RCVATMARK)) {
+                       splx(s);
+                       return (1);
+               }
+               sbselqueue(&so->so_rcv);
+               break;

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

+/*ARGSUSED*/

 soo_stat(so, ub)
        register struct socket *so;
        register struct stat *ub;
 {
 
        bzero((caddr_t)ub, sizeof (*ub));
 soo_stat(so, ub)
        register struct socket *so;
        register struct stat *ub;
 {
 
        bzero((caddr_t)ub, sizeof (*ub));

-#ifdef notdef

        return ((*so->so_proto->pr_usrreq)(so, PRU_SENSE,
            (struct mbuf *)ub, (struct mbuf *)0, 
            (struct mbuf *)0));
        return ((*so->so_proto->pr_usrreq)(so, PRU_SENSE,
            (struct mbuf *)ub, (struct mbuf *)0, 
            (struct mbuf *)0));

-#endif
-       return (0);

 }
 
 soo_close(fp)
        struct file *fp;
 {
 }
 
 soo_close(fp)
        struct file *fp;
 {

-       int error = soclose((struct socket *)fp->f_data);
+       int error = 0;

 
 

+       if (fp->f_data)
+               error = soclose((struct socket *)fp->f_data);

        fp->f_data = 0;
        return (error);
 }
        fp->f_data = 0;
        return (error);
 }

-
-/*ARGSUSED*/
-soo_lock(so, pf, how)
-       struct socket *so;
-       u_char *pf;
-       int how;
-{
-
-       return (EOPNOTSUPP);
-}
-
-/*ARGSUSED*/
-soo_unlock(so, flags)
-       struct socket *so;
-       int flags;
-{
-
-       panic("soo_unlock");
-}