SOURCES (LINUX_2_6): pom-ng-20060328.patch - removed conntrack-sip.
cieciwa
cieciwa at pld-linux.org
Tue Mar 28 19:05:11 CEST 2006
Author: cieciwa Date: Tue Mar 28 17:05:11 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- removed conntrack-sip.
---- Files affected:
SOURCES:
pom-ng-20060328.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/pom-ng-20060328.patch
diff -u SOURCES/pom-ng-20060328.patch:1.1.2.2 SOURCES/pom-ng-20060328.patch:1.1.2.3
--- SOURCES/pom-ng-20060328.patch:1.1.2.2 Tue Mar 28 14:33:41 2006
+++ SOURCES/pom-ng-20060328.patch Tue Mar 28 19:05:06 2006
@@ -5,7 +5,6 @@
include/linux/netfilter_ipv4/ip_conntrack_quake3.h | 22
include/linux/netfilter_ipv4/ip_conntrack_rpc.h | 71
include/linux/netfilter_ipv4/ip_conntrack_rtsp.h | 56
- include/linux/netfilter_ipv4/ip_conntrack_sip.h | 78
include/linux/netfilter_ipv4/ip_queue.h | 13
include/linux/netfilter_ipv4/ip_set.h | 498 +++++
include/linux/netfilter_ipv4/ip_set_iphash.h | 29
@@ -45,7 +44,7 @@
include/linux/netfilter_ipv6/ip6t_random.h | 11
include/linux/netfilter_mime.h | 89
net/ipv4/netfilter/Kconfig | 579 ++++++
- net/ipv4/netfilter/Makefile | 68
+ net/ipv4/netfilter/Makefile | 63
net/ipv4/netfilter/asn1_per.c | 353 +++
net/ipv4/netfilter/asn1_per.h | 83
net/ipv4/netfilter/ip_conntrack_h323_core.c | 37
@@ -56,12 +55,10 @@
net/ipv4/netfilter/ip_conntrack_rpc_tcp.c | 554 +++++
net/ipv4/netfilter/ip_conntrack_rpc_udp.c | 527 +++++
net/ipv4/netfilter/ip_conntrack_rtsp.c | 531 +++++
- net/ipv4/netfilter/ip_conntrack_sip.c | 412 ++++
net/ipv4/netfilter/ip_nat_h323.c | 196 ++
net/ipv4/netfilter/ip_nat_mms.c | 195 ++
net/ipv4/netfilter/ip_nat_quake3.c | 97 +
net/ipv4/netfilter/ip_nat_rtsp.c | 504 +++++
- net/ipv4/netfilter/ip_nat_sip.c | 249 ++
net/ipv4/netfilter/ip_queue.c | 35
net/ipv4/netfilter/ip_set.c | 1992 +++++++++++++++++++++
net/ipv4/netfilter/ip_set_iphash.c | 398 ++++
@@ -105,10 +102,10 @@
net/ipv6/netfilter/ip6t_nth.c | 173 +
net/ipv6/netfilter/ip6t_policy.c | 74
net/ipv6/netfilter/ip6t_random.c | 96 +
- 107 files changed, 22404 insertions(+), 108 deletions(-)
+ 104 files changed, 21660 insertions(+), 108 deletions(-)
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_helpers.h linux-2.6.16/include/linux/netfilter_helpers.h
--- linux-2.6.16.org/include/linux/netfilter_helpers.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_helpers.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_helpers.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,133 @@
+/*
+ * Helpers for netfiler modules. This file provides implementations for basic
@@ -245,7 +242,7 @@
+#endif /* _NETFILTER_HELPERS_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-28 14:25:11.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack.h 2006-03-28 18:55:16.000000000 +0200
@@ -29,6 +29,7 @@
};
@@ -264,7 +261,7 @@
struct ip_ct_irc_master ct_irc_info;
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_h323.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_h323.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_h323.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef _IP_CONNTRACK_H323_H
+#define _IP_CONNTRACK_H323_H
@@ -306,7 +303,7 @@
+#endif /* _IP_CONNTRACK_H323_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_mms.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_mms.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_mms.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,36 @@
+#ifndef _IP_CONNTRACK_MMS_H
+#define _IP_CONNTRACK_MMS_H
@@ -346,7 +343,7 @@
+#endif /* _IP_CONNTRACK_MMS_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_quake3.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_quake3.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_quake3.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,22 @@
+#ifndef _IP_CT_QUAKE3
+#define _IP_CT_QUAKE3
@@ -372,7 +369,7 @@
+#endif /* _IP_CT_QUAKE3 */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rpc.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rpc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rpc.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,71 @@
+/* RPC extension for IP connection tracking, Version 2.2
+ * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
@@ -447,7 +444,7 @@
+#endif /* _IP_CONNTRACK_RPC_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_rtsp.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * RTSP extension for IP connection tracking.
@@ -505,91 +502,9 @@
+#endif /* __KERNEL__ */
+
+#endif /* _IP_CONNTRACK_RTSP_H */
-diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_sip.h linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h
---- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_conntrack_sip.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_conntrack_sip.h 2006-03-28 14:21:43.000000000 +0200
-@@ -0,0 +1,78 @@
-+#ifndef __IP_CONNTRACK_SIP_H__
-+#define __IP_CONNTRACK_SIP_H__
-+/* SIP tracking. */
-+
-+#ifdef __KERNEL__
-+
-+#define SIP_PORT 5060
-+#define SIP_TIMEOUT 3600
-+
-+#define POS_VIA 0
-+#define POS_CONTACT 1
-+#define POS_CONTENT 2
-+#define POS_MEDIA 3
-+#define POS_OWNER 4
-+#define POS_CONECTION 5
-+#define POS_REQ_HEADER 6
-+#define POS_SDP_HEADER 7
-+
-+struct sip_header_nfo {
-+ const char *lname;
-+ size_t lnlen;
-+ const char *sname;
-+ size_t snlen;
-+ const char *ln_str;
-+ size_t ln_strlen;
-+ int (*match_len)(const char *, const char *, int *);
-+
-+};
-+
-+extern unsigned int (*ip_nat_sip_hook)(struct sk_buff **pskb,
-+ enum ip_conntrack_info ctinfo,
-+ struct ip_conntrack *ct,
-+ const char **dptr);
-+
-+/* For NAT to hook in when on expect. */
-+extern unsigned int (*ip_nat_sdp_hook)(struct sk_buff **pskb,
-+ enum ip_conntrack_info ctinfo,
-+ struct ip_conntrack_expect *exp,
-+ const char *dptr);
-+
-+extern int ct_sip_get_info(const char *dptr, size_t dlen,
-+ unsigned int *matchoff,
-+ unsigned int *matchlen,
-+ struct sip_header_nfo *hnfo);
-+
-+/* get line lenght until first CR or LF seen. */
-+static __inline__ int ct_sip_lnlen(const char *line, const char *limit)
-+{
-+ const char *k = line;
-+
-+ while ((line <= limit) && (*line == '\r' || *line == '\n'))
-+ line++;
-+
-+ while (line <= limit) {
-+ if (*line == '\r' || *line == '\n')
-+ break;
-+ line++;
-+ }
-+ return line - k;
-+}
-+
-+/* Linear string search, case sensitive. */
-+static __inline__
-+const char *ct_sip_search(const char *needle, const char *haystack,
-+ size_t needle_len, size_t haystack_len)
-+{
-+ const char *limit = haystack + (haystack_len - needle_len);
-+
-+ while (haystack <= limit) {
-+ if (memcmp(haystack, needle, needle_len) == 0)
-+ return haystack;
-+ haystack++;
-+ }
-+ return NULL;
-+}
-+#endif /* __KERNEL__ */
-+
-+#endif /* __IP_CONNTRACK_SIP_H__ */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_queue.h linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_queue.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_queue.h 2006-03-28 18:55:16.000000000 +0200
@@ -47,10 +47,20 @@
unsigned char payload[0]; /* Optional replacement packet */
} ipq_verdict_msg_t;
@@ -622,7 +537,7 @@
#endif /*_IP_QUEUE_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,498 @@
+#ifndef _IP_SET_H
+#define _IP_SET_H
@@ -1124,7 +1039,7 @@
+#endif /*_IP_SET_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iphash.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iphash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iphash.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,29 @@
+#ifndef __IP_SET_IPHASH_H
+#define __IP_SET_IPHASH_H
@@ -1157,7 +1072,7 @@
+#endif /* __IP_SET_IPHASH_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipmap.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipmap.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,56 @@
+#ifndef __IP_SET_IPMAP_H
+#define __IP_SET_IPMAP_H
@@ -1217,7 +1132,7 @@
+#endif /* __IP_SET_IPMAP_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_ipporthash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_ipporthash.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,33 @@
+#ifndef __IP_SET_IPPORTHASH_H
+#define __IP_SET_IPPORTHASH_H
@@ -1254,7 +1169,7 @@
+#endif /* __IP_SET_IPPORTHASH_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iptree.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_iptree.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_iptree.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,39 @@
+#ifndef __IP_SET_IPTREE_H
+#define __IP_SET_IPTREE_H
@@ -1297,7 +1212,7 @@
+#endif /* __IP_SET_IPTREE_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_jhash.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_jhash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_jhash.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,148 @@
+#ifndef _LINUX_IPSET_JHASH_H
+#define _LINUX_IPSET_JHASH_H
@@ -1449,7 +1364,7 @@
+#endif /* _LINUX_IPSET_JHASH_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_macipmap.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_macipmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_macipmap.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,38 @@
+#ifndef __IP_SET_MACIPMAP_H
+#define __IP_SET_MACIPMAP_H
@@ -1491,7 +1406,7 @@
+#endif /* __IP_SET_MACIPMAP_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_malloc.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_malloc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_malloc.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,116 @@
+#ifndef _IP_SET_MALLOC_H
+#define _IP_SET_MALLOC_H
@@ -1611,7 +1526,7 @@
+#endif /*_IP_SET_MALLOC_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_nethash.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_nethash.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h 2006-03-28 14:21:43.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_nethash.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,54 @@
+#ifndef __IP_SET_NETHASH_H
+#define __IP_SET_NETHASH_H
@@ -1669,7 +1584,7 @@
+#endif /* __IP_SET_NETHASH_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_portmap.h linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ip_set_portmap.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ip_set_portmap.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,25 @@
+#ifndef __IP_SET_PORTMAP_H
+#define __IP_SET_PORTMAP_H
@@ -1698,7 +1613,7 @@
+#endif /* __IP_SET_PORTMAP_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_IPMARK.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_IPMARK.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,13 @@
+#ifndef _IPT_IPMARK_H_target
+#define _IPT_IPMARK_H_target
@@ -1715,7 +1630,7 @@
+#endif /*_IPT_IPMARK_H_target*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ROUTE.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ROUTE.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,23 @@
+/* Header file for iptables ipt_ROUTE target
+ *
@@ -1742,7 +1657,7 @@
+#endif /*_IPT_ROUTE_H_target*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_XOR.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_XOR.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_XOR.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,9 @@
+#ifndef _IPT_XOR_H
+#define _IPT_XOR_H
@@ -1755,7 +1670,7 @@
+#endif /* _IPT_XOR_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_account.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_account.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_account.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,26 @@
+/*
+ * accounting match (ipt_account.c)
@@ -1785,7 +1700,7 @@
+
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_connlimit.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_connlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_connlimit.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _IPT_CONNLIMIT_H
+#define _IPT_CONNLIMIT_H
@@ -1801,7 +1716,7 @@
+#endif /* _IPT_CONNLIMIT_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_expire.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_expire.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_expire.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,32 @@
+/* This module matches until it expires, at which point the entire
+ * rule is deleted
@@ -1837,7 +1752,7 @@
+#endif
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_fuzzy.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_fuzzy.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_fuzzy.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_fuzzy.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_FUZZY_H
+#define _IPT_FUZZY_H
@@ -1862,7 +1777,7 @@
+#endif /*_IPT_FUZZY_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_geoip.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_geoip.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_geoip.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_geoip.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_geoip.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,50 @@
+/* ipt_geoip.h header file for libipt_geoip.c and ipt_geoip.c
+ *
@@ -1916,7 +1831,7 @@
+
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipp2p.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipp2p.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipp2p.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,29 @@
+#ifndef __IPT_IPP2P_H
+#define __IPT_IPP2P_H
@@ -1949,7 +1864,7 @@
+
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ipv4options.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipv4options.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_ipv4options.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipv4options.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_ipv4options.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef __ipt_ipv4options_h_included__
+#define __ipt_ipv4options_h_included__
@@ -1974,7 +1889,7 @@
+#endif /* __ipt_ipv4options_h_included__ */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_nth.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_nth.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_nth.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_nth.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _IPT_NTH_H
+#define _IPT_NTH_H
@@ -1997,7 +1912,7 @@
+#endif /*_IPT_NTH_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_osf.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_osf.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_osf.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_osf.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_osf.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,151 @@
+/*
+ * ipt_osf.h
@@ -2152,7 +2067,7 @@
+#endif /* _IPT_OSF_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_policy.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_policy.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_policy.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_policy.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_policy.h 2006-03-28 18:55:16.000000000 +0200
@@ -1,20 +1,20 @@
#ifndef _IPT_POLICY_H
#define _IPT_POLICY_H
@@ -2223,7 +2138,7 @@
};
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_psd.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_psd.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_psd.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_psd.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_psd.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _IPT_PSD_H
+#define _IPT_PSD_H
@@ -2267,7 +2182,7 @@
+#endif /*_IPT_PSD_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_quota.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_quota.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_quota.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_quota.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_quota.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,12 @@
+#ifndef _IPT_QUOTA_H
+#define _IPT_QUOTA_H
@@ -2283,7 +2198,7 @@
+#endif /*_IPT_QUOTA_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_random.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_random.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_random.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_random.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef _IPT_RAND_H
+#define _IPT_RAND_H
@@ -2298,7 +2213,7 @@
+#endif /*_IPT_RAND_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_rpc.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_rpc.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_rpc.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_rpc.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_rpc.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,35 @@
+/* RPC extension for IP netfilter matching, Version 2.2
+ * (C) 2000 by Marcelo Barbosa Lima <marcelo.lima at dcc.unicamp.br>
@@ -2337,7 +2252,7 @@
+#endif /* _IPT_RPC_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_set.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_set.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_set.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_set.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_set.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IPT_SET_H
+#define _IPT_SET_H
@@ -2362,7 +2277,7 @@
+#endif /*_IPT_SET_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_time.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_time.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_time.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_time.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_time.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,18 @@
+#ifndef __ipt_time_h_included__
+#define __ipt_time_h_included__
@@ -2384,7 +2299,7 @@
+#endif /* __ipt_time_h_included__ */
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_u32.h linux-2.6.16/include/linux/netfilter_ipv4/ipt_u32.h
--- linux-2.6.16.org/include/linux/netfilter_ipv4/ipt_u32.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_u32.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv4/ipt_u32.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,40 @@
+#ifndef _IPT_U32_H
+#define _IPT_U32_H
@@ -2428,7 +2343,7 @@
+#endif /*_IPT_U32_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_ROUTE.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_ROUTE.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_ROUTE.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_ROUTE.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,23 @@
+/* Header file for iptables ip6t_ROUTE target
+ *
@@ -2455,7 +2370,7 @@
+#endif /*_IP6T_ROUTE_H_target*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_expire.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_expire.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_expire.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_expire.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_expire.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,32 @@
+/* This module matches until it expires, at which point the entire
+ * rule is deleted
@@ -2491,7 +2406,7 @@
+#endif
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_fuzzy.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_fuzzy.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_fuzzy.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,21 @@
+#ifndef _IP6T_FUZZY_H
+#define _IP6T_FUZZY_H
@@ -2516,7 +2431,7 @@
+#endif /*_IP6T_FUZZY_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_nth.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_nth.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_nth.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_nth.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_nth.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,19 @@
+#ifndef _IP6T_NTH_H
+#define _IP6T_NTH_H
@@ -2539,7 +2454,7 @@
+#endif /*_IP6T_NTH_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_policy.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_policy.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_policy.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_policy.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_policy.h 2006-03-28 18:55:16.000000000 +0200
@@ -1,20 +1,20 @@
#ifndef _IP6T_POLICY_H
#define _IP6T_POLICY_H
@@ -2610,7 +2525,7 @@
};
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_random.h linux-2.6.16/include/linux/netfilter_ipv6/ip6t_random.h
--- linux-2.6.16.org/include/linux/netfilter_ipv6/ip6t_random.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_random.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_ipv6/ip6t_random.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef _IP6T_RAND_H
+#define _IP6T_RAND_H
@@ -2625,7 +2540,7 @@
+#endif /*_IP6T_RAND_H*/
diff -Nur --exclude '*orig' linux-2.6.16.org/include/linux/netfilter_mime.h linux-2.6.16/include/linux/netfilter_mime.h
--- linux-2.6.16.org/include/linux/netfilter_mime.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/include/linux/netfilter_mime.h 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/include/linux/netfilter_mime.h 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,89 @@
+/*
+ * MIME functions for netfilter modules. This file provides implementations
@@ -2718,7 +2633,7 @@
+#endif /* _NETFILTER_MIME_H */
diff -Nur --exclude '*orig' linux-2.6.16.org/net/ipv4/netfilter/Kconfig linux-2.6.16/net/ipv4/netfilter/Kconfig
--- linux-2.6.16.org/net/ipv4/netfilter/Kconfig 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/net/ipv4/netfilter/Kconfig 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/net/ipv4/netfilter/Kconfig 2006-03-28 18:55:16.000000000 +0200
@@ -606,5 +606,584 @@
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@@ -3306,17 +3221,12 @@
diff -Nur --exclude '*orig' linux-2.6.16.org/net/ipv4/netfilter/Makefile linux-2.6.16/net/ipv4/netfilter/Makefile
--- linux-2.6.16.org/net/ipv4/netfilter/Makefile 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16/net/ipv4/netfilter/Makefile 2006-03-28 14:25:59.000000000 +0200
-@@ -12,6 +12,17 @@
++++ linux-2.6.16/net/ipv4/netfilter/Makefile 2006-03-28 19:01:40.000000000 +0200
+@@ -12,6 +12,12 @@
# connection tracking
obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o
+
-+# SIP support
-+obj-$(CONFIG_IP_NF_SIP) += ip_conntrack_sip.o
-+obj-$(CONFIG_IP_NF_NAT_SIP) += ip_nat_sip.o
-+
-+
+# H.323 support
+obj-$(CONFIG_IP_NF_H323) += ip_conntrack_h323.o
+ip_conntrack_h323-objs := ip_conntrack_h323_core.o ip_conntrack_h323_h225.o ip_conntrack_h323_h245.o asn1_per.o
@@ -3325,7 +3235,7 @@
obj-$(CONFIG_IP_NF_NAT) += ip_nat.o
# conntrack netlink interface
-@@ -22,6 +33,13 @@
+@@ -22,6 +28,13 @@
obj-$(CONFIG_IP_NF_CT_PROTO_SCTP) += ip_conntrack_proto_sctp.o
# connection tracking helpers
@@ -3339,7 +3249,7 @@
obj-$(CONFIG_IP_NF_PPTP) += ip_conntrack_pptp.o
obj-$(CONFIG_IP_NF_AMANDA) += ip_conntrack_amanda.o
obj-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp.o
-@@ -30,11 +48,13 @@
+@@ -30,11 +43,13 @@
obj-$(CONFIG_IP_NF_NETBIOS_NS) += ip_conntrack_netbios_ns.o
# NAT helpers
@@ -3353,7 +3263,7 @@
# generic IP tables
obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o
-@@ -46,34 +66,82 @@
+@@ -46,34 +61,82 @@
obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
# matches
@@ -3438,7 +3348,7 @@
obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
diff -Nur --exclude '*orig' linux-2.6.16.org/net/ipv4/netfilter/asn1_per.c linux-2.6.16/net/ipv4/netfilter/asn1_per.c
--- linux-2.6.16.org/net/ipv4/netfilter/asn1_per.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.16/net/ipv4/netfilter/asn1_per.c 2006-03-28 14:21:44.000000000 +0200
++++ linux-2.6.16/net/ipv4/netfilter/asn1_per.c 2006-03-28 18:55:16.000000000 +0200
@@ -0,0 +1,353 @@
+/*
+ * Tiny ASN.1 packet encoding rules (PER) library.
@@ -3795,7 +3705,7 @@
+}
diff -Nur --exclude '*orig' linux-2.6.16.org/net/ipv4/netfilter/asn1_per.h linux-2.6.16/net/ipv4/netfilter/asn1_per.h
--- linux-2.6.16.org/net/ipv4/netfilter/asn1_per.h 1970-01-01 01:00:00.000000000 +0100
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/pom-ng-20060328.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list