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.50 retrieving revision 1.67.2.1 diff -u -p -r1.50 -r1.67.2.1 --- src/sys/sys/socket.h 2000/02/18 05:19:25 1.50 +++ src/sys/sys/socket.h 2004/08/03 10:56:30 1.67.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.50 2000/02/18 05:19:25 itojun Exp $ */ +/* $NetBSD: socket.h,v 1.67.2.1 2004/08/03 10:56:30 skrll Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -41,11 +41,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -67,6 +63,8 @@ #ifndef _SYS_SOCKET_H_ #define _SYS_SOCKET_H_ +#include + /* * Definitions related to sockets: types, address families, options. */ @@ -74,7 +72,31 @@ /* * Data types. */ -typedef unsigned int socklen_t; +#include + +#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 + +#include + +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ +#endif + +#ifdef _BSD_SSIZE_T_ +typedef _BSD_SSIZE_T_ ssize_t; +#undef _BSD_SSIZE_T_ +#endif + +#include /* * Socket types. @@ -149,24 +171,24 @@ 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) +#if defined(_NETBSD_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) +#if defined(_NETBSD_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) +#if defined(_NETBSD_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) +#if defined(_NETBSD_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 */ @@ -179,9 +201,9 @@ struct linger { * addresses. */ struct sockaddr { - u_char sa_len; /* total length */ - u_char sa_family; /* address family */ - char sa_data[14]; /* actually longer; address value */ + __uint8_t sa_len; /* total length */ + sa_family_t sa_family; /* address family */ + char sa_data[14]; /* actually longer; address value */ }; #if defined(_KERNEL) @@ -200,20 +222,20 @@ struct sockproto { * 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 - \ +#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 +#if (_XOPEN_SOURCE - 0) >= 500 || defined(_NETBSD_SOURCE) 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]; + __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 /* _XOPEN_SOURCE >= 500 || _NETBSD_SOURCE */ #endif /* 1 */ /* @@ -240,14 +262,14 @@ struct sockaddr_storage { #define PF_APPLETALK AF_APPLETALK #define PF_ROUTE AF_ROUTE #define PF_LINK AF_LINK -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_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) +#if defined(_NETBSD_SOURCE) #define PF_RTIP pseudo_AF_FTIP /* same format as AF_INET */ #define PF_PIP pseudo_AF_PIP #endif @@ -255,13 +277,24 @@ struct sockaddr_storage { #define PF_E164 AF_E164 #define PF_NATM AF_NATM #define PF_ARP AF_ARP -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) #define PF_KEY pseudo_AF_KEY /* like PF_ROUTE, only for key mgmt */ #endif #define PF_MAX AF_MAX -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) + +#ifndef gid_t +typedef __gid_t gid_t; /* group id */ +#define gid_t __gid_t +#endif + +#ifndef uid_t +typedef __uid_t uid_t; /* user id */ +#define uid_t __uid_t +#endif + /* * Socket credentials. */ @@ -279,10 +312,10 @@ struct sockcred { */ #define SOCKCREDSIZE(ngrps) \ (sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1))) -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) /* * Definitions for network related sysctl, CTL_NET. * @@ -325,9 +358,9 @@ struct sockcred { { "arp", CTLTYPE_NODE }, \ { "key", CTLTYPE_NODE }, \ } -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) /* * PF_ROUTE - Routing table * @@ -349,13 +382,14 @@ struct sockcred { { 0, 0 }, \ { "iflist", CTLTYPE_STRUCT }, \ } -#endif /* !_XOPEN_SOURCE */ +#endif /* _NETBSD_SOURCE */ /* * Maximum queue length specifiable by listen(2). */ - +#ifndef SOMAXCONN #define SOMAXCONN 128 +#endif /* * Message header for recvmsg and sendmsg calls. @@ -397,31 +431,46 @@ struct cmsghdr { /* given pointer to struct cmsghdr, return pointer to data */ #define CMSG_DATA(cmsg) \ - ((u_char *)(cmsg) + CMSG_ALIGN(sizeof(struct cmsghdr))) + ((u_char *)(void *)(cmsg) + __CMSG_ALIGN(sizeof(struct cmsghdr))) /* * 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) + (sizeof(long) - 1)) & ~(sizeof(long) - 1)) + * 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_ALIGN((cmsg)->cmsg_len) + \ - CMSG_ALIGN(sizeof(struct cmsghdr)) > \ - (((caddr_t)(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) + CMSG_ALIGN((cmsg)->cmsg_len))) + (struct cmsghdr *)((__caddr_t)(cmsg) + \ + __CMSG_ALIGN((cmsg)->cmsg_len))) -#define CMSG_FIRSTHDR(mhdr) ((struct cmsghdr *)(mhdr)->msg_control) +/* + * RFC 2292 requires to check msg_controllen, in case that the kernel returns + * an empty list for some reasons. + */ +#define CMSG_FIRSTHDR(mhdr) \ + ((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \ + (struct cmsghdr *)(mhdr)->msg_control : \ + (struct cmsghdr *)NULL) -#define CMSG_SPACE(l) (CMSG_ALIGN(sizeof(struct cmsghdr)) + CMSG_ALIGN(l)) -#define CMSG_LEN(l) (CMSG_ALIGN(sizeof(struct cmsghdr)) + (l)) +#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) +#if defined(_NETBSD_SOURCE) #define SCM_TIMESTAMP 0x02 /* timestamp (struct timeval) */ #define SCM_CREDS 0x04 /* credentials (struct sockcred) */ #endif @@ -433,43 +482,50 @@ struct cmsghdr { #define SHUT_WR 1 /* Disallow further sends. */ #define SHUT_RDWR 2 /* Disallow further sends/receives. */ -#if !defined(_XOPEN_SOURCE) +#if defined(_NETBSD_SOURCE) /* * 4.3 compat sockaddr, move to compat file later */ struct osockaddr { - u_short sa_family; /* address family */ - char sa_data[14]; /* up to 14 bytes of direct address */ + __uint16_t sa_family; /* address family */ + char sa_data[14]; /* up to 14 bytes of direct address */ }; /* * 4.3-compat message header (move to compat file later). */ struct omsghdr { - caddr_t msg_name; /* optional address */ - int msg_namelen; /* size of address */ - struct iovec *msg_iov; /* scatter/gather array */ - int msg_iovlen; /* # elements in msg_iov */ - caddr_t msg_accrights; /* access rights sent/received */ - int msg_accrightslen; + __caddr_t msg_name; /* optional address */ + int msg_namelen; /* size of address */ + struct iovec *msg_iov; /* scatter/gather array */ + int msg_iovlen; /* # elements in msg_iov */ + __caddr_t msg_accrights; /* access rights sent/received */ + int msg_accrightslen; }; #endif -#ifndef _KERNEL - #include __BEGIN_DECLS -int accept __P((int, struct sockaddr *, socklen_t *)); +int __cmsg_alignbytes __P((void)); +__END_DECLS + +#ifndef _KERNEL + +__BEGIN_DECLS +int accept __P((int, struct sockaddr * __restrict, socklen_t * __restrict)); 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 getpeername __P((int, struct sockaddr * __restrict, + socklen_t * __restrict)); +int getsockname __P((int, struct sockaddr * __restrict, + socklen_t * __restrict)); +int getsockopt __P((int, int, int, void * __restrict, + socklen_t * __restrict)); 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 *, - socklen_t *)); +ssize_t recvfrom __P((int, void * __restrict, size_t, int, + struct sockaddr * __restrict, socklen_t * __restrict)); 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 *, @@ -477,15 +533,10 @@ ssize_t sendto __P((int, const void *, ssize_t sendmsg __P((int, const struct msghdr *, int)); int setsockopt __P((int, int, int, const void *, socklen_t)); int shutdown __P((int, int)); +int sockatmark __P((int)); int socket __P((int, int, int)); int socketpair __P((int, int, int, int *)); __END_DECLS -#else -#ifdef COMPAT_OLDSOCK -#define MSG_COMPAT 0x8000 -#endif - -void pfctlinput __P((int, struct sockaddr *)); #endif /* !_KERNEL */ #endif /* !_SYS_SOCKET_H_ */