patch-1.3.71 linux/include/linux/socket.h

Next file: linux/include/linux/tqueue.h
Previous file: linux/include/linux/skbuff.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.70/linux/include/linux/socket.h linux/include/linux/socket.h
@@ -5,14 +5,15 @@
 #include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/
 #include <linux/uio.h>			/* iovec support		*/
 
-struct sockaddr {
-  unsigned short	sa_family;	/* address family, AF_xxx	*/
-  char			sa_data[14];	/* 14 bytes of protocol address	*/
+struct sockaddr 
+{
+	unsigned short	sa_family;	/* address family, AF_xxx	*/
+	char		sa_data[14];	/* 14 bytes of protocol address	*/
 };
 
 struct linger {
-  int 			l_onoff;	/* Linger active		*/
-  int			l_linger;	/* How long to linger for	*/
+	int		l_onoff;	/* Linger active		*/
+	int		l_linger;	/* How long to linger for	*/
 };
 
 struct msghdr 
@@ -25,6 +26,17 @@
 	int		msg_accrightslen;	/* Length of rights list */
 };
 
+/*
+ *	4.4BSD changed to these new names for no apparent reason.
+ */
+ 
+#define msg_control	msg_accrights	
+#define msg_controllen	msg_accrightslen;	
+
+/* Control Messages */
+
+#define SCM_RIGHTS		1
+
 /* Socket types. */
 #define SOCK_STREAM	1		/* stream (connection) socket	*/
 #define SOCK_DGRAM	2		/* datagram (conn.less) socket	*/
@@ -73,6 +85,7 @@
 #define MSG_OOB		1
 #define MSG_PEEK	2
 #define MSG_DONTROUTE	4
+/*#define MSG_CTRUNC	8	- We need to support this for BSD oddments */
 
 /* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */
 #define SOL_IP		0

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this