[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.67.2.4 and 1.68.4.1

version 1.67.2.4, 2005/02/04 11:48:06 version 1.68.4.1, 2006/01/30 14:48:18
Line 133  typedef _BSD_SSIZE_T_ ssize_t;
Line 133  typedef _BSD_SSIZE_T_ ssize_t;
 #define SO_RCVTIMEO     0x1006          /* receive timeout */  #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 */  
   
 /*  /*
  * Structure used for manipulating linger option.   * Structure used for manipulating linger option.
Line 453  struct cmsghdr {
Line 452  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 464  struct cmsghdr {
Line 463  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 508  struct omsghdr {
Line 507  struct omsghdr {
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int     __cmsg_alignbytes(void);  int     __cmsg_alignbytes __P((void));
 __END_DECLS  __END_DECLS
   
 #ifndef _KERNEL  #ifndef _KERNEL
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int     accept(int, struct sockaddr * __restrict, socklen_t * __restrict);  int     accept __P((int, struct sockaddr * __restrict, socklen_t * __restrict));
 int     bind(int, const struct sockaddr *, socklen_t);  int     bind __P((int, const struct sockaddr *, socklen_t));
 int     connect(int, const struct sockaddr *, socklen_t);  int     connect __P((int, const struct sockaddr *, socklen_t));
 int     getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);  int     getpeername __P((int, struct sockaddr * __restrict,
 int     getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);              socklen_t * __restrict));
 int     getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);  int     getsockname __P((int, struct sockaddr * __restrict,
 int     listen(int, int);              socklen_t * __restrict));
 ssize_t recv(int, void *, size_t, int);  int     getsockopt __P((int, int, int, void * __restrict,
 ssize_t recvfrom(int, void * __restrict, size_t, int,              socklen_t * __restrict));
             struct sockaddr * __restrict, socklen_t * __restrict);  int     listen __P((int, int));
 ssize_t recvmsg(int, struct msghdr *, int);  ssize_t recv __P((int, void *, size_t, int));
 ssize_t send(int, const void *, size_t, int);  ssize_t recvfrom __P((int, void * __restrict, size_t, int,
 ssize_t sendto(int, const void *,              struct sockaddr * __restrict, socklen_t * __restrict));
             size_t, int, const struct sockaddr *, socklen_t);  ssize_t recvmsg __P((int, struct msghdr *, int));
 ssize_t sendmsg(int, const struct msghdr *, int);  ssize_t send __P((int, const void *, size_t, int));
 int     setsockopt(int, int, int, const void *, socklen_t);  ssize_t sendto __P((int, const void *,
 int     shutdown(int, int);              size_t, int, const struct sockaddr *, socklen_t));
 int     sockatmark(int);  ssize_t sendmsg __P((int, const struct msghdr *, int));
 int     socket(int, int, int);  int     setsockopt __P((int, int, int, const void *, socklen_t));
 int     socketpair(int, int, int, int *);  int     shutdown __P((int, int));
   int     sockatmark __P((int));
   int     socket __P((int, int, int));
   int     socketpair __P((int, int, int, int *));
 __END_DECLS  __END_DECLS
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   

Legend:
Removed from v.1.67.2.4  
changed lines
  Added in v.1.68.4.1

CVSweb <webmaster@jp.NetBSD.org>