Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.39 retrieving revision 1.55.2.2 diff -u -p -r1.39 -r1.55.2.2 --- src/sys/sys/socket.h 1998/11/09 04:01:55 1.39 +++ src/sys/sys/socket.h 2001/05/01 10:29:06 1.55.2.2 @@ -1,4 +1,33 @@ -/* $NetBSD: socket.h,v 1.39 1998/11/09 04:01:55 mrg Exp $ */ +/* $NetBSD: socket.h,v 1.55.2.2 2001/05/01 10:29:06 he Exp $ */ + +/* + * 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 @@ -43,7 +72,16 @@ */ /* - * Types + * Data types. + */ +#include +#ifndef socklen_t +typedef __socklen_t socklen_t; +#define socklen_t __socklen_t +#endif + +/* + * Socket types. */ #define SOCK_STREAM 1 /* stream socket */ #define SOCK_DGRAM 2 /* datagram socket */ @@ -115,20 +153,28 @@ struct linger { #define AF_APPLETALK 16 /* Apple Talk */ #define AF_ROUTE 17 /* Internal Routing Protocol */ #define AF_LINK 18 /* Link layer interface */ +#if !defined(_XOPEN_SOURCE) #define pseudo_AF_XTP 19 /* eXpress Transfer Protocol (no AF) */ +#endif #define AF_COIP 20 /* connection-oriented IP, aka ST II */ #define AF_CNT 21 /* Computer Network Technology */ +#if !defined(_XOPEN_SOURCE) #define pseudo_AF_RTIP 22 /* Help Identify RTIP packets */ +#endif #define AF_IPX 23 /* Novell Internet Protocol */ #define AF_INET6 24 /* IP version 6 */ +#if !defined(_XOPEN_SOURCE) #define pseudo_AF_PIP 25 /* Help Identify PIP packets */ +#endif #define AF_ISDN 26 /* Integrated Services Digital Network*/ #define AF_E164 AF_ISDN /* CCITT E.164 recommendation */ #define AF_NATM 27 /* native ATM access */ #define AF_ARP 28 /* (rev.) addr. res. prot. (RFC 826) */ +#if !defined(_XOPEN_SOURCE) #define pseudo_AF_KEY 29 /* Internal key management protocol */ #define pseudo_AF_HDRCMPLT 30 /* Used by BPF to not rewrite hdrs in interface output routine */ +#endif #define AF_MAX 31 @@ -142,6 +188,7 @@ struct sockaddr { char sa_data[14]; /* actually longer; address value */ }; +#if defined(_KERNEL) /* * Structure used by kernel to pass protocol * information in raw sockets. @@ -150,6 +197,28 @@ struct sockproto { u_short sp_family; /* address family */ u_short sp_protocol; /* protocol */ }; +#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) + +#if !defined(_XOPEN_SOURCE) || (_XOPEN_SOURCE - 0) >= 500 +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 /* !_XOPEN_SOURCE || ... */ +#endif /* 1 */ /* * Protocol families, same as address families for now. @@ -175,21 +244,28 @@ struct sockproto { #define PF_APPLETALK AF_APPLETALK #define PF_ROUTE AF_ROUTE #define PF_LINK AF_LINK +#if !defined(_XOPEN_SOURCE) #define PF_XTP pseudo_AF_XTP /* really just proto family, no AF */ +#endif #define PF_COIP AF_COIP #define PF_CNT AF_CNT #define PF_INET6 AF_INET6 #define PF_IPX AF_IPX /* same format as AF_NS */ +#if !defined(_XOPEN_SOURCE) #define PF_RTIP pseudo_AF_FTIP /* same format as AF_INET */ #define PF_PIP pseudo_AF_PIP +#endif #define PF_ISDN AF_ISDN /* same as E164 */ #define PF_E164 AF_E164 #define PF_NATM AF_NATM #define PF_ARP AF_ARP +#if !defined(_XOPEN_SOURCE) #define PF_KEY pseudo_AF_KEY /* like PF_ROUTE, only for key mgmt */ +#endif #define PF_MAX AF_MAX +#if !defined(_XOPEN_SOURCE) /* * Socket credentials. */ @@ -207,6 +283,7 @@ struct sockcred { */ #define SOCKCREDSIZE(ngrps) \ (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1))) +#endif /* !_XOPEN_SOURCE */ #if !defined(_XOPEN_SOURCE) @@ -265,13 +342,15 @@ struct sockcred { */ #define NET_RT_DUMP 1 /* dump; may limit to a.f. */ #define NET_RT_FLAGS 2 /* by flags, e.g. RESOLVING */ -#define NET_RT_IFLIST 3 /* survey interface list */ -#define NET_RT_MAXID 4 +#define NET_RT_OIFLIST 3 /* old NET_RT_IFLIST (pre 1.5) */ +#define NET_RT_IFLIST 4 /* survey interface list */ +#define NET_RT_MAXID 5 #define CTL_NET_RT_NAMES { \ { 0, 0 }, \ { "dump", CTLTYPE_STRUCT }, \ { "flags", CTLTYPE_STRUCT }, \ + { 0, 0 }, \ { "iflist", CTLTYPE_STRUCT }, \ } #endif /* !_XOPEN_SOURCE */ @@ -287,13 +366,13 @@ struct sockcred { * Used value-result for recvmsg, value only for sendmsg. */ struct msghdr { - caddr_t msg_name; /* optional address */ - u_int msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - u_int msg_iovlen; /* # elements in msg_iov */ - caddr_t msg_control; /* ancillary data, see below */ - u_int msg_controllen; /* ancillary data buffer len */ - int msg_flags; /* flags on received message */ + void *msg_name; /* optional address */ + socklen_t msg_namelen; /* size of address */ + struct iovec *msg_iov; /* scatter/gather array */ + int msg_iovlen; /* # elements in msg_iov */ + void *msg_control; /* ancillary data, see below */ + socklen_t msg_controllen; /* ancillary data buffer len */ + int msg_flags; /* flags on received message */ }; #define MSG_OOB 0x1 /* process out-of-band data */ @@ -314,28 +393,49 @@ struct msghdr { * of message elements headed by cmsghdr structures. */ struct cmsghdr { - u_int cmsg_len; /* data byte count, including hdr */ - int cmsg_level; /* originating protocol */ - int cmsg_type; /* protocol-specific type */ + socklen_t cmsg_len; /* data byte count, including hdr */ + int cmsg_level; /* originating protocol */ + int cmsg_type; /* protocol-specific type */ /* followed by u_char cmsg_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) + __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 */ #define CMSG_NXTHDR(mhdr, cmsg) \ - (((caddr_t)(cmsg) + (cmsg)->cmsg_len + sizeof(struct cmsghdr) > \ - (mhdr)->msg_control + (mhdr)->msg_controllen) ? \ + (((caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ + __CMSG_ALIGN(sizeof(struct cmsghdr)) > \ + (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ (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_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: */ #define SCM_RIGHTS 0x01 /* access rights (array of int) */ +#if !defined(_XOPEN_SOURCE) #define SCM_TIMESTAMP 0x02 /* timestamp (struct timeval) */ -#define SCM_CREDS 0x04 /* credientials (struct sockcred) */ +#define SCM_CREDS 0x04 /* credentials (struct sockcred) */ +#endif /* * Types of socket shutdown(2). @@ -344,6 +444,7 @@ struct cmsghdr { #define SHUT_WR 1 /* Disallow further sends. */ #define SHUT_RDWR 2 /* Disallow further sends/receives. */ +#if !defined(_XOPEN_SOURCE) /* * 4.3 compat sockaddr, move to compat file later */ @@ -363,43 +464,41 @@ struct omsghdr { caddr_t msg_accrights; /* access rights sent/received */ int msg_accrightslen; }; - -#ifndef _KERNEL +#endif #include __BEGIN_DECLS -int accept __P((int, struct sockaddr *, int *)); -int bind __P((int, const struct sockaddr *, int)); -int connect __P((int, const struct sockaddr *, int)); -int getpeername __P((int, struct sockaddr *, int *)); -int getsockname __P((int, struct sockaddr *, int *)); -int getsockopt __P((int, int, int, void *, int *)); +int __cmsg_alignbytes __P((void)); +__END_DECLS + +#ifndef _KERNEL + +__BEGIN_DECLS +int accept __P((int, struct sockaddr *, socklen_t *)); +int bind __P((int, const struct sockaddr *, socklen_t)); +int connect __P((int, const struct sockaddr *, socklen_t)); +int getpeername __P((int, struct sockaddr *, socklen_t *)); +int getsockname __P((int, struct sockaddr *, socklen_t *)); +int getsockopt __P((int, int, int, void *, socklen_t *)); int listen __P((int, int)); ssize_t recv __P((int, void *, size_t, int)); -ssize_t recvfrom __P((int, void *, size_t, int, struct sockaddr *, int *)); +ssize_t recvfrom __P((int, void *, size_t, int, struct sockaddr *, + socklen_t *)); ssize_t recvmsg __P((int, struct msghdr *, int)); ssize_t send __P((int, const void *, size_t, int)); ssize_t sendto __P((int, const void *, - size_t, int, const struct sockaddr *, int)); + size_t, int, const struct sockaddr *, socklen_t)); ssize_t sendmsg __P((int, const struct msghdr *, int)); -int setsockopt __P((int, int, int, const void *, int)); +int setsockopt __P((int, int, int, const void *, socklen_t)); int shutdown __P((int, int)); int socket __P((int, int, int)); int socketpair __P((int, int, int, int *)); __END_DECLS #else -# if !defined(_LKM) -# include "opt_compat_freebsd.h" -# include "opt_compat_linux.h" -# include "opt_compat_sunos.h" -# include "opt_compat_hpux.h" -# endif -# if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \ - defined(COMPAT_HPUX) || defined(COMPAT_FREEBSD) || defined(COMPAT_ULTRIX) -# define COMPAT_OLDSOCK -# define MSG_COMPAT 0x8000 -# endif +#ifdef COMPAT_OLDSOCK +#define MSG_COMPAT 0x8000 +#endif #endif /* !_KERNEL */ #endif /* !_SYS_SOCKET_H_ */