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.85
retrieving revision 1.87.2.1
diff -u -p -r1.85 -r1.87.2.1
--- src/sys/sys/socket.h	2007/05/02 20:40:29	1.85
+++ src/sys/sys/socket.h	2007/09/03 10:24:01	1.87.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.85 2007/05/02 20:40:29 dyoung Exp $	*/
+/*	$NetBSD: socket.h,v 1.87.2.1 2007/09/03 10:24:01 skrll Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -462,6 +462,13 @@ struct msghdr {
 #define	MSG_MCAST	0x0200		/* this message was rcvd using link-level mcast */
 #define	MSG_NOSIGNAL	0x0400		/* do not generate SIGPIPE on EOF */
 
+/* Extra flags used internally only */
+#define	MSG_USERFLAGS	0x0ffffff
+#define MSG_NAMEMBUF	0x1000000	/* msg_name is an mbuf */
+#define MSG_CONTROLMBUF	0x2000000	/* msg_control is an mbuf */
+#define MSG_IOVUSRSPACE	0x4000000	/* msg_iov is in user space */
+#define MSG_LENUSRSPACE	0x8000000	/* address length is in user space */
+
 /*
  * Header for ancillary data objects in msg_control buffer.
  * Used for additional information with/about a datagram
@@ -539,8 +546,9 @@ __END_DECLS
 
 #ifdef	_KERNEL
 __BEGIN_DECLS
-struct sockaddr *sockaddr_copy(struct sockaddr *, const struct sockaddr *);
-struct sockaddr *sockaddr_alloc(sa_family_t, int);
+struct sockaddr *sockaddr_copy(struct sockaddr *, socklen_t,
+    const struct sockaddr *);
+struct sockaddr *sockaddr_alloc(sa_family_t, socklen_t, int);
 int sockaddr_cmp(const struct sockaddr *, const struct sockaddr *);
 struct sockaddr *sockaddr_dup(const struct sockaddr *, int);
 void sockaddr_free(struct sockaddr *);