[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.84.2.2

version 1.79, 2006/05/11 15:49:44 version 1.84.2.2, 2007/06/09 23:58:17
Line 195  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              /* Bluetooth: HCI, SCO, L2CAP, RFCOMM */
   
 #define AF_MAX          31  #define AF_MAX          32
   
 /*  /*
  * Structure used by kernel to store most   * Structure used by kernel to store most
Line 282  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 460  struct msghdr {
Line 462  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 */
   
 /*  /*
  * 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 504  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 535  __BEGIN_DECLS
Line 543  __BEGIN_DECLS
 int     __cmsg_alignbytes(void);  int     __cmsg_alignbytes(void);
 __END_DECLS  __END_DECLS
   
   #ifdef  _KERNEL
   __BEGIN_DECLS
   struct sockaddr *sockaddr_copy(struct sockaddr *, const struct sockaddr *);
   struct sockaddr *sockaddr_alloc(sa_family_t, int);
   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 561  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 574  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.84.2.2

CVSweb <webmaster@jp.NetBSD.org>