[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.79 and 1.97.4.1

version 1.79, 2006/05/11 15:49:44 version 1.97.4.1, 2010/07/03 01:20:04
Line 120  typedef _BSD_SSIZE_T_ ssize_t;
Line 120  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_ACCEPTFILTER 0x1000          /* there is an accept filter */
   #define SO_TIMESTAMP    0x2000          /* timestamp received dgram traffic */
   
   
 /*  /*
Line 130  typedef _BSD_SSIZE_T_ ssize_t;
Line 132  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 */
   
   #define SO_NOHEADER     0x100a          /* user supplies no header to kernel;
                                            * kernel removes header and supplies
                                            * 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 144  struct linger {
Line 152  struct linger {
         int     l_linger;               /* linger time in seconds */          int     l_linger;               /* linger time in seconds */
 };  };
   
   struct  accept_filter_arg {
           char    af_name[16];
           char    af_arg[256-16];
   };
   
 /*  /*
  * Level number for (get/set)sockopt() to apply to socket itself.   * Level number for (get/set)sockopt() to apply to socket itself.
  */   */
Line 153  struct linger {
Line 166  struct linger {
  * 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 195  struct linger {
Line 208  struct linger {
 #define pseudo_AF_HDRCMPLT 30           /* Used by BPF to not rewrite hdrs  #define pseudo_AF_HDRCMPLT 30           /* Used by BPF to not rewrite hdrs
                                            in interface output routine */                                             in interface output routine */
 #endif  #endif
   #define AF_BLUETOOTH    31              /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */
 #define AF_MAX          31  #define AF_IEEE80211    32              /* IEEE80211 */
   #define AF_MPLS         33              /* MultiProtocol Label Switching */
   #define AF_MAX          34
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 237  struct sockaddr_storage {
Line 252  struct sockaddr_storage {
         __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];
 };  };
   #define sstosa(__ss)    ((struct sockaddr *)(__ss))
   #define sstocsa(__ss)   ((const struct sockaddr *)(__ss))
 #endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */  #endif /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */
 #endif /* 1 */  #endif /* 1 */
   
Line 282  struct sockaddr_storage {
Line 299  struct sockaddr_storage {
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 #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_MPLS         AF_MPLS
   
 #define PF_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
Line 414  struct kinfo_pcb {
Line 433  struct kinfo_pcb {
  */   */
 #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_OIFLIST  3               /* old NET_RT_IFLIST (pre 1.5) */  #define NET_RT_OOIFLIST 3               /* old NET_RT_IFLIST (pre 1.5) */
 #define NET_RT_IFLIST   4               /* survey interface list */  #define NET_RT_OIFLIST  4               /* survey interface list */
 #define NET_RT_MAXID    5  #define NET_RT_IFLIST   5
   #define NET_RT_MAXID    6
   
 #define CTL_NET_RT_NAMES { \  #define CTL_NET_RT_NAMES { \
         { 0, 0 }, \          { 0, 0 }, \
         { "dump", CTLTYPE_STRUCT }, \          { "dump", CTLTYPE_STRUCT }, \
         { "flags", CTLTYPE_STRUCT }, \          { "flags", CTLTYPE_STRUCT }, \
         { 0, 0 }, \          { 0, 0 }, \
           { 0, 0 }, \
         { "iflist", CTLTYPE_STRUCT }, \          { "iflist", CTLTYPE_STRUCT }, \
 }  }
 #endif /* _NETBSD_SOURCE */  #endif /* _NETBSD_SOURCE */
Line 460  struct msghdr {
Line 481  struct msghdr {
 #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 */
   
   /* Extra flags used internally only */
   #define MSG_USERFLAGS   0x0ffffff
   #define MSG_NAMEMBUF    0x1000000       /* msg_name is an mbuf */
   #define MSG_CONTROLMBUF 0x2000000       /* msg_control is an mbuf */
   #define MSG_IOVUSRSPACE 0x4000000       /* msg_iov is in user space */
   #define MSG_LENUSRSPACE 0x8000000       /* address length is in user space */
   
 /*  /*
  * Header for ancillary data objects in msg_control buffer.   * Header for ancillary data objects in msg_control buffer.
  * Used for additional information with/about a datagram   * Used for additional information with/about a datagram
Line 496  struct cmsghdr {
Line 524  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) + \          (((char *)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
             (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (((char *)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)0 : \              (struct cmsghdr *)0 : \
             (struct cmsghdr *)((__caddr_t)(cmsg) + \              (struct cmsghdr *)((char *)(cmsg) + \
                 __CMSG_ALIGN((cmsg)->cmsg_len)))                  __CMSG_ALIGN((cmsg)->cmsg_len)))
   
 /*  /*
Line 518  struct cmsghdr {
Line 546  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 535  __BEGIN_DECLS
Line 564  __BEGIN_DECLS
 int     __cmsg_alignbytes(void);  int     __cmsg_alignbytes(void);
 __END_DECLS  __END_DECLS
   
   #ifdef  _KERNEL
   static inline socklen_t
   sockaddr_getlen(const struct sockaddr *sa)
   {
           return sa->sa_len;
   }
   
   __BEGIN_DECLS
   struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,
       const struct sockaddr *);
   struct sockaddr *sockaddr_externalize(struct sockaddr *, socklen_t,
       const struct sockaddr *);
   struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);
   const void *sockaddr_const_addr(const struct sockaddr *, socklen_t *);
   void *sockaddr_addr(struct sockaddr *, socklen_t *);
   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 *);
   int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
   struct sockaddr *sockaddr_dup(const struct sockaddr *, int);
   void sockaddr_free(struct sockaddr *);
   __END_DECLS
   #endif /* _KERNEL */
   
 #ifndef _KERNEL  #ifndef _KERNEL
   
 __BEGIN_DECLS  __BEGIN_DECLS
Line 543  int bind(int, const struct sockaddr *, s
Line 596  int bind(int, const struct sockaddr *, s
 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);
 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);
 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);
 ssize_t recvmsg(int, struct msghdr *, int);  ssize_t recvmsg(int, struct msghdr *, int);
 ssize_t send(int, const void *, size_t, int);  ssize_t send(int, const void *, size_t, int);
Line 556  ssize_t sendmsg(int, const struct msghdr
Line 609  ssize_t sendmsg(int, const struct msghdr
 int     setsockopt(int, int, int, const void *, socklen_t);  int     setsockopt(int, int, int, const void *, socklen_t);
 int     shutdown(int, int);  int     shutdown(int, int);
 int     sockatmark(int);  int     sockatmark(int);
 int     socket(int, int, int);  int     socket(int, int, int)
   #if !defined(__LIBC12_SOURCE__) && !defined(_STANDALONE)
   __RENAME(__socket30)
   #endif
                                ;
 int     socketpair(int, int, int, int *);  int     socketpair(int, int, int, int *);
 __END_DECLS  __END_DECLS
 #endif /* !_KERNEL */  #endif /* !_KERNEL */

Legend:
Removed from v.1.79  
changed lines
  Added in v.1.97.4.1

CVSweb <webmaster@jp.NetBSD.org>