* include/ipxrtdef.h: Cleanup.

	(IPX_INTERFACE_INFO_TYPE,IPX_STATIC_ROUTE_INFO_TYPE)
	(IPX_STATIC_SERVICE_INFO_TYPE,IPX_SERVICE_FILTER_INFO_TYPE)
	(IPX_ROUTE_FILTER_INFO_TYPE,IPX_IN_TRAFFIC_FILTER_INFO_TYPE)
	(IPX_ADAPTER_INFO_TYPE,IPXWAN_INTERFACE_INFO_TYPE,IPX_GLOBAL_INFO_TYPE)
	(IPX_STATIC_NETBIOS_NAME_INFO_TYPE)
	(IPX_IN_TRAFFIC_FILTER_GLOBAL_INFO_TYPE)
	(IPX_OUT_TRAFFIC_FILTER_INFO_TYPE)
	(IPX_OUT_TRAFFIC_FILTER_GLOBAL_INFO_TYPE): Define.
	* include/routprot.h: Cleanup.
	(PROTO_IP_*,IPRTRMGR_PID,IPX_PROTOCOL_*): Define.
	* include/fltdefs.h: New file.
	* include/ipinfoid.h: New file.

5 files changed, 168 insertions, 1 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index abed26b98..5f03b1a5c 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,21 @@
 2006-05-11  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
+	* include/ipxrtdef.h: Cleanup.
+	(IPX_INTERFACE_INFO_TYPE,IPX_STATIC_ROUTE_INFO_TYPE)
+	(IPX_STATIC_SERVICE_INFO_TYPE,IPX_SERVICE_FILTER_INFO_TYPE)
+	(IPX_ROUTE_FILTER_INFO_TYPE,IPX_IN_TRAFFIC_FILTER_INFO_TYPE)
+	(IPX_ADAPTER_INFO_TYPE,IPXWAN_INTERFACE_INFO_TYPE,IPX_GLOBAL_INFO_TYPE)
+	(IPX_STATIC_NETBIOS_NAME_INFO_TYPE)
+	(IPX_IN_TRAFFIC_FILTER_GLOBAL_INFO_TYPE)
+	(IPX_OUT_TRAFFIC_FILTER_INFO_TYPE)
+	(IPX_OUT_TRAFFIC_FILTER_GLOBAL_INFO_TYPE): Define.
+	* include/routprot.h: Cleanup.
+	(PROTO_IP_*,IPRTRMGR_PID,IPX_PROTOCOL_*): Define.
+	* include/fltdefs.h: New file.
+	* include/ipinfoid.h: New file.
+
+2006-05-11  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+
 	* include/strmif.h (IAMAnalogVideoDecoder,IAMAudioInputMixer)
 	(IAMAudioRendererStats,IAMBufferNegotiation,IAMCameraControl)
 	(IAMCertifiedOutputProtection): Add interfaces.
