[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.100.2.2 and 1.101

version 1.100.2.2, 2012/10/30 17:22:57 version 1.101, 2011/12/20 23:56:29
Line 110  typedef _BSD_SSIZE_T_ ssize_t;
Line 110  typedef _BSD_SSIZE_T_ ssize_t;
   
 #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 */
 #define SOCK_NOSIGPIPE  0x40000000      /* don't send sigpipe */  
 #define SOCK_FLAGS_MASK 0xf0000000      /* flags mask */  #define SOCK_FLAGS_MASK 0xf0000000      /* flags mask */
   
 /*  /*
Line 127  typedef _BSD_SSIZE_T_ ssize_t;
Line 126  typedef _BSD_SSIZE_T_ ssize_t;
 #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          */  /*      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 */  #define SO_TIMESTAMP    0x2000          /* timestamp received dgram traffic */
   
Line 495  struct msghdr {
Line 493  struct msghdr {
 #if defined(_NETBSD_SOURCE)  #if defined(_NETBSD_SOURCE)
 #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 */  
   
 struct mmsghdr {  
         struct msghdr msg_hdr;  
         unsigned int msg_len;  
 };  
 #endif  #endif
   
 /* Extra flags used internally only */  /* Extra flags used internally only */
Line 539  struct cmsghdr {
Line 531  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) + __ALIGNBYTES) & ~__ALIGNBYTES)  #define __CMSG_ALIGN(n) (((n) + __cmsg_alignbytes()) & ~__cmsg_alignbytes())
 #ifdef _KERNEL  #ifdef _KERNEL
 #define CMSG_ALIGN(n)   __CMSG_ALIGN(n)  #define CMSG_ALIGN(n)   __CMSG_ALIGN(n)
 #endif  #endif
Line 550  struct cmsghdr {
Line 542  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 *)(void *)((char *)(cmsg) + \              (struct cmsghdr *)((char *)(cmsg) + \
                 __CMSG_ALIGN((cmsg)->cmsg_len)))                  __CMSG_ALIGN((cmsg)->cmsg_len)))
   
 /*  /*
Line 582  struct cmsghdr {
Line 574  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 635  __RENAME(__socket30)
Line 631  __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.100.2.2  
changed lines
  Added in v.1.101

CVSweb <webmaster@jp.NetBSD.org>