[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.89.22.2 and 1.100.2.3

version 1.89.22.2, 2008/11/01 21:22:28 version 1.100.2.3, 2014/05/22 11:41:18
Line 97  typedef _BSD_SSIZE_T_ ssize_t;
Line 97  typedef _BSD_SSIZE_T_ ssize_t;
 #endif  #endif
   
 #include <sys/uio.h>  #include <sys/uio.h>
   #include <sys/sigtypes.h>
   
 /*  /*
  * Socket types.   * Socket types.
Line 107  typedef _BSD_SSIZE_T_ ssize_t;
Line 108  typedef _BSD_SSIZE_T_ ssize_t;
 #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_CLOEXEC    0x10000000      /* set close on exec on socket */
   #define SOCK_NONBLOCK   0x20000000      /* set non blocking i/o socket */
   #define SOCK_NOSIGPIPE  0x40000000      /* don't send sigpipe */
   #define SOCK_FLAGS_MASK 0xf0000000      /* flags mask */
   
 /*  /*
  * Option flags per-socket.   * Option flags per-socket.
  */   */
Line 120  typedef _BSD_SSIZE_T_ ssize_t;
Line 126  typedef _BSD_SSIZE_T_ ssize_t;
 #define SO_LINGER       0x0080          /* linger on close if data present */  #define SO_LINGER       0x0080          /* linger on close if data present */
 #define SO_OOBINLINE    0x0100          /* leave received OOB data in line */  #define SO_OOBINLINE    0x0100          /* leave received OOB data in line */
 #define SO_REUSEPORT    0x0200          /* allow local address & port reuse */  #define SO_REUSEPORT    0x0200          /* allow local address & port reuse */
 #define SO_TIMESTAMP    0x0400          /* timestamp received dgram traffic */  /*      SO_OTIMESTAMP   0x0400          */
   #define SO_NOSIGPIPE    0x0800          /* no SIGPIPE from EPIPE */
 #define SO_ACCEPTFILTER 0x1000          /* there is an accept filter */  #define SO_ACCEPTFILTER 0x1000          /* there is an accept filter */
   #define SO_TIMESTAMP    0x2000          /* timestamp received dgram traffic */
   
   
 /*  /*
Line 131  typedef _BSD_SSIZE_T_ ssize_t;
Line 139  typedef _BSD_SSIZE_T_ ssize_t;
 #define SO_RCVBUF       0x1002          /* receive buffer size */  #define SO_RCVBUF       0x1002          /* receive buffer size */
 #define SO_SNDLOWAT     0x1003          /* send low-water mark */  #define SO_SNDLOWAT     0x1003          /* send low-water mark */
 #define SO_RCVLOWAT     0x1004          /* receive low-water mark */  #define SO_RCVLOWAT     0x1004          /* receive low-water mark */
 #define SO_SNDTIMEO     0x1005          /* send timeout */  /* SO_OSNDTIMEO         0x1005 */
 #define SO_RCVTIMEO     0x1006          /* receive timeout */  /* SO_ORCVTIMEO         0x1006 */
 #define SO_ERROR        0x1007          /* get error status and clear */  #define SO_ERROR        0x1007          /* get error status and clear */
 #define SO_TYPE         0x1008          /* get socket type */  #define SO_TYPE         0x1008          /* get socket type */
 #define SO_OVERFLOWED   0x1009          /* datagrams: return packets dropped */  #define SO_OVERFLOWED   0x1009          /* datagrams: return packets dropped */
Line 141  typedef _BSD_SSIZE_T_ ssize_t;
Line 149  typedef _BSD_SSIZE_T_ ssize_t;
                                          * kernel removes header and supplies                                           * kernel removes header and supplies
                                          * payload                                           * payload
                                          */                                           */
   #define SO_SNDTIMEO     0x100b          /* send timeout */
   #define SO_RCVTIMEO     0x100c          /* receive timeout */
 /*  /*
  * Structure used for manipulating linger option.   * Structure used for manipulating linger option.
  */   */
Line 163  struct accept_filter_arg {
Line 173  struct accept_filter_arg {
  * Address families.   * Address families.
  */   */
 #define AF_UNSPEC       0               /* unspecified */  #define AF_UNSPEC       0               /* unspecified */
 #define AF_LOCAL        1               /* local to host (pipes, portals) */  #define AF_LOCAL        1               /* local to host */
 #define AF_UNIX         AF_LOCAL        /* backward compatibility */  #define AF_UNIX         AF_LOCAL        /* backward compatibility */
 #define AF_INET         2               /* internetwork: UDP, TCP, etc. */  #define AF_INET         2               /* internetwork: UDP, TCP, etc. */
 #define AF_IMPLINK      3               /* arpanet imp addresses */  #define AF_IMPLINK      3               /* arpanet imp addresses */
Line 181  struct accept_filter_arg {
Line 191  struct accept_filter_arg {
 #define AF_LAT          14              /* LAT */  #define AF_LAT          14              /* LAT */
 #define AF_HYLINK       15              /* NSC Hyperchannel */  #define AF_HYLINK       15              /* NSC Hyperchannel */
 #define AF_APPLETALK    16              /* Apple Talk */  #define AF_APPLETALK    16              /* Apple Talk */
 #define AF_ROUTE        17              /* Internal Routing Protocol */  #define AF_OROUTE       17              /* Internal Routing Protocol */
 #define AF_LINK         18              /* Link layer interface */  #define AF_LINK         18              /* Link layer interface */
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 #define pseudo_AF_XTP   19              /* eXpress Transfer Protocol (no AF) */  #define pseudo_AF_XTP   19              /* eXpress Transfer Protocol (no AF) */
Line 207  struct accept_filter_arg {
Line 217  struct accept_filter_arg {
 #endif  #endif
 #define AF_BLUETOOTH    31              /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */  #define AF_BLUETOOTH    31              /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */
 #define AF_IEEE80211    32              /* IEEE80211 */  #define AF_IEEE80211    32              /* IEEE80211 */
   #define AF_MPLS         33              /* MultiProtocol Label Switching */
 #define AF_MAX          33  #define AF_ROUTE        34              /* Internal Routing Protocol */
   #define AF_MAX          35
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 276  struct sockaddr_storage {
Line 287  struct sockaddr_storage {
 #define PF_LAT          AF_LAT  #define PF_LAT          AF_LAT
 #define PF_HYLINK       AF_HYLINK  #define PF_HYLINK       AF_HYLINK
 #define PF_APPLETALK    AF_APPLETALK  #define PF_APPLETALK    AF_APPLETALK
 #define PF_ROUTE        AF_ROUTE  #define PF_OROUTE       AF_OROUTE
 #define PF_LINK         AF_LINK  #define PF_LINK         AF_LINK
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 #define PF_XTP          pseudo_AF_XTP   /* really just proto family, no AF */  #define PF_XTP          pseudo_AF_XTP   /* really just proto family, no AF */
Line 297  struct sockaddr_storage {
Line 308  struct sockaddr_storage {
 #define PF_KEY          pseudo_AF_KEY   /* like PF_ROUTE, only for key mgmt */  #define PF_KEY          pseudo_AF_KEY   /* like PF_ROUTE, only for key mgmt */
 #endif  #endif
 #define PF_BLUETOOTH    AF_BLUETOOTH  #define PF_BLUETOOTH    AF_BLUETOOTH
   #define PF_MPLS         AF_MPLS
   #define PF_ROUTE        AF_ROUTE
   
 #define PF_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
Line 361  struct sockcred {
Line 374  struct sockcred {
         { "lat", CTLTYPE_NODE }, \          { "lat", CTLTYPE_NODE }, \
         { "hylink", CTLTYPE_NODE }, \          { "hylink", CTLTYPE_NODE }, \
         { "appletalk", CTLTYPE_NODE }, \          { "appletalk", CTLTYPE_NODE }, \
         { "route", CTLTYPE_NODE }, \          { "oroute", CTLTYPE_NODE }, \
         { "link_layer", CTLTYPE_NODE }, \          { "link_layer", CTLTYPE_NODE }, \
         { "xtp", CTLTYPE_NODE }, \          { "xtp", CTLTYPE_NODE }, \
         { "coip", CTLTYPE_NODE }, \          { "coip", CTLTYPE_NODE }, \
Line 374  struct sockcred {
Line 387  struct sockcred {
         { "natm", CTLTYPE_NODE }, \          { "natm", CTLTYPE_NODE }, \
         { "arp", CTLTYPE_NODE }, \          { "arp", CTLTYPE_NODE }, \
         { "key", CTLTYPE_NODE }, \          { "key", CTLTYPE_NODE }, \
           { "ieee80211", CTLTYPE_NODE }, \
           { "mlps", CTLTYPE_NODE }, \
           { "route", CTLTYPE_NODE }, \
 }  }
   
 struct kinfo_pcb {  struct kinfo_pcb {
Line 412  struct kinfo_pcb {
Line 428  struct kinfo_pcb {
   
 #define ki_src ki_s._kis_src  #define ki_src ki_s._kis_src
 #define ki_dst ki_d._kid_dst  #define ki_dst ki_d._kid_dst
   #define ki_spad ki_s._kis_pad
   #define ki_dpad ki_d._kid_pad
   
 #define PCB_SLOP                20  #define PCB_SLOP                20
 #define PCB_ALL                 0  #define PCB_ALL                 0
Line 476  struct msghdr {
Line 494  struct msghdr {
 #define MSG_BCAST       0x0100          /* this message was rcvd using link-level brdcst */  #define MSG_BCAST       0x0100          /* this message was rcvd using link-level brdcst */
 #define MSG_MCAST       0x0200          /* this message was rcvd using link-level mcast */  #define MSG_MCAST       0x0200          /* this message was rcvd using link-level mcast */
 #define MSG_NOSIGNAL    0x0400          /* do not generate SIGPIPE on EOF */  #define MSG_NOSIGNAL    0x0400          /* do not generate SIGPIPE on EOF */
   #if defined(_NETBSD_SOURCE)
   #define MSG_CMSG_CLOEXEC 0x0800         /* close on exec receiving fd */
   #define MSG_NBIO        0x1000          /* use non-blocking I/O */
   #define MSG_WAITFORONE  0x2000          /* recvmmsg() wait for one message */
   
   struct mmsghdr {
           struct msghdr msg_hdr;
           unsigned int msg_len;
   };
   #endif
   
 /* Extra flags used internally only */  /* Extra flags used internally only */
 #define MSG_USERFLAGS   0x0ffffff  #define MSG_USERFLAGS   0x0ffffff
Line 513  struct cmsghdr {
Line 541  struct cmsghdr {
  * without (2), we can't guarantee binary compatibility in case of future   * without (2), we can't guarantee binary compatibility in case of future
  * changes in ALIGNBYTES.   * changes in ALIGNBYTES.
  */   */
 #define __CMSG_ALIGN(n) (((n) + __cmsg_alignbytes()) & ~__cmsg_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
Line 524  struct cmsghdr {
Line 552  struct cmsghdr {
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
             (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)0 : \              (struct cmsghdr *)0 : \
             (struct cmsghdr *)((char *)(cmsg) + \              (struct cmsghdr *)(void *)((char *)(cmsg) + \
                 __CMSG_ALIGN((cmsg)->cmsg_len)))                  __CMSG_ALIGN((cmsg)->cmsg_len)))
   
 /*  /*
Line 542  struct cmsghdr {
Line 570  struct cmsghdr {
 /* "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)
 #define SCM_TIMESTAMP   0x02            /* timestamp (struct timeval) */  /*                      0x02               timestamp (struct timeval50) */
 #define SCM_CREDS       0x04            /* credentials (struct sockcred) */  #define SCM_CREDS       0x04            /* credentials (struct sockcred) */
   #define SCM_TIMESTAMP   0x08            /* timestamp (struct timeval) */
 #endif  #endif
   
 /*  /*
Line 555  struct cmsghdr {
Line 584  struct cmsghdr {
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   
 __BEGIN_DECLS  
 int     __cmsg_alignbytes(void);  
 __END_DECLS  
   
 #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 569  sockaddr_getlen(const struct sockaddr *s
Line 594  sockaddr_getlen(const struct sockaddr *s
 __BEGIN_DECLS  __BEGIN_DECLS
 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,
       const struct sockaddr *);
 struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);  struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);
 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(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);
   void 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 */
Line 590  int getpeername(int, struct sockaddr * _
Line 619  int getpeername(int, struct sockaddr * _
 int     getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);  int     getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);
 int     getsockopt(int, int, int, void *__restrict, socklen_t * __restrict);  int     getsockopt(int, int, int, void *__restrict, socklen_t * __restrict);
 int     listen(int, int);  int     listen(int, int);
   int     paccept(int, struct sockaddr * __restrict, socklen_t * __restrict,
           const sigset_t * __restrict, int);
 ssize_t recv(int, void *, size_t, int);  ssize_t recv(int, void *, size_t, int);
 ssize_t recvfrom(int, void *__restrict, size_t, int,  ssize_t recvfrom(int, void *__restrict, size_t, int,
             struct sockaddr * __restrict, socklen_t * __restrict);              struct sockaddr * __restrict, socklen_t * __restrict);
Line 607  __RENAME(__socket30)
Line 638  __RENAME(__socket30)
 #endif  #endif
                              ;                               ;
 int     socketpair(int, int, int, int *);  int     socketpair(int, int, int, int *);
   
   #if defined(_NETBSD_SOURCE)
   int     sendmmsg(int, struct mmsghdr *, unsigned int, unsigned int);
   struct timespec;
   int     recvmmsg(int, struct mmsghdr *, unsigned int, unsigned int,
       struct timespec *);
   #endif
 __END_DECLS  __END_DECLS
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   

Legend:
Removed from v.1.89.22.2  
changed lines
  Added in v.1.100.2.3

CVSweb <webmaster@jp.NetBSD.org>