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.53 retrieving revision 1.63 diff -u -p -r1.53 -r1.63 --- src/sys/sys/socket.h 2000/04/03 02:06:11 1.53 +++ src/sys/sys/socket.h 2001/10/16 19:47:44 1.63 @@ -1,4 +1,4 @@ -/* $NetBSD: socket.h,v 1.53 2000/04/03 02:06:11 itojun Exp $ */ +/* $NetBSD: socket.h,v 1.63 2001/10/16 19:47:44 kleink Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -74,7 +74,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. @@ -179,9 +203,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,18 +224,18 @@ 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 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 /* 1 */ @@ -262,6 +286,17 @@ struct sockaddr_storage { #define PF_MAX AF_MAX #if !defined(_XOPEN_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. */ @@ -397,7 +432,7 @@ 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. @@ -410,18 +445,26 @@ struct cmsghdr { */ #define __CMSG_ALIGN(n) (((n) + __cmsg_alignbytes()) & ~__cmsg_alignbytes()) #ifdef _KERNEL -#define CMSG_ALIGN(n) CMSG_ALIGN(n) +#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) + \ + (((__caddr_t)(cmsg) + __CMSG_ALIGN((cmsg)->cmsg_len) + \ __CMSG_ALIGN(sizeof(struct cmsghdr)) > \ - (((caddr_t)(mhdr)->msg_control) + (mhdr)->msg_controllen)) ? \ + (((__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)) @@ -445,29 +488,31 @@ struct cmsghdr { * 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 +#include + +__BEGIN_DECLS int __cmsg_alignbytes __P((void)); +__END_DECLS #ifndef _KERNEL -#include - __BEGIN_DECLS int accept __P((int, struct sockaddr *, socklen_t *)); int bind __P((int, const struct sockaddr *, socklen_t)); @@ -489,10 +534,6 @@ int shutdown __P((int, 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 #endif /* !_KERNEL */ #endif /* !_SYS_SOCKET_H_ */