[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 and 1.43.4.1

version 1.43, 1999/02/11 20:33:26 version 1.43.4.1, 1999/07/01 23:50:36
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
   
 /*  /*
    * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted provided that the following conditions
    * are met:
    * 1. Redistributions of source code must retain the above copyright
    *    notice, this list of conditions and the following disclaimer.
    * 2. Redistributions in binary form must reproduce the above copyright
    *    notice, this list of conditions and the following disclaimer in the
    *    documentation and/or other materials provided with the distribution.
    * 3. Neither the name of the project nor the names of its contributors
    *    may be used to endorse or promote products derived from this software
    *    without specific prior written permission.
    *
    * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
    * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
    * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
    * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
    * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
    * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
    * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
    * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    * SUCH DAMAGE.
    */
   
   /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994   * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.   *      The Regents of the University of California.  All rights reserved.
  *   *
Line 166  struct sockproto {
Line 195  struct sockproto {
 };  };
 #endif /* _KERNEL */  #endif /* _KERNEL */
   
   #if 1
   /*
    * RFC 2553: protocol-independent placeholder for socket addresses
    */
   #define _SS_MAXSIZE     128
   #define _SS_ALIGNSIZE   (sizeof(int64_t))
   #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(u_char) * 2)
   #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(u_char) * 2 - \
                                   _SS_PAD1SIZE - _SS_ALIGNSIZE)
   
   struct sockaddr_storage {
           u_char  __ss_len;       /* address length */
           u_char  __ss_family;    /* address family */
           char    __ss_pad1[_SS_PAD1SIZE];
           int64_t __ss_align;     /* force desired structure storage alignment */
           char    __ss_pad2[_SS_PAD2SIZE];
   };
   #endif
   
 /*  /*
  * Protocol families, same as address families for now.   * Protocol families, same as address families for now.
  */   */
Line 173  struct sockproto {
Line 221  struct sockproto {
 #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 346  struct cmsghdr {
Line 395  struct cmsghdr {
 /* given pointer to struct cmsghdr, return pointer to data */  /* given pointer to struct cmsghdr, return pointer to data */
 #define CMSG_DATA(cmsg)         ((u_char *)((cmsg) + 1))  #define CMSG_DATA(cmsg)         ((u_char *)((cmsg) + 1))
   
   /*
    * Alignment requirement for CMSG struct manipulation.
    * This is different from ALIGN() defined in ARCH/include/param.h.
    * XXX think again carefully about architecture dependencies.
    */
   #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) + 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_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) */
 #if !defined(_XOPEN_SOURCE)  #if !defined(_XOPEN_SOURCE)
Line 420  __END_DECLS
Line 479  __END_DECLS
 #ifdef COMPAT_OLDSOCK  #ifdef COMPAT_OLDSOCK
 #define MSG_COMPAT      0x8000  #define MSG_COMPAT      0x8000
 #endif  #endif
   
   #include <sys/cdefs.h>
   
   __BEGIN_DECLS
   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  
changed lines
  Added in v.1.43.4.1

CVSweb <webmaster@jp.NetBSD.org>