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

• Lines: 45
• Date: Mon Aug 23 10:01:02 1999
• Orig file: v2.3.14/linux/include/linux/socket.h
• Orig date: Thu Apr 15 05:42:43 1999

diff -u --recursive --new-file v2.3.14/linux/include/linux/socket.h linux/include/linux/socket.h
@@ -158,7 +158,7 @@
 #define AF_DECnet	12	/* Reserved for DECnet project	*/
 #define AF_NETBEUI	13	/* Reserved for 802.2LLC project*/
 #define AF_SECURITY	14	/* Security callback pseudo AF */
-#define pseudo_AF_KEY   15      /* PF_KEY key management API */
+#define AF_KEY		15      /* PF_KEY key management API */
 #define AF_NETLINK	16
 #define AF_ROUTE	AF_NETLINK /* Alias to emulate 4.4BSD */
 #define AF_PACKET	17	/* Packet family		*/
@@ -186,7 +186,7 @@
 #define PF_DECnet	AF_DECnet
 #define PF_NETBEUI	AF_NETBEUI
 #define PF_SECURITY	AF_SECURITY
-#define PF_KEY          pseudo_AF_KEY
+#define PF_KEY		AF_KEY
 #define PF_NETLINK	AF_NETLINK
 #define PF_ROUTE	AF_ROUTE
 #define PF_PACKET	AF_PACKET
@@ -210,22 +210,19 @@
 #define MSG_DONTROUTE	4
 #define MSG_TRYHARD     4       /* Synonym for MSG_DONTROUTE for DECnet */
 #define MSG_CTRUNC	8
-#define MSG_PROXY	0x10	/* Supply or ask second address. */
+#define MSG_PROBE	0x10	/* Do not send. Only probe path f.e. for MTU */
 #define MSG_TRUNC	0x20
 #define MSG_DONTWAIT	0x40	/* Nonblocking io		 */
 #define MSG_EOR         0x80	/* End of record */
 #define MSG_WAITALL	0x100	/* Wait for a full request */
 #define MSG_FIN         0x200
 #define MSG_SYN		0x400
-#define MSG_URG		0x800
+#define MSG_CONFIRM	0x800	/* Confirm path validity */
 #define MSG_RST		0x1000
-#define MSG_ERRQUEUE	0x2000
-#define MSG_NOSIGNAL	0x4000
-
-#define MSG_CTLIGNORE   0x80000000
+#define MSG_ERRQUEUE	0x2000	/* Fetch message from error queue */
+#define MSG_NOSIGNAL	0x4000	/* Do not generate SIGPIPE */
 
 #define MSG_EOF         MSG_FIN
-#define MSG_CTLFLAGS	(MSG_OOB|MSG_URG|MSG_FIN|MSG_SYN|MSG_RST)
 
 
 /* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */