[packages/kernel.git] / netfilter_ipv4-iptables-1.2.7.patch

diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_DSCP.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_DSCP.h
--- linux/include/linux/netfilter_ipv4/ipt_DSCP.h	Sat Jun  1 10:07:21 2002
+++ linux/include/linux/netfilter_ipv4/ipt_DSCP.h	Thu Mar 14 13:22:06 2002
@@ -6,17 +6,15 @@
  * 
  * See RFC2474 for a description of the DSCP field within the IP Header.
  *
- * ipt_DSCP.h,v 1.6 2002/02/25 09:41:23 laforge Exp
+ * Id: ipt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp 
 */
-#ifndef _IPT_DSCP_H
-#define _IPT_DSCP_H
-
-#define IPT_DSCP_MASK	0xfc	/* 11111100 */
-#define IPT_DSCP_SHIFT	2	/* shift DSCP two bits for ECN */
-#define IPT_DSCP_MAX	0x3f	/* 00111111 */
+#ifndef _IPT_DSCP_TARGET_H
+#define _IPT_DSCP_TARGET_H
+#include <linux/netfilter_ipv4/ipt_dscp.h>
 
+/* target info */
 struct ipt_DSCP_info {
 	u_int8_t dscp;
 };
 
-#endif /* _IPT_DSCP_H */
+#endif /* _IPT_DSCP_TARGET_H */
diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_ECN.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_ECN.h
--- linux/include/linux/netfilter_ipv4/ipt_ECN.h	Sat Jun  1 10:07:29 2002
+++ linux/include/linux/netfilter_ipv4/ipt_ECN.h	Wed May 29 17:12:30 2002
@@ -4,7 +4,7 @@
  *
  * This software is distributed under GNU GPL v2, 1991
  * 
- * $Id$
+ * $Id$
 */
 #ifndef _IPT_ECN_TARGET_H
 #define _IPT_ECN_TARGET_H
diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_FTOS.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_FTOS.h
--- linux/include/linux/netfilter_ipv4/ipt_FTOS.h	Thu Jan  1 01:00:00 1970
+++ linux/include/linux/netfilter_ipv4/ipt_FTOS.h	Wed Feb 28 12:21:54 2001
@@ -0,0 +1,16 @@
+/* Set TOS field in header to any value
+ *
+ * (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
+ *
+ * This software is distributed under GNU GPL v2, 1991
+ * 
+ * ipt_FTOS.h borrowed heavily from ipt_TOS.h  11/09/2000
+*/
+#ifndef _IPT_FTOS_H
+#define _IPT_FTOS_H
+
+struct ipt_FTOS_info {
+	u_int8_t ftos;
+};
+
+#endif /*_IPT_FTOS_H*/
diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_TTL.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_TTL.h
--- linux/include/linux/netfilter_ipv4/ipt_TTL.h	Sat Jun  1 10:07:37 2002
+++ linux/include/linux/netfilter_ipv4/ipt_TTL.h	Wed Feb 28 12:21:54 2001
@@ -16,6 +16,4 @@
 	u_int8_t	mode;
 	u_int8_t	ttl;
 };
-
-
 #endif
diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_ecn.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_ecn.h
--- linux/include/linux/netfilter_ipv4/ipt_ecn.h	Thu Jan  1 01:00:00 1970
+++ linux/include/linux/netfilter_ipv4/ipt_ecn.h	Wed May 29 17:12:30 2002
@@ -0,0 +1,34 @@
+/* iptables module for matching the ECN header in IPv4 and TCP header
+ *
+ * (C) 2002 Harald Welte <laforge@gnumonks.org>
+ * This software is distributed under GNU GPL v2, 1991
+ * 
+ * See 
+ *
+ * $Id$
+*/
+#ifndef _IPT_ECN_H
+#define _IPT_ECN_H
+#include <linux/netfilter_ipv4/ipt_dscp.h>
+
+#define IPT_ECN_IP_MASK	(~IPT_DSCP_MASK)
+
+#define IPT_ECN_OP_MATCH_IP	0x01
+#define IPT_ECN_OP_MATCH_ECE	0x10
+#define IPT_ECN_OP_MATCH_CWR	0x20
+
+#define IPT_ECN_OP_MATCH_MASK	0xce
+
+/* match info */
+struct ipt_ecn_info {
+	u_int8_t operation;
+	u_int8_t invert;
+	u_int8_t ip_ect;
+	union {
+		struct {
+			u_int8_t ect;
+		} tcp;
+	} proto;
+};
+
+#endif /* _IPT_ECN_H */
Commit	Line	Data
20d10a3b	1	diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_DSCP.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_DSCP.h
	2	--- linux/include/linux/netfilter_ipv4/ipt_DSCP.h Sat Jun 1 10:07:21 2002
	3	+++ linux/include/linux/netfilter_ipv4/ipt_DSCP.h Thu Mar 14 13:22:06 2002
	4	@@ -6,17 +6,15 @@
	5	*
	6	* See RFC2474 for a description of the DSCP field within the IP Header.
	7	*
	8	- * ipt_DSCP.h,v 1.6 2002/02/25 09:41:23 laforge Exp
	9	+ * Id: ipt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
	10	*/
	11	-#ifndef _IPT_DSCP_H
	12	-#define _IPT_DSCP_H
	13	-
	14	-#define IPT_DSCP_MASK 0xfc /* 11111100 */
	15	-#define IPT_DSCP_SHIFT 2 /* shift DSCP two bits for ECN */
	16	-#define IPT_DSCP_MAX 0x3f /* 00111111 */
	17	+#ifndef _IPT_DSCP_TARGET_H
	18	+#define _IPT_DSCP_TARGET_H
	19	+#include <linux/netfilter_ipv4/ipt_dscp.h>
	20
	21	+/* target info */
	22	struct ipt_DSCP_info {
	23	u_int8_t dscp;
	24	};
	25
	26	-#endif /* _IPT_DSCP_H */
	27	+#endif /* _IPT_DSCP_TARGET_H */
	28	diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_ECN.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_ECN.h
	29	--- linux/include/linux/netfilter_ipv4/ipt_ECN.h Sat Jun 1 10:07:29 2002
	30	+++ linux/include/linux/netfilter_ipv4/ipt_ECN.h Wed May 29 17:12:30 2002
	31	@@ -4,7 +4,7 @@
	32	*
	33	* This software is distributed under GNU GPL v2, 1991
	34	*
	35	- * $Id$
	36	+ * $Id$
	37	*/
	38	#ifndef _IPT_ECN_TARGET_H
	39	#define _IPT_ECN_TARGET_H
	40	diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_FTOS.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_FTOS.h
	41	--- linux/include/linux/netfilter_ipv4/ipt_FTOS.h Thu Jan 1 01:00:00 1970
	42	+++ linux/include/linux/netfilter_ipv4/ipt_FTOS.h Wed Feb 28 12:21:54 2001
	43	@@ -0,0 +1,16 @@
	44	+/* Set TOS field in header to any value
	45	+ *
	46	+ * (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
	47	+ *
	48	+ * This software is distributed under GNU GPL v2, 1991
	49	+ *
	50	+ * ipt_FTOS.h borrowed heavily from ipt_TOS.h 11/09/2000
	51	+*/
	52	+#ifndef _IPT_FTOS_H
	53	+#define _IPT_FTOS_H
	54	+
	55	+struct ipt_FTOS_info {
	56	+ u_int8_t ftos;
	57	+};
	58	+
	59	+#endif /_IPT_FTOS_H/
	60	diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_TTL.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_TTL.h
	61	--- linux/include/linux/netfilter_ipv4/ipt_TTL.h Sat Jun 1 10:07:37 2002
	62	+++ linux/include/linux/netfilter_ipv4/ipt_TTL.h Wed Feb 28 12:21:54 2001
	63	@@ -16,6 +16,4 @@
	64	u_int8_t mode;
65	u_int8_t ttl;
66	};
67	-
68	-
69	#endif
70	diff -Nur /usr/src/linux/include/linux/netfilter_ipv4/ipt_ecn.h rpm/netfilter/userspace/include/linux/netfilter_ipv4/ipt_ecn.h
71	--- linux/include/linux/netfilter_ipv4/ipt_ecn.h Thu Jan 1 01:00:00 1970
72	+++ linux/include/linux/netfilter_ipv4/ipt_ecn.h Wed May 29 17:12:30 2002
73	@@ -0,0 +1,34 @@
74	+/* iptables module for matching the ECN header in IPv4 and TCP header
75	+ *
76	+ * (C) 2002 Harald Welte <laforge@gnumonks.org>
77	+ * This software is distributed under GNU GPL v2, 1991
78	+ *
79	+ * See
80	+ *
81	+ * $Id$
82	+*/
83	+#ifndef _IPT_ECN_H
84	+#define _IPT_ECN_H
1d450df9	85	+#include <linux/netfilter_ipv4/ipt_dscp.h>
20d10a3b	86	+
	87	+#define IPT_ECN_IP_MASK (~IPT_DSCP_MASK)
	88	+
	89	+#define IPT_ECN_OP_MATCH_IP 0x01
	90	+#define IPT_ECN_OP_MATCH_ECE 0x10
	91	+#define IPT_ECN_OP_MATCH_CWR 0x20
	92	+
	93	+#define IPT_ECN_OP_MATCH_MASK 0xce
	94	+
	95	+/* match info */
	96	+struct ipt_ecn_info {
	97	+ u_int8_t operation;
	98	+ u_int8_t invert;
	99	+ u_int8_t ip_ect;
	100	+ union {
	101	+ struct {
	102	+ u_int8_t ect;
	103	+ } tcp;
	104	+ } proto;
	105	+};
	106	+
	107	+#endif /* _IPT_ECN_H */