[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.46.2.1 and 1.47

version 1.46.2.1, 2000/11/20 18:11:35 version 1.47, 1999/11/19 10:41:41
Line 74 
Line 74 
 /*  /*
  * Data types.   * Data types.
  */   */
 #include <sys/ansi.h>  typedef unsigned int    socklen_t;
   
 #ifndef sa_family_t  
 typedef __sa_family_t   sa_family_t;  
 #define sa_family_t     __sa_family_t  
 #endif  
   
 #ifndef socklen_t  
 typedef __socklen_t     socklen_t;  
 #define socklen_t       __socklen_t  
 #endif  
   
 /*  /*
  * Socket types.   * Socket types.
Line 189  struct linger {
Line 179  struct linger {
  * addresses.   * addresses.
  */   */
 struct sockaddr {  struct sockaddr {
         u_char          sa_len;         /* total length */          u_char  sa_len;                 /* total length */
         sa_family_t     sa_family;      /* address family */          u_char  sa_family;              /* address family */
         char            sa_data[14];    /* actually longer; address value */          char    sa_data[14];            /* actually longer; address value */
 };  };
   
 #if defined(_KERNEL)  #if defined(_KERNEL)
Line 217  struct sockproto {
Line 207  struct sockproto {
   
 #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500  #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
 struct sockaddr_storage {  struct sockaddr_storage {
         u_char          ss_len;         /* address length */          u_char  __ss_len;       /* address length */
         sa_family_t     ss_family;      /* address family */          u_char  __ss_family;    /* address family */
         char            __ss_pad1[_SS_PAD1SIZE];          char    __ss_pad1[_SS_PAD1SIZE];
         int64_t      __ss_align;/* force desired structure storage alignment */          int64_t __ss_align;     /* force desired structure storage alignment */
         char            __ss_pad2[_SS_PAD2SIZE];          char    __ss_pad2[_SS_PAD2SIZE];
 };  };
 #endif /* !_XOPEN_SOURCE || ... */  #endif /* !_XOPEN_SOURCE || ... */
 #endif /* 1 */  #endif /* 1 */
Line 233  struct sockaddr_storage {
Line 223  struct sockaddr_storage {
 #define PF_LOCAL        AF_LOCAL  #define PF_LOCAL        AF_LOCAL
 #define PF_UNIX         PF_LOCAL        /* backward compatibility */  #define PF_UNIX         PF_LOCAL        /* backward compatibility */
 #define PF_INET         AF_INET  #define PF_INET         AF_INET
   #define PF_INET6        AF_INET6
 #define PF_IMPLINK      AF_IMPLINK  #define PF_IMPLINK      AF_IMPLINK
 #define PF_PUP          AF_PUP  #define PF_PUP          AF_PUP
 #define PF_CHAOS        AF_CHAOS  #define PF_CHAOS        AF_CHAOS
Line 406  struct cmsghdr {
Line 397  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 *)((cmsg) + 1))
         ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))  
   
 /*  /*
  * Alignment requirement for CMSG struct manipulation.   * Alignment requirement for CMSG struct manipulation.
  * This basically behaves the same as ALIGN() ARCH/include/param.h.   * This is different from ALIGN() defined in ARCH/include/param.h.
  * We declare it separately for two reasons:   * XXX think again carefully about architecture dependencies.
  * (1) avoid dependency between machine/param.h, and (2) to sync with kernel's   */
  * idea of ALIGNBYTES at runtime.  #define CMSG_ALIGN(n)           (((n) + 3) & ~3)
  * without (2), we can't guarantee binary compatibility in case of future  
  * changes in ALIGNBYTES.  
  */  
 #define __CMSG_ALIGN(n) (((n) + __cmsg_alignbytes()) & ~__cmsg_alignbytes())  
 #ifdef _KERNEL  
 #define CMSG_ALIGN(n)   __CMSG_ALIGN(n)  
 #endif  
   
 /* 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) + \          (((caddr_t)(cmsg) + (cmsg)->cmsg_len + 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 *)NULL : \
             (struct cmsghdr *)((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len)))              (struct cmsghdr *)((caddr_t)(cmsg) + CMSG_ALIGN((cmsg)->cmsg_len)))
   
 #define CMSG_FIRSTHDR(mhdr)     ((struct cmsghdr *)(mhdr)->msg_control)  #define CMSG_FIRSTHDR(mhdr)     ((struct cmsghdr *)(mhdr)->msg_control)
   
 #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))
   
 /* "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) */
Line 472  struct omsghdr {
Line 454  struct omsghdr {
 };  };
 #endif  #endif
   
 #include <sys/cdefs.h>  
   
 __BEGIN_DECLS  
 int     __cmsg_alignbytes __P((void));  
 __END_DECLS  
   
 #ifndef _KERNEL  #ifndef _KERNEL
   
   #include <sys/cdefs.h>
   
 __BEGIN_DECLS  __BEGIN_DECLS
 int     accept __P((int, struct sockaddr *, socklen_t *));  int     accept __P((int, struct sockaddr *, socklen_t *));
 int     bind __P((int, const struct sockaddr *, socklen_t));  int     bind __P((int, const struct sockaddr *, socklen_t));
Line 505  __END_DECLS
Line 483  __END_DECLS
 #ifdef COMPAT_OLDSOCK  #ifdef COMPAT_OLDSOCK
 #define MSG_COMPAT      0x8000  #define MSG_COMPAT      0x8000
 #endif  #endif
   
   void    pfctlinput __P((int, struct sockaddr *));
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   
 #endif /* !_SYS_SOCKET_H_ */  #endif /* !_SYS_SOCKET_H_ */

Legend:
Removed from v.1.46.2.1  
changed lines
  Added in v.1.47

CVSweb <webmaster@jp.NetBSD.org>