[BACK]Return to socket.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / sys

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/sys/socket.h between version 1.59 and 1.59.2.4

version 1.59, 2000/10/04 08:59:16 version 1.59.2.4, 2001/10/22 20:42:12
Line 86  typedef __socklen_t socklen_t;
Line 86  typedef __socklen_t socklen_t;
 #define socklen_t       __socklen_t  #define socklen_t       __socklen_t
 #endif  #endif
   
   #include <machine/ansi.h>
   
   #ifdef  _BSD_SIZE_T_
   typedef _BSD_SIZE_T_    size_t;
   #undef  _BSD_SIZE_T_
   #endif
   
   #ifdef  _BSD_SSIZE_T_
   typedef _BSD_SSIZE_T_   ssize_t;
   #undef  _BSD_SSIZE_T_
   #endif
   
   #include <sys/uio.h>
   
 /*  /*
  * Socket types.   * Socket types.
  */   */
Line 189  struct linger {
Line 203  struct linger {
  * addresses.   * addresses.
  */   */
 struct sockaddr {  struct sockaddr {
         u_char          sa_len;         /* total length */          __uint8_t       sa_len;         /* total length */
         sa_family_t     sa_family;      /* address family */          sa_family_t     sa_family;      /* address family */
         char            sa_data[14];    /* actually longer; address value */          char            sa_data[14];    /* actually longer; address value */
 };  };
Line 210  struct sockproto {
Line 224  struct sockproto {
  * RFC 2553: protocol-independent placeholder for socket addresses   * RFC 2553: protocol-independent placeholder for socket addresses
  */   */
 #define _SS_MAXSIZE     128  #define _SS_MAXSIZE     128
 #define _SS_ALIGNSIZE   (sizeof(int64_t))  #define _SS_ALIGNSIZE   (sizeof(__int64_t))
 #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(u_char) * 2)  #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - 2)
 #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \  #define _SS_PAD2SIZE    (_SS_MAXSIZE - 2 - \
                                 _SS_PAD1SIZE - _SS_ALIGNSIZE)                                  _SS_PAD1SIZE - _SS_ALIGNSIZE)
   
 #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500  #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {  struct sockaddr_storage {
         u_char          ss_len;         /* address length */          __uint8_t       ss_len;         /* address length */
         sa_family_t     ss_family;      /* address family */          sa_family_t     ss_family;      /* address family */
         char            __ss_pad1[_SS_PAD1SIZE];          char            __ss_pad1[_SS_PAD1SIZE];
         int64_t      __ss_align;/* force desired structure storage alignment */          __int64_t     __ss_align;/* force desired structure storage alignment */
         char            __ss_pad2[_SS_PAD2SIZE];          char            __ss_pad2[_SS_PAD2SIZE];
 };  };
 #endif /* !_XOPEN_SOURCE || ... */  #endif /* !_XOPEN_SOURCE || ... */
Line 272  struct sockaddr_storage {
Line 286  struct sockaddr_storage {
 #define PF_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
 #if !defined(_XOPEN_SOURCE)  #if !defined(_XOPEN_SOURCE)
   
   #ifndef gid_t
   typedef __gid_t         gid_t;          /* group id */
   #define gid_t           __gid_t
   #endif
   
   #ifndef uid_t
   typedef __uid_t         uid_t;          /* user id */
   #define uid_t           __uid_t
   #endif
   
 /*  /*
  * Socket credentials.   * Socket credentials.
  */   */
Line 425  struct cmsghdr {
Line 450  struct cmsghdr {
   
 /* given pointer to struct cmsghdr, return pointer to next cmsghdr */  /* given pointer to struct cmsghdr, return pointer to next cmsghdr */
 #define CMSG_NXTHDR(mhdr, cmsg) \  #define CMSG_NXTHDR(mhdr, cmsg) \
         (((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \          (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
             (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)NULL : \              (struct cmsghdr *)NULL : \
             (struct cmsghdr *)((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len)))              (struct cmsghdr *)((__caddr_t)(cmsg) + \
                   __CMSG_ALIGN((cmsg)->cmsg_len)))
   
 #define CMSG_FIRSTHDR(mhdr)     ((struct cmsghdr *)(mhdr)->msg_control)  /*
    * RFC 2292 requires to check msg_controllen, in case that the kernel returns
    * an empty list for some reasons.
    */
   #define CMSG_FIRSTHDR(mhdr) \
           ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
            (struct cmsghdr *)(mhdr)->msg_control : \
            (struct cmsghdr *)NULL)
   
 #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))  #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))  #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))
Line 455  struct cmsghdr {
Line 488  struct cmsghdr {
  * 4.3 compat sockaddr, move to compat file later   * 4.3 compat sockaddr, move to compat file later
  */   */
 struct osockaddr {  struct osockaddr {
         u_short sa_family;              /* address family */          __uint16_t      sa_family;      /* address family */
         char    sa_data[14];            /* up to 14 bytes of direct address */          char            sa_data[14];    /* up to 14 bytes of direct address */
 };  };
   
 /*  /*
  * 4.3-compat message header (move to compat file later).   * 4.3-compat message header (move to compat file later).
  */   */
 struct omsghdr {  struct omsghdr {
         caddr_t msg_name;               /* optional address */          __caddr_t       msg_name;       /* optional address */
         int     msg_namelen;            /* size of address */          int             msg_namelen;    /* size of address */
         struct  iovec *msg_iov;         /* scatter/gather array */          struct iovec    *msg_iov;       /* scatter/gather array */
         int     msg_iovlen;             /* # elements in msg_iov */          int             msg_iovlen;     /* # elements in msg_iov */
         caddr_t msg_accrights;          /* access rights sent/received */          __caddr_t       msg_accrights;  /* access rights sent/received */
         int     msg_accrightslen;          int             msg_accrightslen;
 };  };
 #endif  #endif
   
Line 498  ssize_t sendto __P((int, const void *,
Line 531  ssize_t sendto __P((int, const void *,
 ssize_t sendmsg __P((int, const struct msghdr *, int));  ssize_t sendmsg __P((int, const struct msghdr *, int));
 int     setsockopt __P((int, int, int, const void *, socklen_t));  int     setsockopt __P((int, int, int, const void *, socklen_t));
 int     shutdown __P((int, int));  int     shutdown __P((int, int));
   int     sockatmark __P((int));
 int     socket __P((int, int, int));  int     socket __P((int, int, int));
 int     socketpair __P((int, int, int, int *));  int     socketpair __P((int, int, int, int *));
 __END_DECLS  __END_DECLS
 #else  
 #ifdef COMPAT_OLDSOCK  
 #define MSG_COMPAT      0x8000  
 #endif  
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   
 #endif /* !_SYS_SOCKET_H_ */  #endif /* !_SYS_SOCKET_H_ */

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.59.2.4

CVSweb <webmaster@jp.NetBSD.org>