[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.75 and 1.75.4.1

version 1.75, 2005/03/09 19:02:22 version 1.75.4.1, 2006/06/21 15:12:03
Line 122  typedef _BSD_SSIZE_T_ ssize_t;
Line 122  typedef _BSD_SSIZE_T_ ssize_t;
 #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 */  #define SO_TIMESTAMP    0x0400          /* timestamp received dgram traffic */
   
   
 /*  /*
  * Additional options, not kept in so_options.   * Additional options, not kept in so_options.
  */   */
Line 194  struct linger {
Line 195  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
   
 #define AF_MAX          31  #define AF_MAX          32
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 281  struct sockaddr_storage {
Line 283  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_MAX          AF_MAX  #define PF_MAX          AF_MAX
   
Line 447  struct msghdr {
Line 450  struct msghdr {
         int             msg_flags;      /* flags on received message */          int             msg_flags;      /* flags on received message */
 };  };
   
 #define MSG_OOB         0x1             /* process out-of-band data */  #define MSG_OOB         0x0001          /* process out-of-band data */
 #define MSG_PEEK        0x2             /* peek at incoming message */  #define MSG_PEEK        0x0002          /* peek at incoming message */
 #define MSG_DONTROUTE   0x4             /* send without using routing tables */  #define MSG_DONTROUTE   0x0004          /* send without using routing tables */
 #define MSG_EOR         0x8             /* data completes record */  #define MSG_EOR         0x0008          /* data completes record */
 #define MSG_TRUNC       0x10            /* data discarded before delivery */  #define MSG_TRUNC       0x0010          /* data discarded before delivery */
 #define MSG_CTRUNC      0x20            /* control data lost before delivery */  #define MSG_CTRUNC      0x0020          /* control data lost before delivery */
 #define MSG_WAITALL     0x40            /* wait for full request or error */  #define MSG_WAITALL     0x0040          /* wait for full request or error */
 #define MSG_DONTWAIT    0x80            /* this message should be nonblocking */  #define MSG_DONTWAIT    0x0080          /* this message should be nonblocking */
 #define MSG_BCAST       0x100           /* this message was rcvd using link-level brdcst */  #define MSG_BCAST       0x0100          /* this message was rcvd using link-level brdcst */
 #define MSG_MCAST       0x200           /* 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 */
   
 /*  /*
  * Header for ancillary data objects in msg_control buffer.   * Header for ancillary data objects in msg_control buffer.
Line 474  struct cmsghdr {
Line 478  struct cmsghdr {
 /* given pointer to struct cmsghdr, return pointer to data */  /* given pointer to struct cmsghdr, return pointer to data */
 #define CMSG_DATA(cmsg) \  #define CMSG_DATA(cmsg) \
         ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))          ((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.
Line 494  struct cmsghdr {
Line 501  struct cmsghdr {
         (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \          (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
                             __CMSG_ALIGN(sizeof(struct cmsghdr)) > \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
             (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \              (((__caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \
             (struct cmsghdr *)NULL : \              (struct cmsghdr *)0 : \
             (struct cmsghdr *)((__caddr_t)(cmsg) + \              (struct cmsghdr *)((__caddr_t)(cmsg) + \
                 __CMSG_ALIGN((cmsg)->cmsg_len)))                  __CMSG_ALIGN((cmsg)->cmsg_len)))
   
Line 505  struct cmsghdr {
Line 512  struct cmsghdr {
 #define CMSG_FIRSTHDR(mhdr) \  #define CMSG_FIRSTHDR(mhdr) \
         ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \          ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
          (struct cmsghdr *)(mhdr)->msg_control : \           (struct cmsghdr *)(mhdr)->msg_control : \
          (struct cmsghdr *)NULL)           (struct cmsghdr *)0)
   
 #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))  #define CMSG_SPACE(l)   (__CMSG_ALIGN(sizeof(struct cmsghdr)) + __CMSG_ALIGN(l))
 #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))  #define CMSG_LEN(l)     (__CMSG_ALIGN(sizeof(struct cmsghdr)) + (l))
Line 524  struct cmsghdr {
Line 531  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. */
   
 #if defined(_NETBSD_SOURCE)  
 /*  
  * 4.3 compat sockaddr, move to compat file later  
  */  
 struct osockaddr {  
         __uint16_t      sa_family;      /* address family */  
         char            sa_data[14];    /* up to 14 bytes of direct address */  
 };  
   
 /*  
  * 4.3-compat message header (move to compat file later).  
  */  
 struct omsghdr {  
         __caddr_t       msg_name;       /* optional address */  
         int             msg_namelen;    /* size of address */  
         struct iovec    *msg_iov;       /* scatter/gather array */  
         int             msg_iovlen;     /* # elements in msg_iov */  
         __caddr_t       msg_accrights;  /* access rights sent/received */  
         int             msg_accrightslen;  
 };  
 #endif  
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   
 __BEGIN_DECLS  __BEGIN_DECLS
Legend:
Removed from v.1.75  
changed lines
  Added in v.1.75.4.1
CVSweb <webmaster@jp.NetBSD.org>