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 e7f1fa2..be6163f 100644 (file)
--- a/usr/src/sys/sys/socket.h
+++ b/usr/src/sys/sys/socket.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1993, 1982198519861988
+ * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994

  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -30,11 +30,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)socket.h    8.1 (Berkeley) 6/2/93
+ *     @(#)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.


@@ -80,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 */

 };
 
 /*
 };
 
 /*


@@ -92,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 */


@@ -144,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


@@ -185,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 }, \


@@ -320,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_ */