BSD 4_4_Lite2 release

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

diff --git a/usr/src/sys/sys/socket.h b/usr/src/sys/sys/socket.h
index 7904e2d..be6163f 100644 (file)
--- a/usr/src/sys/sys/socket.h
+++ b/usr/src/sys/sys/socket.h
@@ -1,14 +1,40 @@
 /*
 /*

- * Copyright (c) 1982,1985,1986,1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  *

- *     @(#)socket.h    7.22 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)socket.h    8.6 (Berkeley) 5/3/95

  */
 
  */
 

-#ifndef _SOCKET_H_
-#define        _SOCKET_H_
+#ifndef _SYS_SOCKET_H_
+#define        _SYS_SOCKET_H_

 
 /*
  * Definitions related to sockets: types, address families, options.
 
 /*
  * Definitions related to sockets: types, address families, options.


@@ -54,7 +80,7 @@
  */
 struct linger {
        int     l_onoff;                /* option on/off */
  */
 struct linger {
        int     l_onoff;                /* option on/off */

-       int     l_linger;               /* linger time */
+       int     l_linger;               /* linger time in seconds */

 };
 
 /*
 };
 
 /*


@@ -66,7 +92,8 @@ struct        linger {
  * Address families.
  */
 #define        AF_UNSPEC       0               /* unspecified */
  * Address families.
  */
 #define        AF_UNSPEC       0               /* unspecified */

-#define        AF_UNIX         1               /* local to host (pipes, portals) */
+#define        AF_LOCAL        1               /* local to host (pipes, portals) */
+#define        AF_UNIX         AF_LOCAL        /* backward compatibility */

 #define        AF_INET         2               /* internetwork: UDP, TCP, etc. */
 #define        AF_IMPLINK      3               /* arpanet imp addresses */
 #define        AF_PUP          4               /* pup protocols: e.g. BSP */
 #define        AF_INET         2               /* internetwork: UDP, TCP, etc. */
 #define        AF_IMPLINK      3               /* arpanet imp addresses */
 #define        AF_PUP          4               /* pup protocols: e.g. BSP */


@@ -118,7 +145,8 @@ struct sockproto {
  * Protocol families, same as address families for now.
  */
 #define        PF_UNSPEC       AF_UNSPEC
  * Protocol families, same as address families for now.
  */
 #define        PF_UNSPEC       AF_UNSPEC

-#define        PF_UNIX         AF_UNIX
+#define        PF_LOCAL        AF_LOCAL
+#define        PF_UNIX         PF_LOCAL        /* backward compatibility */

 #define        PF_INET         AF_INET
 #define        PF_IMPLINK      AF_IMPLINK
 #define        PF_PUP          AF_PUP
 #define        PF_INET         AF_INET
 #define        PF_IMPLINK      AF_IMPLINK
 #define        PF_PUP          AF_PUP


@@ -159,7 +187,7 @@ struct sockproto {
 
 #define CTL_NET_NAMES { \
        { 0, 0 }, \
 
 #define CTL_NET_NAMES { \
        { 0, 0 }, \

-       { "unix", CTLTYPE_NODE }, \
+       { "local", CTLTYPE_NODE }, \

        { "inet", CTLTYPE_NODE }, \
        { "implink", CTLTYPE_NODE }, \
        { "pup", CTLTYPE_NODE }, \
        { "inet", CTLTYPE_NODE }, \
        { "implink", CTLTYPE_NODE }, \
        { "pup", CTLTYPE_NODE }, \


@@ -247,10 +275,10 @@ struct cmsghdr {
 /* followed by u_char  cmsg_data[]; */
 };
 
 /* followed by u_char  cmsg_data[]; */
 };
 

-/* given pointer to struct adatahdr, return pointer to data */
+/* given pointer to struct cmsghdr, return pointer to data */

 #define        CMSG_DATA(cmsg)         ((u_char *)((cmsg) + 1))
 
 #define        CMSG_DATA(cmsg)         ((u_char *)((cmsg) + 1))
 

-/* given pointer to struct adatahdr, return pointer to next adatahdr */
+/* given pointer to struct cmsghdr, return pointer to next cmsghdr */

 #define        CMSG_NXTHDR(mhdr, cmsg) \
        (((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
            (mhdr)->msg_control + (mhdr)->msg_controllen) ? \
 #define        CMSG_NXTHDR(mhdr, cmsg) \
        (((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \
            (mhdr)->msg_control + (mhdr)->msg_controllen) ? \


@@ -294,18 +322,18 @@ int       getpeername __P((int, struct sockaddr *, int *));
 int    getsockname __P((int, struct sockaddr *, int *));
 int    getsockopt __P((int, int, int, void *, int *));
 int    listen __P((int, int));
 int    getsockname __P((int, struct sockaddr *, int *));
 int    getsockopt __P((int, int, int, void *, int *));
 int    listen __P((int, int));

-int    recv __P((int, void *, int, int));
-int    recvfrom __P((int, void *, int, int,
-               struct sockaddr *, int *));
-int    recvmsg __P((int, struct msghdr *, int));
-int    send __P((int, const void *, int, int));
-int    sendto __P((int, const void *, int, int, const struct sockaddr *, int));
-int    sendmsg __P((int, const struct msghdr *, int));
+ssize_t        recv __P((int, void *, size_t, int));
+ssize_t        recvfrom __P((int, void *, size_t, int, struct sockaddr *, int *));
+ssize_t        recvmsg __P((int, struct msghdr *, int));
+ssize_t        send __P((int, const void *, size_t, int));
+ssize_t        sendto __P((int, const void *,
+           size_t, int, const struct sockaddr *, int));
+ssize_t        sendmsg __P((int, const struct msghdr *, int));

 int    setsockopt __P((int, int, int, const void *, int));
 int    shutdown __P((int, int));
 int    socket __P((int, int, int));
 int    socketpair __P((int, int, int, int *));
 __END_DECLS
 
 int    setsockopt __P((int, int, int, const void *, int));
 int    shutdown __P((int, int));
 int    socket __P((int, int, int));
 int    socketpair __P((int, int, int, int *));
 __END_DECLS
 

-#endif /* !KERNEL */
-#endif /* !_SOCKET_H_ */
+#endif /* !KERNEL */
+#endif /* !_SYS_SOCKET_H_ */