[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.43.6.3 and 1.49

version 1.43.6.3, 1999/11/30 13:36:18 version 1.49, 2000/02/03 09:23:03
Line 205  struct sockproto {
Line 205  struct sockproto {
 #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \  #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \
                                 _SS_PAD1SIZE - _SS_ALIGNSIZE)                                  _SS_PAD1SIZE - _SS_ALIGNSIZE)
   
   #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 */
         u_char  __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  #endif /* !_XOPEN_SOURCE || ... */
   #endif /* 1 */
   
 /*  /*
  * Protocol families, same as address families for now.   * Protocol families, same as address families for now.
Line 221  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 337  struct sockcred {
Line 338  struct sockcred {
  */   */
 #define NET_RT_DUMP     1               /* dump; may limit to a.f. */  #define NET_RT_DUMP     1               /* dump; may limit to a.f. */
 #define NET_RT_FLAGS    2               /* by flags, e.g. RESOLVING */  #define NET_RT_FLAGS    2               /* by flags, e.g. RESOLVING */
 #define NET_RT_IFLIST   3               /* survey interface list */  #define NET_RT_OIFLIST  3               /* old NET_RT_IFLIST (pre 1.5) */
 #define NET_RT_MAXID    4  #define NET_RT_IFLIST   4               /* survey interface list */
   #define NET_RT_MAXID    5
   
 #define CTL_NET_RT_NAMES { \  #define CTL_NET_RT_NAMES { \
         { 0, 0 }, \          { 0, 0 }, \
         { "dump", CTLTYPE_STRUCT }, \          { "dump", CTLTYPE_STRUCT }, \
         { "flags", CTLTYPE_STRUCT }, \          { "flags", CTLTYPE_STRUCT }, \
           { 0, 0 }, \
         { "iflist", CTLTYPE_STRUCT }, \          { "iflist", CTLTYPE_STRUCT }, \
 }  }
 #endif /* !_XOPEN_SOURCE */  #endif /* !_XOPEN_SOURCE */
Line 400  struct cmsghdr {
Line 403  struct cmsghdr {
  * This is different from ALIGN() defined in ARCH/include/param.h.   * This is different from ALIGN() defined in ARCH/include/param.h.
  * XXX think again carefully about architecture dependencies.   * XXX think again carefully about architecture dependencies.
  */   */
 #define CMSG_ALIGN(n)   (((n) + sizeof(long) - 1) & ~(sizeof(long) - 1))  #define CMSG_ALIGN(n)           (((n) + 3) & ~3)
   
 /* 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)->cmsg_len + sizeof(struct cmsghdr) > \          (((caddr_t)(cmsg) + (cmsg)->cmsg_len + 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)))
   
Line 480  __END_DECLS
Line 483  __END_DECLS
 #define MSG_COMPAT      0x8000  #define MSG_COMPAT      0x8000
 #endif  #endif
   
 #include <sys/cdefs.h>  
   
 __BEGIN_DECLS  
 void    pfctlinput __P((int, struct sockaddr *));  void    pfctlinput __P((int, struct sockaddr *));
 __END_DECLS  
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   
 #endif /* !_SYS_SOCKET_H_ */  #endif /* !_SYS_SOCKET_H_ */
Legend:
Removed from v.1.43.6.3  
changed lines
  Added in v.1.49
CVSweb <webmaster@jp.NetBSD.org>