[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.26.4 and 1.90

version 1.89.26.4, 2010/08/11 22:55:11 version 1.90, 2008/06/15 21:14:06
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 */
 /*      SO_OTIMESTAMP   0x0400          */  #define SO_TIMESTAMP    0x0400          /* timestamp received dgram traffic */
 #define SO_ACCEPTFILTER 0x1000          /* there is an accept filter */  
 #define SO_TIMESTAMP    0x2000          /* timestamp received dgram traffic */  
   
   
 /*  /*
Line 132  typedef _BSD_SSIZE_T_ ssize_t;
Line 130  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 */
 /* SO_OSNDTIMEO         0x1005 */  #define SO_SNDTIMEO     0x1005          /* send timeout */
 /* SO_ORCVTIMEO         0x1006 */  #define SO_RCVTIMEO     0x1006          /* receive timeout */
 #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 142  typedef _BSD_SSIZE_T_ ssize_t;
Line 140  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 152  struct linger {
Line 148  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 166  struct accept_filter_arg {
Line 157  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 */  #define AF_LOCAL        1               /* local to host (pipes, portals) */
 #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 210  struct accept_filter_arg {
Line 201  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          34  #define AF_MAX          33
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 300  struct sockaddr_storage {
Line 291  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_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
Line 433  struct kinfo_pcb {
Line 423  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_OOIFLIST 3               /* old NET_RT_IFLIST (pre 1.5) */  #define NET_RT_OIFLIST  3               /* old NET_RT_IFLIST (pre 1.5) */
 #define NET_RT_OIFLIST  4               /* survey interface list */  #define NET_RT_IFLIST   4               /* survey interface list */
 #define NET_RT_IFLIST   5  #define NET_RT_MAXID    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 546  struct cmsghdr {
Line 534  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)
 /*                      0x02               timestamp (struct timeval50) */  #define SCM_TIMESTAMP   0x02            /* timestamp (struct timeval) */
 #define SCM_CREDS       0x04            /* credentials (struct sockcred) */  #define SCM_CREDS       0x04            /* credentials (struct sockcred) */
 #define SCM_TIMESTAMP   0x08            /* timestamp (struct timeval) */  
 #endif  #endif
   
 /*  /*
Line 574  sockaddr_getlen(const struct sockaddr *s
Line 561  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);

Legend:
Removed from v.1.89.26.4  
changed lines
  Added in v.1.90

CVSweb <webmaster@jp.NetBSD.org>