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

version 1.43, 1999/02/11 20:33:26 version 1.61, 2001/07/17 11:49:41
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 45 
Line 74 
 /*  /*
  * Data types.   * Data types.
  */   */
 typedef unsigned int    socklen_t;  #include <sys/ansi.h>
   
   #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 150  struct linger {
Line 189  struct linger {
  * addresses.   * addresses.
  */   */
 struct sockaddr {  struct sockaddr {
         u_char  sa_len;                 /* total length */          uint8_t         sa_len;         /* total length */
         u_char  sa_family;              /* address family */          sa_family_t     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 166  struct sockproto {
Line 205  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 - 2)
   #define _SS_PAD2SIZE    (_SS_MAXSIZE - 2 - \
                                   _SS_PAD1SIZE - _SS_ALIGNSIZE)
   
   #if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500
   struct sockaddr_storage {
           uint8_t         ss_len;         /* address length */
           sa_family_t     ss_family;      /* address family */
           char            __ss_pad1[_SS_PAD1SIZE];
           int64_t      __ss_align;/* force desired structure storage alignment */
           char            __ss_pad2[_SS_PAD2SIZE];
   };
   #endif /* !_XOPEN_SOURCE || ... */
   #endif /* 1 */
   
 /*  /*
  * Protocol families, same as address families for now.   * Protocol families, same as address families for now.
  */   */
Line 288  struct sockcred {
Line 348  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 344  struct cmsghdr {
Line 406  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 *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr)))
   
   /*
    * Alignment requirement for CMSG struct manipulation.
    * This basically behaves the same as ALIGN() ARCH/include/param.h.
    * We declare it separately for two reasons:
    * (1) avoid dependency between machine/param.h, and (2) to sync with kernel's
    * idea of ALIGNBYTES at runtime.
    * 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)->cmsg_len + sizeof(struct cmsghdr) > \          (((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \
             (caddr_t) ((mhdr)->msg_control + (mhdr)->msg_controllen)) ? \                              __CMSG_ALIGN(sizeof(struct cmsghdr)) > \
               (((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 374  struct cmsghdr {
Line 455  struct cmsghdr {
  * 4.3 compat sockaddr, move to compat file later   * 4.3 compat sockaddr, move to compat file later
  */   */
 struct osockaddr {  struct osockaddr {
         u_short sa_family;              /* address family */          uint16_t        sa_family;      /* address family */
         char    sa_data[14];            /* up to 14 bytes of direct address */          char            sa_data[14];    /* up to 14 bytes of direct address */
 };  };
   
 /*  /*
Line 391  struct omsghdr {
Line 472  struct omsghdr {
 };  };
 #endif  #endif
   
 #ifndef _KERNEL  
   
 #include <sys/cdefs.h>  #include <sys/cdefs.h>
   
 __BEGIN_DECLS  __BEGIN_DECLS
   int     __cmsg_alignbytes __P((void));
   __END_DECLS
   
   #ifndef _KERNEL
   
   __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));
 int     connect __P((int, const struct sockaddr *, socklen_t));  int     connect __P((int, const struct sockaddr *, socklen_t));
Line 416  int shutdown __P((int, int));
Line 501  int shutdown __P((int, int));
 int     socket __P((int, int, int));  int     socket __P((int, int, int));
 int     socketpair __P((int, int, int, int *));  int     socketpair __P((int, int, int, int *));
 __END_DECLS  __END_DECLS
 #else  
 #ifdef COMPAT_OLDSOCK  
 #define MSG_COMPAT      0x8000  
 #endif  
 #endif /* !_KERNEL */  #endif /* !_KERNEL */
   
 #endif /* !_SYS_SOCKET_H_ */  #endif /* !_SYS_SOCKET_H_ */
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.61
CVSweb <webmaster@jp.NetBSD.org>