[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.4.5 and 1.111

version 1.110.4.5, 2017/08/28 17:53:16 version 1.111, 2014/12/02 19:38:16
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 221  struct accept_filter_arg {
Line 219  struct accept_filter_arg {
 #define AF_IEEE80211    32              /* IEEE80211 */  #define AF_IEEE80211    32              /* IEEE80211 */
 #define AF_MPLS         33              /* MultiProtocol Label Switching */  #define AF_MPLS         33              /* MultiProtocol Label Switching */
 #define AF_ROUTE        34              /* Internal Routing Protocol */  #define AF_ROUTE        34              /* Internal Routing Protocol */
 #define AF_CAN          35  #define AF_MAX          35
 #define AF_MAX          36  
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 243  struct sockproto {
Line 240  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 331  struct sockaddr_storage {
Line 310  struct sockaddr_storage {
 #define PF_BLUETOOTH    AF_BLUETOOTH  #define PF_BLUETOOTH    AF_BLUETOOTH
 #define PF_MPLS         AF_MPLS  #define PF_MPLS         AF_MPLS
 #define PF_ROUTE        AF_ROUTE  #define PF_ROUTE        AF_ROUTE
 #define PF_CAN          AF_CAN  
   
 #define PF_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
   
 #ifndef pid_t  
 typedef __pid_t         pid_t;          /* process id */  
 #define pid_t           __pid_t  
 #endif  
   
 #ifndef gid_t  #ifndef gid_t
 typedef __gid_t         gid_t;          /* group id */  typedef __gid_t         gid_t;          /* group id */
 #define gid_t           __gid_t  #define gid_t           __gid_t
Line 356  typedef __uid_t  uid_t;  /* user id */
Line 329  typedef __uid_t  uid_t;  /* user id */
  * Socket credentials.   * Socket credentials.
  */   */
 struct sockcred {  struct sockcred {
         pid_t   sc_pid;                 /* process id */  
         uid_t   sc_uid;                 /* real user id */          uid_t   sc_uid;                 /* real user id */
         uid_t   sc_euid;                /* effective user id */          uid_t   sc_euid;                /* effective user id */
         gid_t   sc_gid;                 /* real group id */          gid_t   sc_gid;                 /* real group id */
Line 369  struct sockcred {
Line 341  struct sockcred {
  * Compute size of a sockcred structure with groups.   * Compute size of a sockcred structure with groups.
  */   */
 #define SOCKCREDSIZE(ngrps) \  #define SOCKCREDSIZE(ngrps) \
         (/*CONSTCOND*/sizeof(struct sockcred) + (sizeof(gid_t) * \          (sizeof(struct sockcred) + (sizeof(gid_t) * \
             ((ngrps) ? ((ngrps) - 1) : 0)))              ((ngrps) ? ((ngrps) - 1) : 0)))
 #endif /* _NETBSD_SOURCE */  #endif /* _NETBSD_SOURCE */
   
Line 474  struct kinfo_pcb {
Line 446  struct kinfo_pcb {
  *      Fifth: type of info, defined below   *      Fifth: type of info, defined below
  *      Sixth: flag(s) to mask with for NET_RT_FLAGS   *      Sixth: flag(s) to mask with for NET_RT_FLAGS
  */   */
 #define NET_RT_DUMP             1       /* dump; may limit to a.f. */  #define NET_RT_DUMP     1               /* dump; may limit to a.f. */
 #define NET_RT_FLAGS            2       /* by flags, e.g. RESOLVING */  #define NET_RT_FLAGS    2               /* by flags, e.g. RESOLVING */
 #define NET_RT_OOOIFLIST        3       /* old NET_RT_IFLIST (pre 1.5) */  #define NET_RT_OOIFLIST 3               /* old NET_RT_IFLIST (pre 1.5) */
 #define NET_RT_OOIFLIST         4       /* old NET_RT_IFLIST (pre-64bit time) */  #define NET_RT_OIFLIST  4               /* survey interface list */
 #define NET_RT_OIFLIST          5       /* old NET_RT_IFLIST (pre 8.0) */  #define NET_RT_IFLIST   5
 #define NET_RT_IFLIST           6       /* survey interface list */  #define NET_RT_MAXID    6
 #define NET_RT_MAXID            7  
   
 #define CTL_NET_RT_NAMES { \  #define CTL_NET_RT_NAMES { \
         { 0, 0 }, \          { 0, 0 }, \
Line 499  struct kinfo_pcb {
Line 470  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 530  struct msghdr {
Line 499  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 558  struct cmsghdr {
Line 526  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 568  struct cmsghdr {
Line 543  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) \
     __CASTV(struct cmsghdr *,  \          (((char *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
         __CMSG_MSGNEXT(cmsg) + __CMSG_ASIZE > __CMSG_MSGEND(mhdr) ? 0 : \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
         __CMSG_MSGNEXT(cmsg))              (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
               (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) \
     __CASTV(struct cmsghdr *, \          ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
         (mhdr)->msg_controllen < sizeof(struct cmsghdr) ? 0 : \           (struct cmsghdr *)(mhdr)->msg_control : \
         (mhdr)->msg_control)           (struct cmsghdr *)0)
   
 #define CMSG_SPACE(l)   (__CMSG_ASIZE + __CMSG_ALIGN(l))  #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)     (__CMSG_ASIZE + (l))  #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (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) */
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 /*                      0x02               timestamp (struct timeval50) */  /*                      0x02               timestamp (struct timeval50) */
 /*                      0x04               credentials (struct sockcred70) */  #define SCM_CREDS       0x04            /* credentials (struct sockcred) */
 #define SCM_TIMESTAMP   0x08            /* timestamp (struct timeval) */  #define SCM_TIMESTAMP   0x08            /* timestamp (struct timeval) */
 #define SCM_CREDS       0x10            /* credentials (struct sockcred) */  
 #endif  #endif
   
 /*  /*
Line 617  struct cmsghdr {
Line 583  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 625  sockaddr_getlen(const struct sockaddr *s
Line 593  sockaddr_getlen(const struct sockaddr *s
 }  }
   
 __BEGIN_DECLS  __BEGIN_DECLS
 socklen_t sockaddr_getsize_by_family(sa_family_t);  
 struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,  struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,
     const struct sockaddr *);      const struct sockaddr *);
 struct sockaddr *sockaddr_externalize(struct sockaddr *, socklen_t,  struct sockaddr *sockaddr_externalize(struct sockaddr *, socklen_t,
Line 634  struct sockaddr *sockaddr_alloc(sa_famil
Line 601  struct sockaddr *sockaddr_alloc(sa_famil
 const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *);  const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *);
 void *sockaddr_addr(struct sockaddr *, socklen_t *);  void *sockaddr_addr(struct sockaddr *, socklen_t *);
 const struct sockaddr *sockaddr_any(const struct sockaddr *);  const struct sockaddr *sockaddr_any(const struct sockaddr *);
 const struct sockaddr *sockaddr_any_by_family(sa_family_t);  const struct sockaddr *sockaddr_any_by_family(int);
 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);
Line 647  __END_DECLS
Line 614  __END_DECLS
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int     accept(int, struct sockaddr * __restrict, socklen_t * __restrict);  int     accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int     accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int);  
 int     bind(int, const struct sockaddr *, socklen_t);  int     bind(int, const struct sockaddr *, socklen_t);
 int     connect(int, const struct sockaddr *, socklen_t);  int     connect(int, const struct sockaddr *, socklen_t);
 int     getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);  int     getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);

Legend:
Removed from v.1.110.4.5  
changed lines
  Added in v.1.111

CVSweb <webmaster@jp.NetBSD.org>