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.56
retrieving revision 1.62
diff -u -p -r1.56 -r1.62
--- src/sys/sys/socket.h	2000/06/26 15:48:21	1.56
+++ src/sys/sys/socket.h	2001/09/07 08:13:01	1.62
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.56 2000/06/26 15:48:21 kleink Exp $	*/
+/*	$NetBSD: socket.h,v 1.62 2001/09/07 08:13:01 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -78,12 +78,12 @@
 
 #ifndef sa_family_t
 typedef __sa_family_t	sa_family_t;
-#define 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
+#define socklen_t	__socklen_t
 #endif
 
 /*
@@ -189,7 +189,7 @@ struct	linger {
  * addresses.
  */
 struct sockaddr {
-	u_char		sa_len;		/* total length */
+	uint8_t		sa_len;		/* total length */
 	sa_family_t	sa_family;	/* address family */
 	char		sa_data[14];	/* actually longer; address value */
 };
@@ -211,13 +211,13 @@ struct sockproto {
  */
 #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_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 */
+	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 */
@@ -407,7 +407,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.
@@ -431,7 +431,14 @@ struct cmsghdr {
 	    (struct cmsghdr *)NULL : \
 	    (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))
@@ -455,8 +462,8 @@ 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 */
 };
 
 /*
@@ -472,12 +479,14 @@ struct omsghdr {
 };
 #endif
 
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
 int	__cmsg_alignbytes __P((void));
+__END_DECLS
 
 #ifndef	_KERNEL
 
-#include <sys/cdefs.h>
-
 __BEGIN_DECLS
 int	accept __P((int, struct sockaddr *, socklen_t *));
 int	bind __P((int, const struct sockaddr *, socklen_t));
@@ -499,10 +508,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_ */