diff --git a/winsup/w32api/include/fltdefs.h b/winsup/w32api/include/fltdefs.h
new file mode 100644
index 000000000..eadf0ac19
--- /dev/null
+++ b/winsup/w32api/include/fltdefs.h
@@ -0,0 +1,50 @@
+/*
+ * fltdefs.h - Routing and Remote Access Services
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain.  You may use,
+ * modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED.  This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+#ifndef _FLTDEFS_H
+#define _FLTDEFS_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*--- Packet Filtering Reference - Packet Filtering Enumerated Types */
+#if (_WIN32_WINNT >= 0x0500)
+typedef enum _GlobalFilter {
+	GF_FRAGMENTS = 2,
+	GF_STRONGHOST = 8,
+	GF_FRAGCACHE = 9
+} GLOBAL_FILTER,*PGLOBAL_FILTER;
+typedef enum _PfAddresType {
+	PF_IPV4,
+	PF_IPV6
+} PFADDRESSTYPE,*PPFADDRESSTYPE;
+typedef enum _PfForwardAction {
+	PF_ACTION_FORWARD = 0,
+	PF_ACTION_DROP
+} PFFORWARD_ACTION,*PPFFORWARD_ACTION;
+typedef enum _PfFrameType {
+	PFFT_FILTER = 1,
+	PFFT_FRAG = 2,
+	PFFT_SPOOF = 3
+} PFFRAMETYPE,*PPFFRAMETYPE;
+#endif /* (_WIN32_WINNT >= 0x0500) */
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/ipinfoid.h b/winsup/w32api/include/ipinfoid.h
new file mode 100644
index 000000000..be5adb27a
--- /dev/null
+++ b/winsup/w32api/include/ipinfoid.h
@@ -0,0 +1,43 @@
+/*
+ * ipinfoid.h - Routing and Remote Access Services
+ *
+ * THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ * This source code is offered for use in the public domain.  You may use,
+ * modify or distribute it freely.
+ *
+ * This code is distributed in the hope that it will be useful but
+ * WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ * DISCLAIMED.  This includes but is not limited to warranties of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+#ifndef _IPINFOID_H
+#define _IPINFOID_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+/*--- Router Management Reference - Router Information Enumeration Types */
+#define IP_IN_FILTER_INFO 0xFFFF0001
+#define IP_OUT_FILTER_INFO 0xFFFF0002
+#define IP_GLOBAL_INFO 0xFFFF0003
+#define IP_INTERFACE_STATUS_INFO 0xFFFF0004
+#define IP_ROUTE_INFO 0xFFFF0005
+#define IP_PROT_PRIORITY_INFO 0xFFFF0006
+#define IP_ROUTER_DISC_INFO 0xFFFF0007
+#define IP_DEMAND_DIAL_FILTER_INFO 0xFFFF0009
+#define IP_MCAST_HEARBEAT_INFO 0xFFFF000A
+#define IP_MCAST_BOUNDARY_INFO 0xFFFF000B
+#define IP_IPINIP_CFG_INFO 0xFFFF000C
+#define IP_IFFILTER_INFO 0xFFFF000D
+#define IP_MCAST_LIMIT_INFO 0xFFFF000E
+/*#define IP_DEMAND_DIAL_FILTER_INFO_V6 */
+/*#define IP_FILTER_ENABLE_INFO_V6 */
+/*#define IP_IN_FILTER_INFO_V6 */
+/*#define IP_IFFILTER_INFO_V6 */
+/*#define IP_OUT_FILTER_INFO_V6 */
+/*#define IPV6_GLOBAL_INFO */
+/*#define IPV6_ROUTE_INFO */
+
+#endif
diff --git a/winsup/w32api/include/ipxrtdef.h b/winsup/w32api/include/ipxrtdef.h
index f9240e16d..75fb30a22 100644
--- a/winsup/w32api/include/ipxrtdef.h
+++ b/winsup/w32api/include/ipxrtdef.h
@@ -1,3 +1,12 @@
+/*
+	ipxrtdef.h - Routing and Remote Access Services
+
+	This file is part of a free library for the Win32 API.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
 #ifndef _IPXRTDEF_H
 #define _IPXRTDEF_H
 #if __GNUC__ >= 3
@@ -10,6 +19,21 @@
 extern "C" {
 #endif
 
+/*--- Router Management Reference - Router Information Enumeration Types */
+#define IPX_INTERFACE_INFO_TYPE 0x0001
+#define IPX_STATIC_ROUTE_INFO_TYPE 0x0002
+#define IPX_STATIC_SERVICE_INFO_TYPE 0x0003
+#define IPX_SERVICE_FILTER_INFO_TYPE 0x0004
+#define IPX_ROUTE_FILTER_INFO_TYPE 0x0005
+#define IPX_IN_TRAFFIC_FILTER_INFO_TYPE 0x0006
+#define IPX_ADAPTER_INFO_TYPE 0x0007
+#define IPXWAN_INTERFACE_INFO_TYPE 0x0008
+#define IPX_GLOBAL_INFO_TYPE 0x0009
+#define IPX_STATIC_NETBIOS_NAME_INFO_TYPE 0x000A
+#define IPX_IN_TRAFFIC_FILTER_GLOBAL_INFO_TYPE 0x000B
+#define IPX_OUT_TRAFFIC_FILTER_INFO_TYPE 0x000C
+#define IPX_OUT_TRAFFIC_FILTER_GLOBAL_INFO_TYPE 0x000D
+/*--- Router Management Reference - Router Information Structures - IPX Information Structures */
 #if (_WIN32_WINNT >= 0x0500)
 typedef struct _IPX_IF_INFO {
 	ULONG AdminState;
diff --git a/winsup/w32api/include/routprot.h b/winsup/w32api/include/routprot.h
index 5845fc4fa..54fe9ee68 100644
--- a/winsup/w32api/include/routprot.h
+++ b/winsup/w32api/include/routprot.h
@@ -1,3 +1,12 @@
+/*
+	routprot.h - Routing and Remote Access Services
+
+	This file is part of a free library for the Win32 API.
+
+	This library is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
 #ifndef _ROUTPROT_H
 #define _ROUTPROT_H
 #if __GNUC__ >= 3
@@ -8,6 +17,31 @@
 extern "C" {
 #endif
 
+/*--- Router Management MIB Reference - Transport and Protocol Constants */
+#define PROTO_IP_OTHER 0x00000001
+#define PROTO_IP_LOCAL 0x00000002
+#define PROTO_IP_NETMGMT 0x00000003
+#define PROTO_IP_ICMP 0x00000004
+#define PROTO_IP_EGP 0x00000005
+#define PROTO_IP_GGP 0x00000006
+#define PROTO_IP_HELLO 0x00000007
+#define PROTO_IP_RIP 0x00000008
+#define PROTO_IP_IS_IS 0x00000009
+#define PROTO_IP_ES_IS 0x0000000A
+#define PROTO_IP_CISCO 0x0000000B
+#define PROTO_IP_BBN 0x0000000C
+#define PROTO_IP_OSPF 0x0000000D
+#define PROTO_IP_BGP 0x0000000E
+#define PROTO_IP_BOOTP 0x0000270F
+#define PROTO_IP_NT_AUTOSTATIC 0x00002712
+#define PROTO_IP_NT_STATIC 0x00002716
+#define PROTO_IP_NT_STATIC_NON_DOD 0x00002717
+#define IPRTRMGR_PID 10000
+#define IPX_PROTOCOL_BASE 0x0001FFFF
+#define IPX_PROTOCOL_RIP 0x00020000
+#define IPX_PROTOCOL_SAP 0x00020001
+#define IPX_PROTOCOL_NLSP 0x00020002
+/*--- Router Management Reference - Router Management Structures */
 #if (_WIN32_WINNT >= 0x0500)
 typedef struct IP_ADAPTER_BINDING_INFO {
 	ULONG AddressCount;
@@ -28,7 +62,7 @@ typedef struct IPX_ADAPTER_BINDING_INFO {
 	ULONG MaxPacketSize;
 	ULONG LinkSpeed;
 } IPX_ADAPTER_BINDING_INFO,*PIPX_ADAPTER_BINDING_INFO;
-#endif
+#endif /* (_WIN32_WINNT >= 0x0500) */
 
 #ifdef __cplusplus
 }