[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.110 and 1.110.4.2

version 1.110, 2014/05/28 14:55:16 version 1.110.4.2, 2015/12/27 12:10:18
Line 107  typedef _BSD_SSIZE_T_ ssize_t;
Line 107  typedef _BSD_SSIZE_T_ ssize_t;
 #define SOCK_RAW        3               /* raw-protocol interface */  #define SOCK_RAW        3               /* raw-protocol interface */
 #define SOCK_RDM        4               /* reliably-delivered message */  #define SOCK_RDM        4               /* reliably-delivered message */
 #define SOCK_SEQPACKET  5               /* sequenced packet stream */  #define SOCK_SEQPACKET  5               /* sequenced packet stream */
   #define SOCK_CONN_DGRAM 6               /* connection-orientated datagram */
   #define SOCK_DCCP       SOCK_CONN_DGRAM
   
 #define SOCK_CLOEXEC    0x10000000      /* set close on exec on socket */  #define SOCK_CLOEXEC    0x10000000      /* set close on exec on socket */
 #define SOCK_NONBLOCK   0x20000000      /* set non blocking i/o socket */  #define SOCK_NONBLOCK   0x20000000      /* set non blocking i/o socket */
Line 240  struct sockproto {
Line 242  struct sockproto {
         u_short sp_family;              /* address family */          u_short sp_family;              /* address family */
         u_short sp_protocol;            /* protocol */          u_short sp_protocol;            /* protocol */
 };  };
   
   /*
    * we make the entire struct at least UCHAR_MAX + 1 in size since existing
    * use of sockaddr_un permits a path up to 253 bytes + '\0'.
    * sizeof(sb_len) + sizeof(sb_family) + 253 + '\0'
    */
   #define _SB_DATASIZE    254
   struct sockaddr_big {
       union {
           struct {
               __uint8_t   sb_len;
               sa_family_t sb_family;
               char        sb_data[_SB_DATASIZE];
           };
           uint64_t dummy; /* solicit natural alignment */
       };
   };
   
 #endif /* _KERNEL */  #endif /* _KERNEL */
   
 #if 1  #if 1
Line 341  struct sockcred {
Line 361  struct sockcred {
  * Compute size of a sockcred structure with groups.   * Compute size of a sockcred structure with groups.
  */   */
 #define SOCKCREDSIZE(ngrps) \  #define SOCKCREDSIZE(ngrps) \
         (sizeof(struct sockcred) + (sizeof(gid_t) * \          (/*CONSTCOND*/sizeof(struct sockcred) + (sizeof(gid_t) * \
             ((ngrps) ? ((ngrps) - 1) : 0)))              ((ngrps) ? ((ngrps) - 1) : 0)))
 #endif /* _NETBSD_SOURCE */  #endif /* _NETBSD_SOURCE */
   
Line 470  struct kinfo_pcb {
Line 490  struct kinfo_pcb {
 #define SOMAXCONN       128  #define SOMAXCONN       128
 #endif  #endif
   
   #include <sys/cdefs.h>
   
 /*  /*
  * Message header for recvmsg and sendmsg calls.   * Message header for recvmsg and sendmsg calls.
  * Used value-result for recvmsg, value only for sendmsg.   * Used value-result for recvmsg, value only for sendmsg.
Line 499  struct msghdr {
Line 521  struct msghdr {
 #define MSG_CMSG_CLOEXEC 0x0800         /* close on exec receiving fd */  #define MSG_CMSG_CLOEXEC 0x0800         /* close on exec receiving fd */
 #define MSG_NBIO        0x1000          /* use non-blocking I/O */  #define MSG_NBIO        0x1000          /* use non-blocking I/O */
 #define MSG_WAITFORONE  0x2000          /* recvmmsg() wait for one message */  #define MSG_WAITFORONE  0x2000          /* recvmmsg() wait for one message */
   #define MSG_NOTIFICATION 0x4000         /* SCTP notification */
   
 struct mmsghdr {  struct mmsghdr {
         struct msghdr msg_hdr;          struct msghdr msg_hdr;
Line 526  struct cmsghdr {
Line 549  struct cmsghdr {
 /* followed by  u_char  cmsg_data[]; */  /* followed by  u_char  cmsg_data[]; */
 };  };
   
 /* given pointer to struct cmsghdr, return pointer to data */  
 #define CMSG_DATA(cmsg) \  
         ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))  
 #define CCMSG_DATA(cmsg) \  
         ((const u_char *)(const void *)(cmsg) + \  
         __CMSG_ALIGN(sizeof(struct cmsghdr)))  
   
 /*  /*
  * Alignment requirement for CMSG struct manipulation.   * Alignment requirement for CMSG struct manipulation.
  * This basically behaves the same as ALIGN() ARCH/include/param.h.   * This basically behaves the same as ALIGN() ARCH/include/param.h.
Line 543  struct cmsghdr {
Line 559  struct cmsghdr {
  * changes in ALIGNBYTES.   * changes in ALIGNBYTES.
  */   */
 #define __CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES)  #define __CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES)
   
 #ifdef _KERNEL  #ifdef _KERNEL
 #define CMSG_ALIGN(n)   __CMSG_ALIGN(n)  #define CMSG_ALIGN(n)   __CMSG_ALIGN(n)
 #endif  #endif
   
   #define __CMSG_ASIZE    __CMSG_ALIGN(sizeof(struct cmsghdr))
   #define __CMSG_MSGNEXT(cmsg) \
       (__CASTV(char *, cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len))
   #define __CMSG_MSGEND(mhdr) \
       (__CASTV(char *, (mhdr)->msg_control) + (mhdr)->msg_controllen)
   
   /* given pointer to struct cmsghdr, return pointer to data */
   #define CMSG_DATA(cmsg) (__CASTV(u_char *, cmsg) + __CMSG_ASIZE)
   #define CCMSG_DATA(cmsg) (__CASTCV(const u_char *, cmsg) + __CMSG_ASIZE)
   
 /* 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) \
         (((char *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \      __CASTV(struct cmsghdr *,  \
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \          __CMSG_MSGNEXT(cmsg) + __CMSG_ASIZE > __CMSG_MSGEND(mhdr) ? 0 : \
             (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \          __CMSG_MSGNEXT(cmsg))
             (struct cmsghdr *)0 : \  
             (struct cmsghdr *)(void *)((char *)(cmsg) + \  
                 __CMSG_ALIGN((cmsg)->cmsg_len)))  
   
 /*  /*
  * RFC 2292 requires to check msg_controllen, in case that the kernel returns   * RFC 2292 requires to check msg_controllen, in case that the kernel returns
  * an empty list for some reasons.   * an empty list for some reasons.
  */   */
 #define CMSG_FIRSTHDR(mhdr) \  #define CMSG_FIRSTHDR(mhdr) \
         ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \      __CASTV(struct cmsghdr *, \
          (struct cmsghdr *)(mhdr)->msg_control : \          (mhdr)->msg_controllen < sizeof(struct cmsghdr) ? 0 : \
          (struct cmsghdr *)0)          (mhdr)->msg_control)
   
 #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))  #define CMSG_SPACE(l)   (__CMSG_ASIZE + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))  #define CMSG_LEN(l)     (__CMSG_ASIZE + (l))
   
 /* "Socket"-level control message types: */  /* "Socket"-level control message types: */
 #define SCM_RIGHTS      0x01            /* access rights (array of int) */  #define SCM_RIGHTS      0x01            /* access rights (array of int) */
Line 583  struct cmsghdr {
Line 607  struct cmsghdr {
 #define SHUT_WR         1               /* Disallow further sends. */  #define SHUT_WR         1               /* Disallow further sends. */
 #define SHUT_RDWR       2               /* Disallow further sends/receives. */  #define SHUT_RDWR       2               /* Disallow further sends/receives. */
   
 #include <sys/cdefs.h>  
   
 #ifdef  _KERNEL  #ifdef  _KERNEL
 static inline socklen_t  static inline socklen_t
 sockaddr_getlen(const struct sockaddr *sa)  sockaddr_getlen(const struct sockaddr *sa)
Line 605  const struct sockaddr *sockaddr_any_by_f
Line 627  const struct sockaddr *sockaddr_any_by_f
 const void *sockaddr_anyaddr(const struct sockaddr *, socklen_t *);  const void *sockaddr_anyaddr(const struct sockaddr *, socklen_t *);
 int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);  int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
 struct sockaddr *sockaddr_dup(const struct sockaddr *, int);  struct sockaddr *sockaddr_dup(const struct sockaddr *, int);
 void sockaddr_format(const struct sockaddr *, char *, size_t);  int sockaddr_format(const struct sockaddr *, char *, size_t);
 void sockaddr_free(struct sockaddr *);  void sockaddr_free(struct sockaddr *);
 __END_DECLS  __END_DECLS
 #endif /* _KERNEL */  #endif /* _KERNEL */

Legend:
Removed from v.1.110  
changed lines
  Added in v.1.110.4.2

CVSweb <webmaster@jp.NetBSD.org>