BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / sys / socketvar.h

diff --git a/usr/src/sys/sys/socketvar.h b/usr/src/sys/sys/socketvar.h
index caa81e2..d8b6ac5 100644 (file)
--- a/usr/src/sys/sys/socketvar.h
+++ b/usr/src/sys/sys/socketvar.h
@@ -1,23 +1,36 @@
-/*
- * Copyright (c) 1982, 1986, 1990 Regents of the University of California.
+/*-
+ * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may 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
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  *
  *

- *     @(#)socketvar.h 7.11 (Berkeley) 6/30/90
+ *     @(#)socketvar.h 7.17 (Berkeley) 5/5/91

  */
 
 /*
  */
 
 /*


@@ -152,7 +165,7 @@ struct socket {
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb) ((sb)->sb_flags & SB_LOCK ? sb_lock(sb) : \
  * Returns error without lock if sleep is interrupted.
  */
 #define sblock(sb) ((sb)->sb_flags & SB_LOCK ? sb_lock(sb) : \

-               ((sb)->sb_flags |= SB_LOCK), 0)
+               ((sb)->sb_flags |= SB_LOCK, 0))

 
 /* release lock on sockbuf sb */
 #define        sbunlock(sb) { \
 
 /* release lock on sockbuf sb */
 #define        sbunlock(sb) { \


@@ -170,8 +183,17 @@ struct socket {
 u_long sb_max;
 /* to catch callers missing new second argument to sonewconn: */
 #define        sonewconn(head, connstatus)     sonewconn1((head), (connstatus))
 u_long sb_max;
 /* to catch callers missing new second argument to sonewconn: */
 #define        sonewconn(head, connstatus)     sonewconn1((head), (connstatus))

-struct socket *sonewconn1();
+struct socket *sonewconn1 __P((struct socket *head, int connstatus));

 
 /* strings for sleep message: */
 extern char netio[], netcon[], netcls[];
 
 /* strings for sleep message: */
 extern char netio[], netcon[], netcls[];

+
+/*
+ * File operations on sockets.
+ */
+int    soo_read __P((struct file *fp, struct uio *uio, struct ucred *cred));
+int    soo_write __P((struct file *fp, struct uio *uio, struct ucred *cred));
+int    soo_ioctl __P((struct file *fp, int com, caddr_t data, struct proc *p));
+int    soo_select __P((struct file *fp, int which, struct proc *p));
+int    soo_close __P((struct file *fp, struct proc *p));

 #endif
 #endif