* [0/5] xtables: phase out case sensitivity
@ 2011-01-18 15:38 Jan Engelhardt
2011-01-18 15:39 ` [1/5] netfilter: xtables: avoid case-sensitive filenames (1/5) Jan Engelhardt
` (5 more replies)
0 siblings, 6 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:38 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List, Aaron Wright
Hi,
bug report http://bugzilla.netfilter.org/show_bug.cgi?id=694 , though
being written in a heated fashion, did prompt me to revisit the
actual issue. While I have to question why users are relying on
inferior filesystems (the issue was raised before on the lists), I
feel inclined to solve bugs.
So here is a proposed patchset that starts the migration. Since iptables
userspace looks modules up by protocol anyway, it continues to work. The
only thing is headers, which is merely a build time thing and, as has
itself shown in the past years, no deal. Within the usual grace period
of 1-1.5 years (or even sooner than usual - since userspace has its own
copies of headers), the netfilter/ dirs can be completely case-free.
---
The following changes since commit 0b8ad876275c74e4bfb6ec3150793f3c0ecfcee2:
netfilter: xtables: add missing header files to export list (2011-01-18 11:25:02 +0100)
are available in the git repository at:
git://dev.medozas.de/linux master
Jan Engelhardt (5):
netfilter: xtables: avoid case-sensitive filenames (1/5)
netfilter: xtables: case-sensitivity avoidance (2/5)
netfilter: xtables: case-sensitivity avoidance (3/5)
netfilter: xtables: case-sensitivity avoidance (4/5)
netfilter: xtables: case-sensitivity avoidance (5/5)
Documentation/feature-removal-schedule.txt | 10 ++++
include/linux/netfilter/Kbuild | 42 ++++++++------
include/linux/netfilter/xt_AUDIT.h | 31 +----------
include/linux/netfilter/xt_CHECKSUM.h | 21 +-------
include/linux/netfilter/xt_CLASSIFY.h | 11 +----
include/linux/netfilter/xt_CONNSECMARK.h | 16 +-----
include/linux/netfilter/xt_CT.h | 18 +------
include/linux/netfilter/xt_DSCP.h | 25 ---------
include/linux/netfilter/xt_IDLETIMER.h | 46 +---------------
include/linux/netfilter/xt_LED.h | 16 +-----
include/linux/netfilter/xt_NFLOG.h | 21 +-------
include/linux/netfilter/xt_NFQUEUE.h | 24 +--------
include/linux/netfilter/xt_RATEEST.h | 16 +-----
include/linux/netfilter/xt_SECMARK.h | 23 +--------
include/linux/netfilter/xt_TCPMSS.h | 13 +----
include/linux/netfilter/xt_TCPOPTSTRIP.h | 14 +-----
include/linux/netfilter/xt_TEE.h | 13 +----
include/linux/netfilter/xt_TPROXY.h | 22 +-------
include/linux/netfilter/xt_audit.h | 30 ++++++++++
include/linux/netfilter/xt_checksum.h | 20 +++++++
include/linux/netfilter/xt_classify.h | 10 ++++
include/linux/netfilter/xt_clusterip.h | 34 ++++++++++++
include/linux/netfilter/xt_connsecmark.h | 15 +++++
include/linux/netfilter/xt_ct.h | 17 ++++++
include/linux/netfilter/xt_dscp.h | 10 ++++
include/linux/netfilter/xt_ecn.h | 49 +++++++++++++++++
include/linux/netfilter/xt_hl.h | 58 ++++++++++++++++++++
include/linux/netfilter/xt_idletimer.h | 45 +++++++++++++++
include/linux/netfilter/xt_led.h | 15 +++++
include/linux/netfilter/xt_log.h | 34 ++++++++++++
include/linux/netfilter/xt_nflog.h | 20 +++++++
include/linux/netfilter/xt_nfqueue.h | 23 ++++++++
include/linux/netfilter/xt_rateest.h | 9 +++
include/linux/netfilter/xt_reject.h | 34 ++++++++++++
include/linux/netfilter/xt_same.h | 18 ++++++
include/linux/netfilter/xt_secmark.h | 22 ++++++++
include/linux/netfilter/xt_tcpmss.h | 6 ++
include/linux/netfilter/xt_tcpoptstrip.h | 13 +++++
include/linux/netfilter/xt_tee.h | 12 ++++
include/linux/netfilter/xt_tproxy.h | 21 +++++++
include/linux/netfilter/xt_ulog.h | 49 +++++++++++++++++
include/linux/netfilter_ipv4/Kbuild | 12 +---
include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 35 +------------
include/linux/netfilter_ipv4/ipt_ECN.h | 32 +-----------
include/linux/netfilter_ipv4/ipt_LOG.h | 20 +-------
include/linux/netfilter_ipv4/ipt_REJECT.h | 21 +-------
include/linux/netfilter_ipv4/ipt_SAME.h | 19 +------
include/linux/netfilter_ipv4/ipt_TTL.h | 22 +-------
include/linux/netfilter_ipv4/ipt_ULOG.h | 50 +-----------------
include/linux/netfilter_ipv4/ipt_ecn.h | 34 +-----------
include/linux/netfilter_ipv4/ipt_ttl.h | 22 +-------
include/linux/netfilter_ipv6/Kbuild | 6 +--
include/linux/netfilter_ipv6/ip6t_HL.h | 23 +--------
include/linux/netfilter_ipv6/ip6t_LOG.h | 20 +-------
include/linux/netfilter_ipv6/ip6t_REJECT.h | 19 +------
include/linux/netfilter_ipv6/ip6t_hl.h | 23 +--------
net/ipv4/netfilter/Makefile | 16 +++---
net/ipv4/netfilter/ipt_ecn.c | 2 +-
.../netfilter/{ipt_CLUSTERIP.c => xt_clusterip.c} | 3 +-
net/ipv4/netfilter/{ipt_ECN.c => xt_ecn_tg.c} | 3 +-
net/ipv4/netfilter/{ipt_LOG.c => xt_log_ipv4.c} | 3 +-
.../{ipt_MASQUERADE.c => xt_masquerade.c} | 1 +
net/ipv4/netfilter/{ipt_NETMAP.c => xt_netmap.c} | 1 +
.../netfilter/{ipt_REDIRECT.c => xt_redirect.c} | 0
.../netfilter/{ipt_REJECT.c => xt_reject_ipv4.c} | 3 +-
net/ipv4/netfilter/{ipt_ULOG.c => xt_ulog.c} | 3 +-
net/ipv6/netfilter/Makefile | 4 +-
net/ipv6/netfilter/{ip6t_LOG.c => xt_log_ipv6.c} | 3 +-
.../netfilter/{ip6t_REJECT.c => xt_reject_ipv6.c} | 3 +-
net/netfilter/Makefile | 38 +++++++-------
net/netfilter/{xt_AUDIT.c => xt_audit.c} | 2 +-
net/netfilter/{xt_CHECKSUM.c => xt_checksum.c} | 2 +-
net/netfilter/{xt_CLASSIFY.c => xt_classify.c} | 2 +-
.../{xt_CONNSECMARK.c => xt_connsecmark.c} | 2 +-
net/netfilter/{xt_CT.c => xt_ct.c} | 2 +-
net/netfilter/{xt_DSCP.c => xt_dscp_tg.c} | 2 +-
net/netfilter/xt_hl.c | 3 +-
net/netfilter/{xt_HL.c => xt_hl_tg.c} | 3 +-
net/netfilter/{xt_IDLETIMER.c => xt_idletimer.c} | 2 +-
net/netfilter/{xt_LED.c => xt_led.c} | 2 +-
net/netfilter/{xt_NFLOG.c => xt_nflog.c} | 2 +-
net/netfilter/{xt_NFQUEUE.c => xt_nfqueue.c} | 2 +-
net/netfilter/{xt_NOTRACK.c => xt_notrack.c} | 0
net/netfilter/{xt_RATEEST.c => xt_rateest_tg.c} | 2 +-
net/netfilter/{xt_SECMARK.c => xt_secmark.c} | 2 +-
net/netfilter/{xt_TCPMSS.c => xt_tcpmss_tg.c} | 2 +-
.../{xt_TCPOPTSTRIP.c => xt_tcpoptstrip.c} | 2 +-
net/netfilter/{xt_TEE.c => xt_tee.c} | 2 +-
net/netfilter/{xt_TPROXY.c => xt_tproxy.c} | 2 +-
net/netfilter/{xt_TRACE.c => xt_trace.c} | 0
90 files changed, 695 insertions(+), 730 deletions(-)
create mode 100644 include/linux/netfilter/xt_audit.h
create mode 100644 include/linux/netfilter/xt_checksum.h
create mode 100644 include/linux/netfilter/xt_classify.h
create mode 100644 include/linux/netfilter/xt_clusterip.h
create mode 100644 include/linux/netfilter/xt_connsecmark.h
create mode 100644 include/linux/netfilter/xt_ct.h
create mode 100644 include/linux/netfilter/xt_ecn.h
create mode 100644 include/linux/netfilter/xt_hl.h
create mode 100644 include/linux/netfilter/xt_idletimer.h
create mode 100644 include/linux/netfilter/xt_led.h
create mode 100644 include/linux/netfilter/xt_log.h
create mode 100644 include/linux/netfilter/xt_nflog.h
create mode 100644 include/linux/netfilter/xt_nfqueue.h
create mode 100644 include/linux/netfilter/xt_reject.h
create mode 100644 include/linux/netfilter/xt_same.h
create mode 100644 include/linux/netfilter/xt_secmark.h
create mode 100644 include/linux/netfilter/xt_tcpoptstrip.h
create mode 100644 include/linux/netfilter/xt_tee.h
create mode 100644 include/linux/netfilter/xt_tproxy.h
create mode 100644 include/linux/netfilter/xt_ulog.h
rename net/ipv4/netfilter/{ipt_CLUSTERIP.c => xt_clusterip.c} (99%)
rename net/ipv4/netfilter/{ipt_ECN.c => xt_ecn_tg.c} (98%)
rename net/ipv4/netfilter/{ipt_LOG.c => xt_log_ipv4.c} (99%)
rename net/ipv4/netfilter/{ipt_MASQUERADE.c => xt_masquerade.c} (99%)
rename net/ipv4/netfilter/{ipt_NETMAP.c => xt_netmap.c} (99%)
rename net/ipv4/netfilter/{ipt_REDIRECT.c => xt_redirect.c} (100%)
rename net/ipv4/netfilter/{ipt_REJECT.c => xt_reject_ipv4.c} (98%)
rename net/ipv4/netfilter/{ipt_ULOG.c => xt_ulog.c} (99%)
rename net/ipv6/netfilter/{ip6t_LOG.c => xt_log_ipv6.c} (99%)
rename net/ipv6/netfilter/{ip6t_REJECT.c => xt_reject_ipv6.c} (99%)
rename net/netfilter/{xt_AUDIT.c => xt_audit.c} (99%)
rename net/netfilter/{xt_CHECKSUM.c => xt_checksum.c} (97%)
rename net/netfilter/{xt_CLASSIFY.c => xt_classify.c} (97%)
rename net/netfilter/{xt_CONNSECMARK.c => xt_connsecmark.c} (98%)
rename net/netfilter/{xt_CT.c => xt_ct.c} (99%)
rename net/netfilter/{xt_DSCP.c => xt_dscp_tg.c} (99%)
rename net/netfilter/{xt_HL.c => xt_hl_tg.c} (97%)
rename net/netfilter/{xt_IDLETIMER.c => xt_idletimer.c} (99%)
rename net/netfilter/{xt_LED.c => xt_led.c} (99%)
rename net/netfilter/{xt_NFLOG.c => xt_nflog.c} (97%)
rename net/netfilter/{xt_NFQUEUE.c => xt_nfqueue.c} (98%)
rename net/netfilter/{xt_NOTRACK.c => xt_notrack.c} (100%)
rename net/netfilter/{xt_RATEEST.c => xt_rateest_tg.c} (99%)
rename net/netfilter/{xt_SECMARK.c => xt_secmark.c} (98%)
rename net/netfilter/{xt_TCPMSS.c => xt_tcpmss_tg.c} (99%)
rename net/netfilter/{xt_TCPOPTSTRIP.c => xt_tcpoptstrip.c} (98%)
rename net/netfilter/{xt_TEE.c => xt_tee.c} (99%)
rename net/netfilter/{xt_TPROXY.c => xt_tproxy.c} (99%)
rename net/netfilter/{xt_TRACE.c => xt_trace.c} (100%)
^ permalink raw reply [flat|nested] 14+ messages in thread
* [1/5] netfilter: xtables: avoid case-sensitive filenames (1/5)
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
@ 2011-01-18 15:39 ` Jan Engelhardt
2011-01-18 15:39 ` [2/5] netfilter: xtables: case-sensitivity avoidance (2/5) Jan Engelhardt
` (4 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:39 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List
parent 0b8ad876275c74e4bfb6ec3150793f3c0ecfcee2 (v2.6.37-3808-g0b8ad87)
commit 10fc4644d17ccace699f2c62f9b15f8f024ddb4d
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Tue Jan 18 07:46:55 2011 +0100
netfilter: xtables: avoid case-sensitive filenames (1/5)
This problem is well known, and though people have been told to get
real and use a case-sensitive filesystem, I think this move should be
done nevertheless. Since userspace has its own copies of header files,
this should work out in the general case.
Part 1: Process header files from include/linux/netfilter/, turning
their names into lowercase.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=694
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/linux/netfilter/Kbuild | 30 +++++-------
include/linux/netfilter/xt_DSCP.h | 26 ----------
include/linux/netfilter/xt_RATEEST.h | 15 ------
include/linux/netfilter/xt_TCPMSS.h | 12 -----
include/linux/netfilter/{xt_AUDIT.h => xt_audit.h} | 0
.../netfilter/{xt_CHECKSUM.h => xt_checksum.h} | 0
.../netfilter/{xt_CLASSIFY.h => xt_classify.h} | 0
.../{xt_CONNSECMARK.h => xt_connsecmark.h} | 0
include/linux/netfilter/{xt_CT.h => xt_ct.h} | 0
include/linux/netfilter/xt_dscp.h | 10 ++++
.../netfilter/{xt_IDLETIMER.h => xt_idletimer.h} | 0
include/linux/netfilter/{xt_LED.h => xt_led.h} | 0
include/linux/netfilter/{xt_NFLOG.h => xt_nflog.h} | 0
.../linux/netfilter/{xt_NFQUEUE.h => xt_nfqueue.h} | 0
include/linux/netfilter/xt_rateest.h | 9 ++++
.../linux/netfilter/{xt_SECMARK.h => xt_secmark.h} | 0
include/linux/netfilter/xt_tcpmss.h | 6 ++
.../{xt_TCPOPTSTRIP.h => xt_tcpoptstrip.h} | 0
include/linux/netfilter/{xt_TEE.h => xt_tee.h} | 0
.../linux/netfilter/{xt_TPROXY.h => xt_tproxy.h} | 0
include/linux/netfilter_ipv4/ipt_ECN.h | 2 +-
net/netfilter/xt_AUDIT.c | 2 +-
net/netfilter/xt_CHECKSUM.c | 2 +-
net/netfilter/xt_CLASSIFY.c | 2 +-
net/netfilter/xt_CONNSECMARK.c | 2 +-
net/netfilter/xt_CT.c | 2 +-
net/netfilter/xt_DSCP.c | 2 +-
net/netfilter/xt_IDLETIMER.c | 2 +-
net/netfilter/xt_LED.c | 2 +-
net/netfilter/xt_NFLOG.c | 2 +-
net/netfilter/xt_NFQUEUE.c | 2 +-
net/netfilter/xt_RATEEST.c | 2 +-
net/netfilter/xt_SECMARK.c | 2 +-
net/netfilter/xt_TCPMSS.c | 2 +-
net/netfilter/xt_TCPOPTSTRIP.c | 2 +-
net/netfilter/xt_TEE.c | 2 +-
net/netfilter/xt_TPROXY.c | 2 +-
37 files changed, 54 insertions(+), 88 deletions(-)
delete mode 100644 include/linux/netfilter/xt_DSCP.h
delete mode 100644 include/linux/netfilter/xt_RATEEST.h
delete mode 100644 include/linux/netfilter/xt_TCPMSS.h
rename include/linux/netfilter/{xt_AUDIT.h => xt_audit.h} (100%)
rename include/linux/netfilter/{xt_CHECKSUM.h => xt_checksum.h} (100%)
rename include/linux/netfilter/{xt_CLASSIFY.h => xt_classify.h} (100%)
rename include/linux/netfilter/{xt_CONNSECMARK.h => xt_connsecmark.h} (100%)
rename include/linux/netfilter/{xt_CT.h => xt_ct.h} (100%)
rename include/linux/netfilter/{xt_IDLETIMER.h => xt_idletimer.h} (100%)
rename include/linux/netfilter/{xt_LED.h => xt_led.h} (100%)
rename include/linux/netfilter/{xt_NFLOG.h => xt_nflog.h} (100%)
rename include/linux/netfilter/{xt_NFQUEUE.h => xt_nfqueue.h} (100%)
rename include/linux/netfilter/{xt_SECMARK.h => xt_secmark.h} (100%)
rename include/linux/netfilter/{xt_TCPOPTSTRIP.h => xt_tcpoptstrip.h} (100%)
rename include/linux/netfilter/{xt_TEE.h => xt_tee.h} (100%)
rename include/linux/netfilter/{xt_TPROXY.h => xt_tproxy.h} (100%)
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index fc4e0aa..b938380 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -9,43 +9,34 @@ header-y += nfnetlink_conntrack.h
header-y += nfnetlink_log.h
header-y += nfnetlink_queue.h
header-y += x_tables.h
-header-y += xt_AUDIT.h
-header-y += xt_CHECKSUM.h
-header-y += xt_CLASSIFY.h
-header-y += xt_CONNMARK.h
-header-y += xt_CONNSECMARK.h
-header-y += xt_CT.h
-header-y += xt_DSCP.h
-header-y += xt_IDLETIMER.h
-header-y += xt_LED.h
-header-y += xt_MARK.h
-header-y += xt_NFLOG.h
-header-y += xt_NFQUEUE.h
-header-y += xt_RATEEST.h
-header-y += xt_SECMARK.h
-header-y += xt_TCPMSS.h
-header-y += xt_TCPOPTSTRIP.h
-header-y += xt_TEE.h
-header-y += xt_TPROXY.h
+header-y += xt_audit.h
+header-y += xt_checksum.h
+header-y += xt_classify.h
header-y += xt_cluster.h
header-y += xt_comment.h
header-y += xt_connbytes.h
header-y += xt_connlimit.h
header-y += xt_connmark.h
+header-y += xt_connsecmark.h
header-y += xt_conntrack.h
header-y += xt_cpu.h
+header-y += xt_ct.h
header-y += xt_dccp.h
header-y += xt_dscp.h
header-y += xt_esp.h
header-y += xt_hashlimit.h
header-y += xt_helper.h
+header-y += xt_idletimer.h
header-y += xt_iprange.h
header-y += xt_ipvs.h
+header-y += xt_led.h
header-y += xt_length.h
header-y += xt_limit.h
header-y += xt_mac.h
header-y += xt_mark.h
header-y += xt_multiport.h
+header-y += xt_nflog.h
+header-y += xt_nfqueue.h
header-y += xt_osf.h
header-y += xt_owner.h
header-y += xt_physdev.h
@@ -62,6 +53,9 @@ header-y += xt_state.h
header-y += xt_statistic.h
header-y += xt_string.h
header-y += xt_tcpmss.h
+header-y += xt_tcpoptstrip.h
header-y += xt_tcpudp.h
+header-y += xt_tee.h
header-y += xt_time.h
+header-y += xt_tproxy.h
header-y += xt_u32.h
diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h
deleted file mode 100644
index 648e0b3..0000000
--- a/include/linux/netfilter/xt_DSCP.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* x_tables module for setting the IPv4/IPv6 DSCP field
- *
- * (C) 2002 Harald Welte <laforge@gnumonks.org>
- * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
- *
- * See RFC2474 for a description of the DSCP field within the IP Header.
- *
- * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
-*/
-#ifndef _XT_DSCP_TARGET_H
-#define _XT_DSCP_TARGET_H
-#include <linux/netfilter/xt_dscp.h>
-#include <linux/types.h>
-
-/* target info */
-struct xt_DSCP_info {
- __u8 dscp;
-};
-
-struct xt_tos_target_info {
- __u8 tos_value;
- __u8 tos_mask;
-};
-
-#endif /* _XT_DSCP_TARGET_H */
diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/linux/netfilter/xt_RATEEST.h
deleted file mode 100644
index 6605e20..0000000
--- a/include/linux/netfilter/xt_RATEEST.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _XT_RATEEST_TARGET_H
-#define _XT_RATEEST_TARGET_H
-
-#include <linux/types.h>
-
-struct xt_rateest_target_info {
- char name[IFNAMSIZ];
- __s8 interval;
- __u8 ewma_log;
-
- /* Used internally by the kernel */
- struct xt_rateest *est __attribute__((aligned(8)));
-};
-
-#endif /* _XT_RATEEST_TARGET_H */
diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/linux/netfilter/xt_TCPMSS.h
deleted file mode 100644
index 9a6960a..0000000
--- a/include/linux/netfilter/xt_TCPMSS.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _XT_TCPMSS_H
-#define _XT_TCPMSS_H
-
-#include <linux/types.h>
-
-struct xt_tcpmss_info {
- __u16 mss;
-};
-
-#define XT_TCPMSS_CLAMP_PMTU 0xffff
-
-#endif /* _XT_TCPMSS_H */
diff --git a/include/linux/netfilter/xt_AUDIT.h b/include/linux/netfilter/xt_audit.h
similarity index 100%
rename from include/linux/netfilter/xt_AUDIT.h
rename to include/linux/netfilter/xt_audit.h
diff --git a/include/linux/netfilter/xt_CHECKSUM.h b/include/linux/netfilter/xt_checksum.h
similarity index 100%
rename from include/linux/netfilter/xt_CHECKSUM.h
rename to include/linux/netfilter/xt_checksum.h
diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/linux/netfilter/xt_classify.h
similarity index 100%
rename from include/linux/netfilter/xt_CLASSIFY.h
rename to include/linux/netfilter/xt_classify.h
diff --git a/include/linux/netfilter/xt_CONNSECMARK.h b/include/linux/netfilter/xt_connsecmark.h
similarity index 100%
rename from include/linux/netfilter/xt_CONNSECMARK.h
rename to include/linux/netfilter/xt_connsecmark.h
diff --git a/include/linux/netfilter/xt_CT.h b/include/linux/netfilter/xt_ct.h
similarity index 100%
rename from include/linux/netfilter/xt_CT.h
rename to include/linux/netfilter/xt_ct.h
diff --git a/include/linux/netfilter/xt_dscp.h b/include/linux/netfilter/xt_dscp.h
index 15f8932..9611dac 100644
--- a/include/linux/netfilter/xt_dscp.h
+++ b/include/linux/netfilter/xt_dscp.h
@@ -28,4 +28,14 @@ struct xt_tos_match_info {
__u8 invert;
};
+/* target info */
+struct xt_DSCP_info {
+ __u8 dscp;
+};
+
+struct xt_tos_target_info {
+ __u8 tos_value;
+ __u8 tos_mask;
+};
+
#endif /* _XT_DSCP_H */
diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_idletimer.h
similarity index 100%
rename from include/linux/netfilter/xt_IDLETIMER.h
rename to include/linux/netfilter/xt_idletimer.h
diff --git a/include/linux/netfilter/xt_LED.h b/include/linux/netfilter/xt_led.h
similarity index 100%
rename from include/linux/netfilter/xt_LED.h
rename to include/linux/netfilter/xt_led.h
diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_nflog.h
similarity index 100%
rename from include/linux/netfilter/xt_NFLOG.h
rename to include/linux/netfilter/xt_nflog.h
diff --git a/include/linux/netfilter/xt_NFQUEUE.h b/include/linux/netfilter/xt_nfqueue.h
similarity index 100%
rename from include/linux/netfilter/xt_NFQUEUE.h
rename to include/linux/netfilter/xt_nfqueue.h
diff --git a/include/linux/netfilter/xt_rateest.h b/include/linux/netfilter/xt_rateest.h
index d40a619..54f52c2 100644
--- a/include/linux/netfilter/xt_rateest.h
+++ b/include/linux/netfilter/xt_rateest.h
@@ -34,4 +34,13 @@ struct xt_rateest_match_info {
struct xt_rateest *est2 __attribute__((aligned(8)));
};
+struct xt_rateest_target_info {
+ char name[IFNAMSIZ];
+ __s8 interval;
+ __u8 ewma_log;
+
+ /* Used internally by the kernel */
+ struct xt_rateest *est __attribute__((aligned(8)));
+};
+
#endif /* _XT_RATEEST_MATCH_H */
diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/linux/netfilter/xt_secmark.h
similarity index 100%
rename from include/linux/netfilter/xt_SECMARK.h
rename to include/linux/netfilter/xt_secmark.h
diff --git a/include/linux/netfilter/xt_tcpmss.h b/include/linux/netfilter/xt_tcpmss.h
index fbac56b..dabdaf8 100644
--- a/include/linux/netfilter/xt_tcpmss.h
+++ b/include/linux/netfilter/xt_tcpmss.h
@@ -8,4 +8,10 @@ struct xt_tcpmss_match_info {
__u8 invert;
};
+struct xt_tcpmss_info {
+ __u16 mss;
+};
+
+#define XT_TCPMSS_CLAMP_PMTU 0xffff
+
#endif /*_XT_TCPMSS_MATCH_H*/
diff --git a/include/linux/netfilter/xt_TCPOPTSTRIP.h b/include/linux/netfilter/xt_tcpoptstrip.h
similarity index 100%
rename from include/linux/netfilter/xt_TCPOPTSTRIP.h
rename to include/linux/netfilter/xt_tcpoptstrip.h
diff --git a/include/linux/netfilter/xt_TEE.h b/include/linux/netfilter/xt_tee.h
similarity index 100%
rename from include/linux/netfilter/xt_TEE.h
rename to include/linux/netfilter/xt_tee.h
diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/linux/netfilter/xt_tproxy.h
similarity index 100%
rename from include/linux/netfilter/xt_TPROXY.h
rename to include/linux/netfilter/xt_tproxy.h
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter_ipv4/ipt_ECN.h
index c6e3e01..b5c779d 100644
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/linux/netfilter_ipv4/ipt_ECN.h
@@ -8,7 +8,7 @@
*/
#ifndef _IPT_ECN_TARGET_H
#define _IPT_ECN_TARGET_H
-#include <linux/netfilter/xt_DSCP.h>
+#include <linux/netfilter/xt_dscp.h>
#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
index 81802d2..b633033 100644
--- a/net/netfilter/xt_AUDIT.c
+++ b/net/netfilter/xt_AUDIT.c
@@ -18,7 +18,7 @@
#include <linux/udp.h>
#include <linux/if_arp.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_AUDIT.h>
+#include <linux/netfilter/xt_audit.h>
#include <net/ipv6.h>
#include <net/ip.h>
diff --git a/net/netfilter/xt_CHECKSUM.c b/net/netfilter/xt_CHECKSUM.c
index 0f642ef..c78c372 100644
--- a/net/netfilter/xt_CHECKSUM.c
+++ b/net/netfilter/xt_CHECKSUM.c
@@ -14,7 +14,7 @@
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_CHECKSUM.h>
+#include <linux/netfilter/xt_checksum.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michael S. Tsirkin <mst@redhat.com>");
diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_CLASSIFY.c
index af9c4da..351c2e8 100644
--- a/net/netfilter/xt_CLASSIFY.c
+++ b/net/netfilter/xt_CLASSIFY.c
@@ -18,7 +18,7 @@
#include <linux/netfilter_ipv4.h>
#include <linux/netfilter_ipv6.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_CLASSIFY.h>
+#include <linux/netfilter/xt_classify.h>
#include <linux/netfilter_arp.h>
MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index e04dc28..9a85162 100644
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -19,7 +19,7 @@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_CONNSECMARK.h>
+#include <linux/netfilter/xt_connsecmark.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_ecache.h>
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c
index 782e519..93903b9 100644
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@ -12,7 +12,7 @@
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_CT.h>
+#include <linux/netfilter/xt_ct.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/netfilter/nf_conntrack_helper.h>
#include <net/netfilter/nf_conntrack_ecache.h>
diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index 0a22919..8de6017 100644
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -17,7 +17,7 @@
#include <net/dsfield.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_DSCP.h>
+#include <linux/netfilter/xt_dscp.h>
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification");
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c
index 3bdd443..2492d17 100644
--- a/net/netfilter/xt_IDLETIMER.c
+++ b/net/netfilter/xt_IDLETIMER.c
@@ -35,7 +35,7 @@
#include <linux/mutex.h>
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_IDLETIMER.h>
+#include <linux/netfilter/xt_idletimer.h>
#include <linux/kdev_t.h>
#include <linux/kobject.h>
#include <linux/workqueue.h>
diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 993de2b..5d82913 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -26,7 +26,7 @@
#include <linux/leds.h>
#include <linux/mutex.h>
-#include <linux/netfilter/xt_LED.h>
+#include <linux/netfilter/xt_led.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Adam Nielsen <a.nielsen@shikadi.net>");
diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
index a17dd0f..e145531 100644
--- a/net/netfilter/xt_NFLOG.c
+++ b/net/netfilter/xt_NFLOG.c
@@ -11,7 +11,7 @@
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_NFLOG.h>
+#include <linux/netfilter/xt_nflog.h>
#include <net/netfilter/nf_log.h>
#include <net/netfilter/nfnetlink_log.h>
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index 3962770..62f8c5b 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -18,7 +18,7 @@
#include <linux/netfilter.h>
#include <linux/netfilter_arp.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_NFQUEUE.h>
+#include <linux/netfilter/xt_nfqueue.h>
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: packet forwarding to netlink");
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_RATEEST.c
index de079ab..a14c8d9 100644
--- a/net/netfilter/xt_RATEEST.c
+++ b/net/netfilter/xt_RATEEST.c
@@ -16,7 +16,7 @@
#include <net/netlink.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_RATEEST.h>
+#include <linux/netfilter/xt_rateest.h>
#include <net/netfilter/xt_rateest.h>
static DEFINE_MUTEX(xt_rateest_mutex);
diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_SECMARK.c
index 9faf5e0..ade0726 100644
--- a/net/netfilter/xt_SECMARK.c
+++ b/net/netfilter/xt_SECMARK.c
@@ -17,7 +17,7 @@
#include <linux/security.h>
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_SECMARK.h>
+#include <linux/netfilter/xt_secmark.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("James Morris <jmorris@redhat.com>");
diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
index eb81c38..a7a55ea 100644
--- a/net/netfilter/xt_TCPMSS.c
+++ b/net/netfilter/xt_TCPMSS.c
@@ -24,7 +24,7 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_tcpudp.h>
-#include <linux/netfilter/xt_TCPMSS.h>
+#include <linux/netfilter/xt_tcpmss.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c
index 9dc9ecf..c977fce 100644
--- a/net/netfilter/xt_TCPOPTSTRIP.c
+++ b/net/netfilter/xt_TCPOPTSTRIP.c
@@ -17,7 +17,7 @@
#include <net/ipv6.h>
#include <net/tcp.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_TCPOPTSTRIP.h>
+#include <linux/netfilter/xt_tcpoptstrip.h>
static inline unsigned int optlen(const u_int8_t *opt, unsigned int offset)
{
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index 5128a6c..1aa8bc9 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -23,7 +23,7 @@
#include <net/ip6_route.h>
#include <net/route.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter/xt_TEE.h>
+#include <linux/netfilter/xt_tee.h>
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
# define WITH_CONNTRACK 1
diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_TPROXY.c
index 640678f..d8ef64d 100644
--- a/net/netfilter/xt_TPROXY.c
+++ b/net/netfilter/xt_TPROXY.c
@@ -31,7 +31,7 @@
#endif
#include <net/netfilter/nf_tproxy_core.h>
-#include <linux/netfilter/xt_TPROXY.h>
+#include <linux/netfilter/xt_tproxy.h>
static inline __be32
tproxy_laddr4(struct sk_buff *skb, __be32 user_laddr, __be32 daddr)
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [2/5] netfilter: xtables: case-sensitivity avoidance (2/5)
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
2011-01-18 15:39 ` [1/5] netfilter: xtables: avoid case-sensitive filenames (1/5) Jan Engelhardt
@ 2011-01-18 15:39 ` Jan Engelhardt
2011-01-18 15:39 ` [3/5] netfilter: xtables: case-sensitivity avoidance (3/5) Jan Engelhardt
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:39 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List, Aaron Wright
parent 10fc4644d17ccace699f2c62f9b15f8f024ddb4d (v2.6.37-3809-g10fc464)
commit b31552c3fd36bc862d8505f9f00f2ac7cc4dd8bf
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Tue Jan 18 08:03:37 2011 +0100
netfilter: xtables: case-sensitivity avoidance (2/5)
Provide obligatory courtesy forward header files for
include/linux/netfilter/ (for some time). These were not part of the
previous patch to simplify its diff.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Documentation/feature-removal-schedule.txt | 7 +++++++
include/linux/netfilter/Kbuild | 5 +++++
include/linux/netfilter/xt_AUDIT.h | 1 +
include/linux/netfilter/xt_CHECKSUM.h | 1 +
include/linux/netfilter/xt_CLASSIFY.h | 1 +
include/linux/netfilter/xt_CONNSECMARK.h | 1 +
include/linux/netfilter/xt_CT.h | 1 +
include/linux/netfilter/xt_DSCP.h | 1 +
include/linux/netfilter/xt_IDLETIMER.h | 1 +
include/linux/netfilter/xt_LED.h | 1 +
include/linux/netfilter/xt_NFLOG.h | 1 +
include/linux/netfilter/xt_NFQUEUE.h | 1 +
include/linux/netfilter/xt_RATEEST.h | 1 +
include/linux/netfilter/xt_SECMARK.h | 1 +
include/linux/netfilter/xt_TCPMSS.h | 1 +
include/linux/netfilter/xt_TCPOPTSTRIP.h | 1 +
include/linux/netfilter/xt_TEE.h | 1 +
include/linux/netfilter/xt_TPROXY.h | 1 +
18 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 include/linux/netfilter/xt_AUDIT.h
create mode 100644 include/linux/netfilter/xt_CHECKSUM.h
create mode 100644 include/linux/netfilter/xt_CLASSIFY.h
create mode 100644 include/linux/netfilter/xt_CONNSECMARK.h
create mode 100644 include/linux/netfilter/xt_CT.h
create mode 100644 include/linux/netfilter/xt_DSCP.h
create mode 100644 include/linux/netfilter/xt_IDLETIMER.h
create mode 100644 include/linux/netfilter/xt_LED.h
create mode 100644 include/linux/netfilter/xt_NFLOG.h
create mode 100644 include/linux/netfilter/xt_NFQUEUE.h
create mode 100644 include/linux/netfilter/xt_RATEEST.h
create mode 100644 include/linux/netfilter/xt_SECMARK.h
create mode 100644 include/linux/netfilter/xt_TCPMSS.h
create mode 100644 include/linux/netfilter/xt_TCPOPTSTRIP.h
create mode 100644 include/linux/netfilter/xt_TEE.h
create mode 100644 include/linux/netfilter/xt_TPROXY.h
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 22f1081..9de337e 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -576,3 +576,10 @@ Why: The functions have been superceded by cancel_delayed_work_sync()
Who: Tejun Heo <tj@kernel.org>
----------------------------
+
+What: Obsolete header files
+When: soon?
+Who: Jan Engelhardt <jengelh@medozas.de>
+Files: include/linux/netfilter/xt_{AUDIT,CHECKSUM,CLASSIFY,
+ CONNSECMARK,CT,DSCP,IDLETIMER,LED,NFLOG,NFQUEUE,RATEEST,
+ SECMARK,TCPMSS,TCPOPTSTRIP,TEE,TPROXY}.h
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index b938380..4d96f22 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -59,3 +59,8 @@ header-y += xt_tee.h
header-y += xt_time.h
header-y += xt_tproxy.h
header-y += xt_u32.h
+# old files
+header-y += xt_AUDIT.h xt_CHECKSUM.h xt_CLASSIFY.h xt_CONNMARK.h
+header-y += xt_CONNSECMARK.h xt_CT.h xt_DSCP.h xt_IDLETIMER.h xt_LED.h
+header-y += xt_MARK.h xt_NFLOG.h xt_NFQUEUE.h xt_RATEEST.h xt_SECMARK.h
+header-y += xt_TCPMSS.h xt_TCPOPTSTRIP.h xt_TEE.h xt_TPROXY.h
diff --git a/include/linux/netfilter/xt_AUDIT.h b/include/linux/netfilter/xt_AUDIT.h
new file mode 100644
index 0000000..0f045db
--- /dev/null
+++ b/include/linux/netfilter/xt_AUDIT.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_audit.h>
diff --git a/include/linux/netfilter/xt_CHECKSUM.h b/include/linux/netfilter/xt_CHECKSUM.h
new file mode 100644
index 0000000..d83efa8
--- /dev/null
+++ b/include/linux/netfilter/xt_CHECKSUM.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_checksum.h>
diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/linux/netfilter/xt_CLASSIFY.h
new file mode 100644
index 0000000..a826183
--- /dev/null
+++ b/include/linux/netfilter/xt_CLASSIFY.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_classify.h>
diff --git a/include/linux/netfilter/xt_CONNSECMARK.h b/include/linux/netfilter/xt_CONNSECMARK.h
new file mode 100644
index 0000000..0ceced7
--- /dev/null
+++ b/include/linux/netfilter/xt_CONNSECMARK.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_connsecmark.h>
diff --git a/include/linux/netfilter/xt_CT.h b/include/linux/netfilter/xt_CT.h
new file mode 100644
index 0000000..bd12fd1
--- /dev/null
+++ b/include/linux/netfilter/xt_CT.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_ct.h>
diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h
new file mode 100644
index 0000000..a7e417d
--- /dev/null
+++ b/include/linux/netfilter/xt_DSCP.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_dscp.h>
diff --git a/include/linux/netfilter/xt_IDLETIMER.h b/include/linux/netfilter/xt_IDLETIMER.h
new file mode 100644
index 0000000..ceccad1
--- /dev/null
+++ b/include/linux/netfilter/xt_IDLETIMER.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_idletimer.h>
diff --git a/include/linux/netfilter/xt_LED.h b/include/linux/netfilter/xt_LED.h
new file mode 100644
index 0000000..0907572
--- /dev/null
+++ b/include/linux/netfilter/xt_LED.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_led.h>
diff --git a/include/linux/netfilter/xt_NFLOG.h b/include/linux/netfilter/xt_NFLOG.h
new file mode 100644
index 0000000..4b59b1d
--- /dev/null
+++ b/include/linux/netfilter/xt_NFLOG.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_nflog.h>
diff --git a/include/linux/netfilter/xt_NFQUEUE.h b/include/linux/netfilter/xt_NFQUEUE.h
new file mode 100644
index 0000000..3d0eba6
--- /dev/null
+++ b/include/linux/netfilter/xt_NFQUEUE.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_nfqueue.h>
diff --git a/include/linux/netfilter/xt_RATEEST.h b/include/linux/netfilter/xt_RATEEST.h
new file mode 100644
index 0000000..c60d011
--- /dev/null
+++ b/include/linux/netfilter/xt_RATEEST.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_rateest.h>
diff --git a/include/linux/netfilter/xt_SECMARK.h b/include/linux/netfilter/xt_SECMARK.h
new file mode 100644
index 0000000..abb7a63
--- /dev/null
+++ b/include/linux/netfilter/xt_SECMARK.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_secmark.h>
diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/linux/netfilter/xt_TCPMSS.h
new file mode 100644
index 0000000..a1b235b
--- /dev/null
+++ b/include/linux/netfilter/xt_TCPMSS.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_tcpmss.h>
diff --git a/include/linux/netfilter/xt_TCPOPTSTRIP.h b/include/linux/netfilter/xt_TCPOPTSTRIP.h
new file mode 100644
index 0000000..04b741d
--- /dev/null
+++ b/include/linux/netfilter/xt_TCPOPTSTRIP.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_tcpoptstrip.h>
diff --git a/include/linux/netfilter/xt_TEE.h b/include/linux/netfilter/xt_TEE.h
new file mode 100644
index 0000000..43e28da
--- /dev/null
+++ b/include/linux/netfilter/xt_TEE.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_tee.h>
diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/linux/netfilter/xt_TPROXY.h
new file mode 100644
index 0000000..3c7d844
--- /dev/null
+++ b/include/linux/netfilter/xt_TPROXY.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_tproxy.h>
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [3/5] netfilter: xtables: case-sensitivity avoidance (3/5)
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
2011-01-18 15:39 ` [1/5] netfilter: xtables: avoid case-sensitive filenames (1/5) Jan Engelhardt
2011-01-18 15:39 ` [2/5] netfilter: xtables: case-sensitivity avoidance (2/5) Jan Engelhardt
@ 2011-01-18 15:39 ` Jan Engelhardt
2011-01-18 15:40 ` [4/5] netfilter: xtables: case-sensitivity avoidance (4/5) Jan Engelhardt
` (2 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:39 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List, Aaron Wright
parent b31552c3fd36bc862d8505f9f00f2ac7cc4dd8bf (v2.6.37-3810-gb31552c)
commit 497bdc4ad9f727d41df3e2e4868cb692b701116f
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Tue Jan 18 08:45:11 2011 +0100
netfilter: xtables: case-sensitivity avoidance (3/5)
Process include/linux/netfilter_ipv[46]/ and use common header files
for targets with same name and lowercase.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/linux/netfilter/Kbuild | 7 ++
.../ipt_CLUSTERIP.h => netfilter/xt_clusterip.h} | 0
.../ipt_ECN.h => netfilter/xt_ecn.h} | 18 ++++
include/linux/netfilter/xt_hl.h | 58 ++++++++++++
include/linux/netfilter/xt_log.h | 34 +++++++
include/linux/netfilter/xt_reject.h | 34 +++++++
.../ipt_SAME.h => netfilter/xt_same.h} | 0
.../ipt_ULOG.h => netfilter/xt_ulog.h} | 0
include/linux/netfilter_ipv4/Kbuild | 9 --
include/linux/netfilter_ipv4/ipt_LOG.h | 19 ----
include/linux/netfilter_ipv4/ipt_REJECT.h | 20 ----
include/linux/netfilter_ipv4/ipt_TTL.h | 21 ----
include/linux/netfilter_ipv4/ipt_ecn.h | 33 -------
include/linux/netfilter_ipv4/ipt_ttl.h | 21 ----
include/linux/netfilter_ipv6/Kbuild | 4 -
include/linux/netfilter_ipv6/ip6t_HL.h | 22 -----
include/linux/netfilter_ipv6/ip6t_LOG.h | 19 ----
include/linux/netfilter_ipv6/ip6t_REJECT.h | 18 ----
include/linux/netfilter_ipv6/ip6t_hl.h | 22 -----
net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
net/ipv4/netfilter/ipt_ECN.c | 2 +-
net/ipv4/netfilter/ipt_LOG.c | 2 +-
net/ipv4/netfilter/ipt_REJECT.c | 2 +-
net/ipv4/netfilter/ipt_ULOG.c | 2 +-
net/ipv4/netfilter/ipt_ecn.c | 2 +-
net/ipv6/netfilter/ip6t_LOG.c | 2 +-
net/ipv6/netfilter/ip6t_REJECT.c | 2 +-
net/netfilter/xt_HL.c | 3 +-
net/netfilter/xt_hl.c | 3 +-
29 files changed, 161 insertions(+), 220 deletions(-)
rename include/linux/{netfilter_ipv4/ipt_CLUSTERIP.h => netfilter/xt_clusterip.h} (100%)
rename include/linux/{netfilter_ipv4/ipt_ECN.h => netfilter/xt_ecn.h} (74%)
create mode 100644 include/linux/netfilter/xt_hl.h
create mode 100644 include/linux/netfilter/xt_log.h
create mode 100644 include/linux/netfilter/xt_reject.h
rename include/linux/{netfilter_ipv4/ipt_SAME.h => netfilter/xt_same.h} (100%)
rename include/linux/{netfilter_ipv4/ipt_ULOG.h => netfilter/xt_ulog.h} (100%)
delete mode 100644 include/linux/netfilter_ipv4/ipt_LOG.h
delete mode 100644 include/linux/netfilter_ipv4/ipt_REJECT.h
delete mode 100644 include/linux/netfilter_ipv4/ipt_TTL.h
delete mode 100644 include/linux/netfilter_ipv4/ipt_ecn.h
delete mode 100644 include/linux/netfilter_ipv4/ipt_ttl.h
delete mode 100644 include/linux/netfilter_ipv6/ip6t_HL.h
delete mode 100644 include/linux/netfilter_ipv6/ip6t_LOG.h
delete mode 100644 include/linux/netfilter_ipv6/ip6t_REJECT.h
delete mode 100644 include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index 4d96f22..05e9e5c 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -13,6 +13,7 @@ header-y += xt_audit.h
header-y += xt_checksum.h
header-y += xt_classify.h
header-y += xt_cluster.h
+header-y += xt_clusterip.h
header-y += xt_comment.h
header-y += xt_connbytes.h
header-y += xt_connlimit.h
@@ -23,15 +24,18 @@ header-y += xt_cpu.h
header-y += xt_ct.h
header-y += xt_dccp.h
header-y += xt_dscp.h
+header-y += xt_ecn.h
header-y += xt_esp.h
header-y += xt_hashlimit.h
header-y += xt_helper.h
+header-y += xt_hl.h
header-y += xt_idletimer.h
header-y += xt_iprange.h
header-y += xt_ipvs.h
header-y += xt_led.h
header-y += xt_length.h
header-y += xt_limit.h
+header-y += xt_log.h
header-y += xt_mac.h
header-y += xt_mark.h
header-y += xt_multiport.h
@@ -46,6 +50,8 @@ header-y += xt_quota.h
header-y += xt_rateest.h
header-y += xt_realm.h
header-y += xt_recent.h
+header-y += xt_reject.h
+header-y += xt_same.h
header-y += xt_sctp.h
header-y += xt_secmark.h
header-y += xt_socket.h
@@ -59,6 +65,7 @@ header-y += xt_tee.h
header-y += xt_time.h
header-y += xt_tproxy.h
header-y += xt_u32.h
+header-y += xt_ulog.h
# old files
header-y += xt_AUDIT.h xt_CHECKSUM.h xt_CLASSIFY.h xt_CONNMARK.h
header-y += xt_CONNSECMARK.h xt_CT.h xt_DSCP.h xt_IDLETIMER.h xt_LED.h
diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter/xt_clusterip.h
similarity index 100%
rename from include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
rename to include/linux/netfilter/xt_clusterip.h
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter/xt_ecn.h
similarity index 74%
rename from include/linux/netfilter_ipv4/ipt_ECN.h
rename to include/linux/netfilter/xt_ecn.h
index b5c779d..b50a4a5 100644
--- a/include/linux/netfilter_ipv4/ipt_ECN.h
+++ b/include/linux/netfilter/xt_ecn.h
@@ -28,4 +28,22 @@ struct ipt_ECN_info {
} proto;
};
+#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 {
+ __u8 operation;
+ __u8 invert;
+ __u8 ip_ect;
+ union {
+ struct {
+ __u8 ect;
+ } tcp;
+ } proto;
+};
+
#endif /* _IPT_ECN_TARGET_H */
diff --git a/include/linux/netfilter/xt_hl.h b/include/linux/netfilter/xt_hl.h
new file mode 100644
index 0000000..66361ac
--- /dev/null
+++ b/include/linux/netfilter/xt_hl.h
@@ -0,0 +1,58 @@
+/* Hop Limit modification module for ip6tables
+ * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+ * Based on HW's TTL module */
+
+#ifndef _IP6T_HL_H
+#define _IP6T_HL_H
+
+enum {
+ IP6T_HL_SET = 0,
+ IP6T_HL_INC,
+ IP6T_HL_DEC
+};
+
+#define IP6T_HL_MAXMODE IP6T_HL_DEC
+
+struct ip6t_HL_info {
+ __u8 mode;
+ __u8 hop_limit;
+};
+
+enum {
+ IP6T_HL_EQ = 0, /* equals */
+ IP6T_HL_NE, /* not equals */
+ IP6T_HL_LT, /* less than */
+ IP6T_HL_GT, /* greater than */
+};
+
+struct ip6t_hl_info {
+ __u8 mode;
+ __u8 hop_limit;
+};
+
+enum {
+ IPT_TTL_SET = 0,
+ IPT_TTL_INC,
+ IPT_TTL_DEC
+};
+
+#define IPT_TTL_MAXMODE IPT_TTL_DEC
+
+struct ipt_TTL_info {
+ __u8 mode;
+ __u8 ttl;
+};
+
+enum {
+ IPT_TTL_EQ = 0, /* equals */
+ IPT_TTL_NE, /* not equals */
+ IPT_TTL_LT, /* less than */
+ IPT_TTL_GT, /* greater than */
+};
+
+struct ipt_ttl_info {
+ __u8 mode;
+ __u8 ttl;
+};
+
+#endif
diff --git a/include/linux/netfilter/xt_log.h b/include/linux/netfilter/xt_log.h
new file mode 100644
index 0000000..58a4683
--- /dev/null
+++ b/include/linux/netfilter/xt_log.h
@@ -0,0 +1,34 @@
+#ifndef _IP6T_LOG_H
+#define _IP6T_LOG_H
+
+/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
+#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
+#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
+#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
+#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */
+#define IP6T_LOG_NFLOG 0x10 /* Unsupported, don't use */
+#define IP6T_LOG_MACDECODE 0x20 /* Decode MAC header */
+#define IP6T_LOG_MASK 0x2f
+
+struct ip6t_log_info {
+ unsigned char level;
+ unsigned char logflags;
+ char prefix[30];
+};
+
+/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
+#define IPT_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
+#define IPT_LOG_TCPOPT 0x02 /* Log TCP options */
+#define IPT_LOG_IPOPT 0x04 /* Log IP options */
+#define IPT_LOG_UID 0x08 /* Log UID owning local socket */
+#define IPT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
+#define IPT_LOG_MACDECODE 0x20 /* Decode MAC header */
+#define IPT_LOG_MASK 0x2f
+
+struct ipt_log_info {
+ unsigned char level;
+ unsigned char logflags;
+ char prefix[30];
+};
+
+#endif /*_IPT_LOG_H*/
diff --git a/include/linux/netfilter/xt_reject.h b/include/linux/netfilter/xt_reject.h
new file mode 100644
index 0000000..773915c
--- /dev/null
+++ b/include/linux/netfilter/xt_reject.h
@@ -0,0 +1,34 @@
+#ifndef _IP6T_REJECT_H
+#define _IP6T_REJECT_H
+
+enum ip6t_reject_with {
+ IP6T_ICMP6_NO_ROUTE,
+ IP6T_ICMP6_ADM_PROHIBITED,
+ IP6T_ICMP6_NOT_NEIGHBOUR,
+ IP6T_ICMP6_ADDR_UNREACH,
+ IP6T_ICMP6_PORT_UNREACH,
+ IP6T_ICMP6_ECHOREPLY,
+ IP6T_TCP_RESET
+};
+
+struct ip6t_reject_info {
+ __u32 with; /* reject type */
+};
+
+enum ipt_reject_with {
+ IPT_ICMP_NET_UNREACHABLE,
+ IPT_ICMP_HOST_UNREACHABLE,
+ IPT_ICMP_PROT_UNREACHABLE,
+ IPT_ICMP_PORT_UNREACHABLE,
+ IPT_ICMP_ECHOREPLY,
+ IPT_ICMP_NET_PROHIBITED,
+ IPT_ICMP_HOST_PROHIBITED,
+ IPT_TCP_RESET,
+ IPT_ICMP_ADMIN_PROHIBITED
+};
+
+struct ipt_reject_info {
+ enum ipt_reject_with with; /* reject type */
+};
+
+#endif /*_IP6T_REJECT_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter/xt_same.h
similarity index 100%
rename from include/linux/netfilter_ipv4/ipt_SAME.h
rename to include/linux/netfilter/xt_same.h
diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter/xt_ulog.h
similarity index 100%
rename from include/linux/netfilter_ipv4/ipt_ULOG.h
rename to include/linux/netfilter/xt_ulog.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index f9930c8..e2c887e 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,14 +1,5 @@
header-y += ip_queue.h
header-y += ip_tables.h
-header-y += ipt_CLUSTERIP.h
-header-y += ipt_ECN.h
-header-y += ipt_LOG.h
-header-y += ipt_REJECT.h
-header-y += ipt_SAME.h
-header-y += ipt_TTL.h
-header-y += ipt_ULOG.h
header-y += ipt_addrtype.h
header-y += ipt_ah.h
-header-y += ipt_ecn.h
header-y += ipt_realm.h
-header-y += ipt_ttl.h
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
deleted file mode 100644
index dcdbadf..0000000
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IPT_LOG_H
-#define _IPT_LOG_H
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IPT_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
-#define IPT_LOG_TCPOPT 0x02 /* Log TCP options */
-#define IPT_LOG_IPOPT 0x04 /* Log IP options */
-#define IPT_LOG_UID 0x08 /* Log UID owning local socket */
-#define IPT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
-#define IPT_LOG_MACDECODE 0x20 /* Decode MAC header */
-#define IPT_LOG_MASK 0x2f
-
-struct ipt_log_info {
- unsigned char level;
- unsigned char logflags;
- char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_REJECT.h b/include/linux/netfilter_ipv4/ipt_REJECT.h
deleted file mode 100644
index 4293a1a..0000000
--- a/include/linux/netfilter_ipv4/ipt_REJECT.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _IPT_REJECT_H
-#define _IPT_REJECT_H
-
-enum ipt_reject_with {
- IPT_ICMP_NET_UNREACHABLE,
- IPT_ICMP_HOST_UNREACHABLE,
- IPT_ICMP_PROT_UNREACHABLE,
- IPT_ICMP_PORT_UNREACHABLE,
- IPT_ICMP_ECHOREPLY,
- IPT_ICMP_NET_PROHIBITED,
- IPT_ICMP_HOST_PROHIBITED,
- IPT_TCP_RESET,
- IPT_ICMP_ADMIN_PROHIBITED
-};
-
-struct ipt_reject_info {
- enum ipt_reject_with with; /* reject type */
-};
-
-#endif /*_IPT_REJECT_H*/
diff --git a/include/linux/netfilter_ipv4/ipt_TTL.h b/include/linux/netfilter_ipv4/ipt_TTL.h
deleted file mode 100644
index f6250e4..0000000
--- a/include/linux/netfilter_ipv4/ipt_TTL.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* TTL modification module for IP tables
- * (C) 2000 by Harald Welte <laforge@netfilter.org> */
-
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
-
-enum {
- IPT_TTL_SET = 0,
- IPT_TTL_INC,
- IPT_TTL_DEC
-};
-
-#define IPT_TTL_MAXMODE IPT_TTL_DEC
-
-struct ipt_TTL_info {
- __u8 mode;
- __u8 ttl;
-};
-
-
-#endif
diff --git a/include/linux/netfilter_ipv4/ipt_ecn.h b/include/linux/netfilter_ipv4/ipt_ecn.h
deleted file mode 100644
index 78b98aa..0000000
--- a/include/linux/netfilter_ipv4/ipt_ecn.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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
- *
- * ipt_ecn.h,v 1.4 2002/08/05 19:39:00 laforge Exp
-*/
-#ifndef _IPT_ECN_H
-#define _IPT_ECN_H
-#include <linux/netfilter/xt_dscp.h>
-
-#define IPT_ECN_IP_MASK (~XT_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 {
- __u8 operation;
- __u8 invert;
- __u8 ip_ect;
- union {
- struct {
- __u8 ect;
- } tcp;
- } proto;
-};
-
-#endif /* _IPT_ECN_H */
diff --git a/include/linux/netfilter_ipv4/ipt_ttl.h b/include/linux/netfilter_ipv4/ipt_ttl.h
deleted file mode 100644
index 93d9a06..0000000
--- a/include/linux/netfilter_ipv4/ipt_ttl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* IP tables module for matching the value of the TTL
- * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
-
-#ifndef _IPT_TTL_H
-#define _IPT_TTL_H
-
-enum {
- IPT_TTL_EQ = 0, /* equals */
- IPT_TTL_NE, /* not equals */
- IPT_TTL_LT, /* less than */
- IPT_TTL_GT, /* greater than */
-};
-
-
-struct ipt_ttl_info {
- __u8 mode;
- __u8 ttl;
-};
-
-
-#endif
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index bd095bc..38ba2f6 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -1,10 +1,6 @@
header-y += ip6_tables.h
-header-y += ip6t_HL.h
-header-y += ip6t_LOG.h
-header-y += ip6t_REJECT.h
header-y += ip6t_ah.h
header-y += ip6t_frag.h
-header-y += ip6t_hl.h
header-y += ip6t_ipv6header.h
header-y += ip6t_mh.h
header-y += ip6t_opts.h
diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/linux/netfilter_ipv6/ip6t_HL.h
deleted file mode 100644
index 81cdaf0..0000000
--- a/include/linux/netfilter_ipv6/ip6t_HL.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Hop Limit modification module for ip6tables
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's TTL module */
-
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-enum {
- IP6T_HL_SET = 0,
- IP6T_HL_INC,
- IP6T_HL_DEC
-};
-
-#define IP6T_HL_MAXMODE IP6T_HL_DEC
-
-struct ip6t_HL_info {
- __u8 mode;
- __u8 hop_limit;
-};
-
-
-#endif
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
deleted file mode 100644
index 9dd5579..0000000
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _IP6T_LOG_H
-#define _IP6T_LOG_H
-
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
-#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
-#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
-#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
-#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */
-#define IP6T_LOG_NFLOG 0x10 /* Unsupported, don't use */
-#define IP6T_LOG_MACDECODE 0x20 /* Decode MAC header */
-#define IP6T_LOG_MASK 0x2f
-
-struct ip6t_log_info {
- unsigned char level;
- unsigned char logflags;
- char prefix[30];
-};
-
-#endif /*_IPT_LOG_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/linux/netfilter_ipv6/ip6t_REJECT.h
deleted file mode 100644
index b999aa4..0000000
--- a/include/linux/netfilter_ipv6/ip6t_REJECT.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _IP6T_REJECT_H
-#define _IP6T_REJECT_H
-
-enum ip6t_reject_with {
- IP6T_ICMP6_NO_ROUTE,
- IP6T_ICMP6_ADM_PROHIBITED,
- IP6T_ICMP6_NOT_NEIGHBOUR,
- IP6T_ICMP6_ADDR_UNREACH,
- IP6T_ICMP6_PORT_UNREACH,
- IP6T_ICMP6_ECHOREPLY,
- IP6T_TCP_RESET
-};
-
-struct ip6t_reject_info {
- __u32 with; /* reject type */
-};
-
-#endif /*_IP6T_REJECT_H*/
diff --git a/include/linux/netfilter_ipv6/ip6t_hl.h b/include/linux/netfilter_ipv6/ip6t_hl.h
deleted file mode 100644
index c6fddcb..0000000
--- a/include/linux/netfilter_ipv6/ip6t_hl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ip6tables module for matching the Hop Limit value
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
- * Based on HW's ttl module */
-
-#ifndef _IP6T_HL_H
-#define _IP6T_HL_H
-
-enum {
- IP6T_HL_EQ = 0, /* equals */
- IP6T_HL_NE, /* not equals */
- IP6T_HL_LT, /* less than */
- IP6T_HL_GT, /* greater than */
-};
-
-
-struct ip6t_hl_info {
- __u8 mode;
- __u8 hop_limit;
-};
-
-
-#endif
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 1e26a48..ed812b1 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -25,7 +25,7 @@
#include <linux/netfilter_arp.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
+#include <linux/netfilter/xt_clusterip.h>
#include <net/netfilter/nf_conntrack.h>
#include <net/net_namespace.h>
#include <net/checksum.h>
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 4bf3dc4..a8ee93e 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -17,7 +17,7 @@
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_ECN.h>
+#include <linux/netfilter/xt_ecn.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index d76d6c9..710a08f 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -22,7 +22,7 @@
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_LOG.h>
+#include <linux/netfilter/xt_log.h>
#include <net/netfilter/nf_log.h>
#include <net/netfilter/xt_log.h>
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c
index 1ff79e5..c7e4854 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/ipt_REJECT.c
@@ -23,7 +23,7 @@
#include <net/dst.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_REJECT.h>
+#include <linux/netfilter/xt_reject.h>
#ifdef CONFIG_BRIDGE_NETFILTER
#include <linux/netfilter_bridge.h>
#endif
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index 446e0f4..293dbe3 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -43,7 +43,7 @@
#include <linux/moduleparam.h>
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_ULOG.h>
+#include <linux/netfilter/xt_ulog.h>
#include <net/netfilter/nf_log.h>
#include <net/sock.h>
#include <linux/bitops.h>
diff --git a/net/ipv4/netfilter/ipt_ecn.c b/net/ipv4/netfilter/ipt_ecn.c
index af6e9c7..58cbe94 100644
--- a/net/ipv4/netfilter/ipt_ecn.c
+++ b/net/ipv4/netfilter/ipt_ecn.c
@@ -16,7 +16,7 @@
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_ecn.h>
+#include <linux/netfilter/xt_ecn.h>
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: Explicit Congestion Notification (ECN) flag match for IPv4");
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index 05027b7..a48698e 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -21,6 +21,7 @@
#include <net/ipv6.h>
#include <linux/netfilter.h>
#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_log.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <net/netfilter/nf_log.h>
#include <net/netfilter/xt_log.h>
@@ -31,7 +32,6 @@ MODULE_LICENSE("GPL");
struct in_device;
#include <net/route.h>
-#include <linux/netfilter_ipv6/ip6t_LOG.h>
/* One level of recursion won't kill us */
static void dump_packet(struct sbuff *m,
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/ip6t_REJECT.c
index bf998fe..19b2052 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/ip6t_REJECT.c
@@ -30,7 +30,7 @@
#include <net/flow.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter_ipv6/ip6t_REJECT.h>
+#include <linux/netfilter/xt_reject.h>
MODULE_AUTHOR("Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>");
MODULE_DESCRIPTION("Xtables: packet \"rejection\" target for IPv6");
diff --git a/net/netfilter/xt_HL.c b/net/netfilter/xt_HL.c
index 95b0848..ed63552 100644
--- a/net/netfilter/xt_HL.c
+++ b/net/netfilter/xt_HL.c
@@ -17,8 +17,7 @@
#include <net/checksum.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_TTL.h>
-#include <linux/netfilter_ipv6/ip6t_HL.h>
+#include <linux/netfilter/xt_hl.h>
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_AUTHOR("Maciej Soltysiak <solt@dns.toxicfilms.tv>");
diff --git a/net/netfilter/xt_hl.c b/net/netfilter/xt_hl.c
index 7d12221..8375bb9 100644
--- a/net/netfilter/xt_hl.c
+++ b/net/netfilter/xt_hl.c
@@ -16,8 +16,7 @@
#include <linux/skbuff.h>
#include <linux/netfilter/x_tables.h>
-#include <linux/netfilter_ipv4/ipt_ttl.h>
-#include <linux/netfilter_ipv6/ip6t_hl.h>
+#include <linux/netfilter/xt_hl.h>
MODULE_AUTHOR("Maciej Soltysiak <solt@dns.toxicfilms.tv>");
MODULE_DESCRIPTION("Xtables: Hoplimit/TTL field match");
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [4/5] netfilter: xtables: case-sensitivity avoidance (4/5)
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
` (2 preceding siblings ...)
2011-01-18 15:39 ` [3/5] netfilter: xtables: case-sensitivity avoidance (3/5) Jan Engelhardt
@ 2011-01-18 15:40 ` Jan Engelhardt
2011-01-18 15:40 ` [5/5] netfilter: xtables: case-sensitivity avoidance (5/5) Jan Engelhardt
2011-01-18 16:16 ` [0/5] xtables: phase out case sensitivity Patrick McHardy
5 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:40 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List
parent 497bdc4ad9f727d41df3e2e4868cb692b701116f (v2.6.37-3811-g497bdc4)
commit 94b1a89f0d094d5467a7437af9d86b303943eb8c
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Tue Jan 18 08:51:05 2011 +0100
netfilter: xtables: case-sensitivity avoidance (4/5)
Provide obligatory courtesy forward header for
include/linux/netfilter_ipv[46]/ for some time.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
Documentation/feature-removal-schedule.txt | 3 +++
include/linux/netfilter_ipv4/Kbuild | 3 +++
include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 1 +
include/linux/netfilter_ipv4/ipt_ECN.h | 1 +
include/linux/netfilter_ipv4/ipt_LOG.h | 1 +
include/linux/netfilter_ipv4/ipt_REJECT.h | 1 +
include/linux/netfilter_ipv4/ipt_SAME.h | 1 +
include/linux/netfilter_ipv4/ipt_TTL.h | 1 +
include/linux/netfilter_ipv4/ipt_ULOG.h | 1 +
include/linux/netfilter_ipv4/ipt_ecn.h | 1 +
include/linux/netfilter_ipv4/ipt_ttl.h | 1 +
include/linux/netfilter_ipv6/Kbuild | 2 ++
include/linux/netfilter_ipv6/ip6t_HL.h | 1 +
include/linux/netfilter_ipv6/ip6t_LOG.h | 1 +
include/linux/netfilter_ipv6/ip6t_REJECT.h | 1 +
include/linux/netfilter_ipv6/ip6t_hl.h | 1 +
16 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
create mode 100644 include/linux/netfilter_ipv4/ipt_ECN.h
create mode 100644 include/linux/netfilter_ipv4/ipt_LOG.h
create mode 100644 include/linux/netfilter_ipv4/ipt_REJECT.h
create mode 100644 include/linux/netfilter_ipv4/ipt_SAME.h
create mode 100644 include/linux/netfilter_ipv4/ipt_TTL.h
create mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h
create mode 100644 include/linux/netfilter_ipv4/ipt_ecn.h
create mode 100644 include/linux/netfilter_ipv4/ipt_ttl.h
create mode 100644 include/linux/netfilter_ipv6/ip6t_HL.h
create mode 100644 include/linux/netfilter_ipv6/ip6t_LOG.h
create mode 100644 include/linux/netfilter_ipv6/ip6t_REJECT.h
create mode 100644 include/linux/netfilter_ipv6/ip6t_hl.h
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9de337e..c90ca01 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -583,3 +583,6 @@ Who: Jan Engelhardt <jengelh@medozas.de>
Files: include/linux/netfilter/xt_{AUDIT,CHECKSUM,CLASSIFY,
CONNSECMARK,CT,DSCP,IDLETIMER,LED,NFLOG,NFQUEUE,RATEEST,
SECMARK,TCPMSS,TCPOPTSTRIP,TEE,TPROXY}.h
+ include/linux/netfilter_ipv6/ip6t_{HL,LOG,REJECT,hl}.h
+ include/linux/netfilter_ipv4/ipt_{CLUSTERIP,ECN,LOG,REJECT,
+ SAME,TTL,ULOG,ecn,ttl}.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index e2c887e..97fd48c 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -3,3 +3,6 @@ header-y += ip_tables.h
header-y += ipt_addrtype.h
header-y += ipt_ah.h
header-y += ipt_realm.h
+# old files
+header-y += ipt_CLUSTERIP.h ipt_ECN.h ipt_LOG.h ipt_REJECT.h ipt_SAME.h
+header-y += ipt_TTL.h ipt_ULOG.h ipt_ecn.h ipt_ttl.h
diff --git a/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
new file mode 100644
index 0000000..8bebe1f
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_clusterip.h>
diff --git a/include/linux/netfilter_ipv4/ipt_ECN.h b/include/linux/netfilter_ipv4/ipt_ECN.h
new file mode 100644
index 0000000..651c4fa
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_ECN.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_ecn.h>
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
new file mode 100644
index 0000000..a3c3baa
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_LOG.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_log.h>
diff --git a/include/linux/netfilter_ipv4/ipt_REJECT.h b/include/linux/netfilter_ipv4/ipt_REJECT.h
new file mode 100644
index 0000000..9698dee
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_REJECT.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_reject.h>
diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h
new file mode 100644
index 0000000..9b5beb7
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_SAME.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_same.h>
diff --git a/include/linux/netfilter_ipv4/ipt_TTL.h b/include/linux/netfilter_ipv4/ipt_TTL.h
new file mode 100644
index 0000000..b0af8e3
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_TTL.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_hl.h>
diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
new file mode 100644
index 0000000..0caec20
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_ulog.h>
diff --git a/include/linux/netfilter_ipv4/ipt_ecn.h b/include/linux/netfilter_ipv4/ipt_ecn.h
new file mode 100644
index 0000000..651c4fa
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_ecn.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_ecn.h>
diff --git a/include/linux/netfilter_ipv4/ipt_ttl.h b/include/linux/netfilter_ipv4/ipt_ttl.h
new file mode 100644
index 0000000..b0af8e3
--- /dev/null
+++ b/include/linux/netfilter_ipv4/ipt_ttl.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_hl.h>
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index 38ba2f6..0bdfdfd 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -5,3 +5,5 @@ header-y += ip6t_ipv6header.h
header-y += ip6t_mh.h
header-y += ip6t_opts.h
header-y += ip6t_rt.h
+# old files
+header-y += ip6t_HL.h ip6t_LOG.h ip6t_REJECT.h ip6t_hl.h
diff --git a/include/linux/netfilter_ipv6/ip6t_HL.h b/include/linux/netfilter_ipv6/ip6t_HL.h
new file mode 100644
index 0000000..b0af8e3
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_HL.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_hl.h>
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
new file mode 100644
index 0000000..a3c3baa
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_LOG.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_log.h>
diff --git a/include/linux/netfilter_ipv6/ip6t_REJECT.h b/include/linux/netfilter_ipv6/ip6t_REJECT.h
new file mode 100644
index 0000000..9698dee
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_reject.h>
diff --git a/include/linux/netfilter_ipv6/ip6t_hl.h b/include/linux/netfilter_ipv6/ip6t_hl.h
new file mode 100644
index 0000000..b0af8e3
--- /dev/null
+++ b/include/linux/netfilter_ipv6/ip6t_hl.h
@@ -0,0 +1 @@
+#include <linux/netfilter/xt_hl.h>
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [5/5] netfilter: xtables: case-sensitivity avoidance (5/5)
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
` (3 preceding siblings ...)
2011-01-18 15:40 ` [4/5] netfilter: xtables: case-sensitivity avoidance (4/5) Jan Engelhardt
@ 2011-01-18 15:40 ` Jan Engelhardt
2011-01-18 16:16 ` [0/5] xtables: phase out case sensitivity Patrick McHardy
5 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 15:40 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List
parent 94b1a89f0d094d5467a7437af9d86b303943eb8c (v2.6.37-3812-g94b1a89)
commit dc5ef7eb160f0cf8361683a520f53d692abbc527
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Tue Jan 18 06:35:56 2011 +0100
netfilter: xtables: case-sensitivity avoidance (5/5)
Renames the .c source files.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
net/ipv4/netfilter/Makefile | 16 +++---
.../netfilter/{ipt_CLUSTERIP.c => xt_clusterip.c} | 1 +
net/ipv4/netfilter/{ipt_ECN.c => xt_ecn_tg.c} | 1 +
net/ipv4/netfilter/{ipt_LOG.c => xt_log_ipv4.c} | 1 +
.../{ipt_MASQUERADE.c => xt_masquerade.c} | 1 +
net/ipv4/netfilter/{ipt_NETMAP.c => xt_netmap.c} | 1 +
.../netfilter/{ipt_REDIRECT.c => xt_redirect.c} | 0
.../netfilter/{ipt_REJECT.c => xt_reject_ipv4.c} | 1 +
net/ipv4/netfilter/{ipt_ULOG.c => xt_ulog.c} | 1 +
net/ipv6/netfilter/Makefile | 4 +-
net/ipv6/netfilter/{ip6t_LOG.c => xt_log_ipv6.c} | 1 +
.../netfilter/{ip6t_REJECT.c => xt_reject_ipv6.c} | 1 +
net/netfilter/Makefile | 38 ++++++------
net/netfilter/{xt_AUDIT.c => xt_audit.c} | 0
net/netfilter/{xt_CHECKSUM.c => xt_checksum.c} | 0
net/netfilter/{xt_CLASSIFY.c => xt_classify.c} | 0
.../{xt_CONNSECMARK.c => xt_connsecmark.c} | 0
net/netfilter/{xt_CT.c => xt_ct.c} | 0
net/netfilter/{xt_DSCP.c => xt_dscp_tg.c} | 0
net/netfilter/{xt_HL.c => xt_hl_tg.c} | 0
net/netfilter/{xt_IDLETIMER.c => xt_idletimer.c} | 0
net/netfilter/{xt_LED.c => xt_led.c} | 0
net/netfilter/{xt_NFLOG.c => xt_nflog.c} | 0
net/netfilter/{xt_NFQUEUE.c => xt_nfqueue.c} | 0
net/netfilter/{xt_NOTRACK.c => xt_notrack.c} | 0
net/netfilter/{xt_RATEEST.c => xt_rateest_tg.c} | 0
net/netfilter/{xt_SECMARK.c => xt_secmark.c} | 0
net/netfilter/{xt_TCPMSS.c => xt_tcpmss_tg.c} | 0
.../{xt_TCPOPTSTRIP.c => xt_tcpoptstrip.c} | 0
net/netfilter/{xt_TEE.c => xt_tee.c} | 0
net/netfilter/{xt_TPROXY.c => xt_tproxy.c} | 0
net/netfilter/{xt_TRACE.c => xt_trace.c} | 0
32 files changed, 38 insertions(+), 29 deletions(-)
rename net/ipv4/netfilter/{ipt_CLUSTERIP.c => xt_clusterip.c} (99%)
rename net/ipv4/netfilter/{ipt_ECN.c => xt_ecn_tg.c} (99%)
rename net/ipv4/netfilter/{ipt_LOG.c => xt_log_ipv4.c} (99%)
rename net/ipv4/netfilter/{ipt_MASQUERADE.c => xt_masquerade.c} (99%)
rename net/ipv4/netfilter/{ipt_NETMAP.c => xt_netmap.c} (99%)
rename net/ipv4/netfilter/{ipt_REDIRECT.c => xt_redirect.c} (100%)
rename net/ipv4/netfilter/{ipt_REJECT.c => xt_reject_ipv4.c} (99%)
rename net/ipv4/netfilter/{ipt_ULOG.c => xt_ulog.c} (99%)
rename net/ipv6/netfilter/{ip6t_LOG.c => xt_log_ipv6.c} (99%)
rename net/ipv6/netfilter/{ip6t_REJECT.c => xt_reject_ipv6.c} (99%)
rename net/netfilter/{xt_AUDIT.c => xt_audit.c} (100%)
rename net/netfilter/{xt_CHECKSUM.c => xt_checksum.c} (100%)
rename net/netfilter/{xt_CLASSIFY.c => xt_classify.c} (100%)
rename net/netfilter/{xt_CONNSECMARK.c => xt_connsecmark.c} (100%)
rename net/netfilter/{xt_CT.c => xt_ct.c} (100%)
rename net/netfilter/{xt_DSCP.c => xt_dscp_tg.c} (100%)
rename net/netfilter/{xt_HL.c => xt_hl_tg.c} (100%)
rename net/netfilter/{xt_IDLETIMER.c => xt_idletimer.c} (100%)
rename net/netfilter/{xt_LED.c => xt_led.c} (100%)
rename net/netfilter/{xt_NFLOG.c => xt_nflog.c} (100%)
rename net/netfilter/{xt_NFQUEUE.c => xt_nfqueue.c} (100%)
rename net/netfilter/{xt_NOTRACK.c => xt_notrack.c} (100%)
rename net/netfilter/{xt_RATEEST.c => xt_rateest_tg.c} (100%)
rename net/netfilter/{xt_SECMARK.c => xt_secmark.c} (100%)
rename net/netfilter/{xt_TCPMSS.c => xt_tcpmss_tg.c} (100%)
rename net/netfilter/{xt_TCPOPTSTRIP.c => xt_tcpoptstrip.c} (100%)
rename net/netfilter/{xt_TEE.c => xt_tee.c} (100%)
rename net/netfilter/{xt_TPROXY.c => xt_tproxy.c} (100%)
rename net/netfilter/{xt_TRACE.c => xt_trace.c} (100%)
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 19eb59d..9896238 100644
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -53,14 +53,14 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
# targets
-obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
-obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
-obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
-obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
-obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
-obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
-obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
-obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
+obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += xt_clusterip.o
+obj-$(CONFIG_IP_NF_TARGET_ECN) += xt_ecn_tg.o
+obj-$(CONFIG_IP_NF_TARGET_LOG) += xt_log_ipv4.o
+obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += xt_masquerade.o
+obj-$(CONFIG_IP_NF_TARGET_NETMAP) += xt_netmap.o
+obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += xt_redirect.o
+obj-$(CONFIG_IP_NF_TARGET_REJECT) += xt_reject_ipv4.o
+obj-$(CONFIG_IP_NF_TARGET_ULOG) += xt_ulog.o
# generic ARP tables
obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/xt_clusterip.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_CLUSTERIP.c
rename to net/ipv4/netfilter/xt_clusterip.c
index ed812b1..696f13c 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/xt_clusterip.c
@@ -36,6 +36,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: CLUSTERIP target");
+MODULE_ALIAS("ipt_CLUSTERIP");
struct clusterip_config {
struct list_head list; /* list of all configs */
diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/xt_ecn_tg.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_ECN.c
rename to net/ipv4/netfilter/xt_ecn_tg.c
index a8ee93e..a7c0f62 100644
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/xt_ecn_tg.c
@@ -22,6 +22,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: Explicit Congestion Notification (ECN) flag modification");
+MODULE_ALIAS("ipt_ECN");
/* set ECT codepoint from IP header.
* return false if there was an error. */
diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/xt_log_ipv4.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_LOG.c
rename to net/ipv4/netfilter/xt_log_ipv4.c
index 710a08f..a3f337c 100644
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/xt_log_ipv4.c
@@ -29,6 +29,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("Xtables: IPv4 packet logging to syslog");
+MODULE_ALIAS("ipt_LOG");
/* One level of recursion won't kill us */
static void dump_packet(struct sbuff *m,
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/xt_masquerade.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_MASQUERADE.c
rename to net/ipv4/netfilter/xt_masquerade.c
index d2ed9dc..274e8f5 100644
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/xt_masquerade.c
@@ -26,6 +26,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("Xtables: automatic-address SNAT");
+MODULE_ALIAS("ipt_MASQUERADE");
/* FIXME: Multiple targets. --RR */
static int masquerade_tg_check(const struct xt_tgchk_param *par)
diff --git a/net/ipv4/netfilter/ipt_NETMAP.c b/net/ipv4/netfilter/xt_netmap.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_NETMAP.c
rename to net/ipv4/netfilter/xt_netmap.c
index 6cdb298..39f46a3 100644
--- a/net/ipv4/netfilter/ipt_NETMAP.c
+++ b/net/ipv4/netfilter/xt_netmap.c
@@ -21,6 +21,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Svenning Soerensen <svenning@post5.tele.dk>");
MODULE_DESCRIPTION("Xtables: 1:1 NAT mapping of IPv4 subnets");
+MODULE_ALIAS("ipt_NETMAP");
static int netmap_tg_check(const struct xt_tgchk_param *par)
{
diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/xt_redirect.c
similarity index 100%
rename from net/ipv4/netfilter/ipt_REDIRECT.c
rename to net/ipv4/netfilter/xt_redirect.c
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/xt_reject_ipv4.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_REJECT.c
rename to net/ipv4/netfilter/xt_reject_ipv4.c
index c7e4854..07951d0 100644
--- a/net/ipv4/netfilter/ipt_REJECT.c
+++ b/net/ipv4/netfilter/xt_reject_ipv4.c
@@ -31,6 +31,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
MODULE_DESCRIPTION("Xtables: packet \"rejection\" target for IPv4");
+MODULE_ALIAS("ipt_REJECT");
/* Send RST reply */
static void send_reset(struct sk_buff *oldskb, int hook)
diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/xt_ulog.c
similarity index 99%
rename from net/ipv4/netfilter/ipt_ULOG.c
rename to net/ipv4/netfilter/xt_ulog.c
index 293dbe3..ae0f58d 100644
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/xt_ulog.c
@@ -52,6 +52,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
MODULE_DESCRIPTION("Xtables: packet logging to netlink using ULOG");
+MODULE_ALIAS("ipt_ULOG");
MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_NFLOG);
#define ULOG_NL_EVENT 111 /* Harald's favorite number */
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index abfee91..4ac424b 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -30,5 +30,5 @@ obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o
obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o
# targets
-obj-$(CONFIG_IP6_NF_TARGET_LOG) += ip6t_LOG.o
-obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o
+obj-$(CONFIG_IP6_NF_TARGET_LOG) += xt_log_ipv6.o
+obj-$(CONFIG_IP6_NF_TARGET_REJECT) += xt_reject_ipv6.o
diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/xt_log_ipv6.c
similarity index 99%
rename from net/ipv6/netfilter/ip6t_LOG.c
rename to net/ipv6/netfilter/xt_log_ipv6.c
index a48698e..baf1cb0 100644
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/xt_log_ipv6.c
@@ -29,6 +29,7 @@
MODULE_AUTHOR("Jan Rekorajski <baggins@pld.org.pl>");
MODULE_DESCRIPTION("Xtables: IPv6 packet logging to syslog");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("ip6t_LOG");
struct in_device;
#include <net/route.h>
diff --git a/net/ipv6/netfilter/ip6t_REJECT.c b/net/ipv6/netfilter/xt_reject_ipv6.c
similarity index 99%
rename from net/ipv6/netfilter/ip6t_REJECT.c
rename to net/ipv6/netfilter/xt_reject_ipv6.c
index 19b2052..55d5a4d 100644
--- a/net/ipv6/netfilter/ip6t_REJECT.c
+++ b/net/ipv6/netfilter/xt_reject_ipv6.c
@@ -35,6 +35,7 @@
MODULE_AUTHOR("Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>");
MODULE_DESCRIPTION("Xtables: packet \"rejection\" target for IPv6");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("ip6t_REJECT");
/* Send RST reply */
static void send_reset(struct net *net, struct sk_buff *oldskb)
diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 401d574..f3a2fb6 100644
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -45,25 +45,25 @@ obj-$(CONFIG_NETFILTER_XT_MARK) += xt_mark.o
obj-$(CONFIG_NETFILTER_XT_CONNMARK) += xt_connmark.o
# targets
-obj-$(CONFIG_NETFILTER_XT_TARGET_AUDIT) += xt_AUDIT.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_CHECKSUM) += xt_CHECKSUM.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_CONNSECMARK.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_TPROXY) += xt_TPROXY.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_TEE) += xt_TEE.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
-obj-$(CONFIG_NETFILTER_XT_TARGET_IDLETIMER) += xt_IDLETIMER.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_AUDIT) += xt_audit.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_CHECKSUM) += xt_checksum.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_classify.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_CONNSECMARK) += xt_connsecmark.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_ct.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_dscp_tg.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_hl_tg.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_led.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_nflog.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_nfqueue.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_notrack.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_rateest_tg.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_secmark.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TPROXY) += xt_tproxy.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_tcpmss_tg.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_tcpoptstrip.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TEE) += xt_tee.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_trace.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_IDLETIMER) += xt_idletimer.o
# matches
obj-$(CONFIG_NETFILTER_XT_MATCH_CLUSTER) += xt_cluster.o
diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_audit.c
similarity index 100%
rename from net/netfilter/xt_AUDIT.c
rename to net/netfilter/xt_audit.c
diff --git a/net/netfilter/xt_CHECKSUM.c b/net/netfilter/xt_checksum.c
similarity index 100%
rename from net/netfilter/xt_CHECKSUM.c
rename to net/netfilter/xt_checksum.c
diff --git a/net/netfilter/xt_CLASSIFY.c b/net/netfilter/xt_classify.c
similarity index 100%
rename from net/netfilter/xt_CLASSIFY.c
rename to net/netfilter/xt_classify.c
diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_connsecmark.c
similarity index 100%
rename from net/netfilter/xt_CONNSECMARK.c
rename to net/netfilter/xt_connsecmark.c
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_ct.c
similarity index 100%
rename from net/netfilter/xt_CT.c
rename to net/netfilter/xt_ct.c
diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_dscp_tg.c
similarity index 100%
rename from net/netfilter/xt_DSCP.c
rename to net/netfilter/xt_dscp_tg.c
diff --git a/net/netfilter/xt_HL.c b/net/netfilter/xt_hl_tg.c
similarity index 100%
rename from net/netfilter/xt_HL.c
rename to net/netfilter/xt_hl_tg.c
diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_idletimer.c
similarity index 100%
rename from net/netfilter/xt_IDLETIMER.c
rename to net/netfilter/xt_idletimer.c
diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_led.c
similarity index 100%
rename from net/netfilter/xt_LED.c
rename to net/netfilter/xt_led.c
diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_nflog.c
similarity index 100%
rename from net/netfilter/xt_NFLOG.c
rename to net/netfilter/xt_nflog.c
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_nfqueue.c
similarity index 100%
rename from net/netfilter/xt_NFQUEUE.c
rename to net/netfilter/xt_nfqueue.c
diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_notrack.c
similarity index 100%
rename from net/netfilter/xt_NOTRACK.c
rename to net/netfilter/xt_notrack.c
diff --git a/net/netfilter/xt_RATEEST.c b/net/netfilter/xt_rateest_tg.c
similarity index 100%
rename from net/netfilter/xt_RATEEST.c
rename to net/netfilter/xt_rateest_tg.c
diff --git a/net/netfilter/xt_SECMARK.c b/net/netfilter/xt_secmark.c
similarity index 100%
rename from net/netfilter/xt_SECMARK.c
rename to net/netfilter/xt_secmark.c
diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_tcpmss_tg.c
similarity index 100%
rename from net/netfilter/xt_TCPMSS.c
rename to net/netfilter/xt_tcpmss_tg.c
diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_tcpoptstrip.c
similarity index 100%
rename from net/netfilter/xt_TCPOPTSTRIP.c
rename to net/netfilter/xt_tcpoptstrip.c
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_tee.c
similarity index 100%
rename from net/netfilter/xt_TEE.c
rename to net/netfilter/xt_tee.c
diff --git a/net/netfilter/xt_TPROXY.c b/net/netfilter/xt_tproxy.c
similarity index 100%
rename from net/netfilter/xt_TPROXY.c
rename to net/netfilter/xt_tproxy.c
diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_trace.c
similarity index 100%
rename from net/netfilter/xt_TRACE.c
rename to net/netfilter/xt_trace.c
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
` (4 preceding siblings ...)
2011-01-18 15:40 ` [5/5] netfilter: xtables: case-sensitivity avoidance (5/5) Jan Engelhardt
@ 2011-01-18 16:16 ` Patrick McHardy
2011-01-18 17:37 ` Sam Roberts
2011-01-18 18:21 ` Jan Engelhardt
5 siblings, 2 replies; 14+ messages in thread
From: Patrick McHardy @ 2011-01-18 16:16 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Developer Mailing List, Aaron Wright
On 18.01.2011 16:38, Jan Engelhardt wrote:
> bug report http://bugzilla.netfilter.org/show_bug.cgi?id=694 , though
> being written in a heated fashion, did prompt me to revisit the
> actual issue. While I have to question why users are relying on
> inferior filesystems (the issue was raised before on the lists), I
> feel inclined to solve bugs.
Well, I don't see any benefit in causing so much churn just for
*one* user, who has been feeling unhappy about his scripts not
working properly.
> So here is a proposed patchset that starts the migration. Since iptables
> userspace looks modules up by protocol anyway, it continues to work. The
> only thing is headers, which is merely a build time thing and, as has
> itself shown in the past years, no deal. Within the usual grace period
> of 1-1.5 years (or even sooner than usual - since userspace has its own
> copies of headers), the netfilter/ dirs can be completely case-free.
I don't want to apply this. Feel free to try to convince other
netfilter developers that this is a good idea and I'll pull it
in, but so far this looks like useless noise to me.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 16:16 ` [0/5] xtables: phase out case sensitivity Patrick McHardy
@ 2011-01-18 17:37 ` Sam Roberts
2011-01-18 18:21 ` Jan Engelhardt
1 sibling, 0 replies; 14+ messages in thread
From: Sam Roberts @ 2011-01-18 17:37 UTC (permalink / raw)
To: Netfilter Developer Mailing List
On Tue, Jan 18, 2011 at 8:16 AM, Patrick McHardy <kaber@trash.net> wrote:
> On 18.01.2011 16:38, Jan Engelhardt wrote:
>> bug report http://bugzilla.netfilter.org/show_bug.cgi?id=694 , though
>> being written in a heated fashion, did prompt me to revisit the
>> actual issue. While I have to question why users are relying on
>> inferior filesystems (the issue was raised before on the lists), I
>> feel inclined to solve bugs.
>
> Well, I don't see any benefit in causing so much churn just for
> *one* user, who has been feeling unhappy about his scripts not
> working properly.
It is a lot of churn, but it might be more than scripts. I've had
occaison to check out code on case-insensitive filesystems for the
purpose of reading it (Apple's and MS's), and had the checked files
trash each other because the file system considers the names to be the
same. Its annoying, even if it is the filesystem's fault. Though not
recently, not netfilter, and not with git.
Cheers,
Sam
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 16:16 ` [0/5] xtables: phase out case sensitivity Patrick McHardy
2011-01-18 17:37 ` Sam Roberts
@ 2011-01-18 18:21 ` Jan Engelhardt
2011-01-18 18:37 ` Eric Dumazet
2011-01-19 16:20 ` Patrick McHardy
1 sibling, 2 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 18:21 UTC (permalink / raw)
To: Patrick McHardy; +Cc: Netfilter Developer Mailing List, Aaron Wright
On Tuesday 2011-01-18 17:16, Patrick McHardy wrote:
>On 18.01.2011 16:38, Jan Engelhardt wrote:
>> http://bugzilla.netfilter.org/show_bug.cgi?id=694 [...] While I
>> have to question why users are relying on inferior filesystems
>> (the issue was raised before on the lists), I feel inclined to
>> solve bugs. So here is a proposed patchset that starts the
>> migration. [...]
>
>I don't want to apply this. Feel free to try to convince other
>netfilter developers that this is a good idea and I'll pull it in, but
>so far this looks like useless noise to me.
>
>[...] I don't see any benefit in causing so much churn just for one*
>*user, who has been feeling unhappy about his scripts not working
>properly.
I'll try to add to my case then; The dependency on case-sensitivity is a
long-known issue, so much that in fact, Bart avoided doing this again as
early as ebtables's inception around 2002.
I am pretty sure there was more than just this one 2011 user -- needless
to say you have to count me in --, and that there was discussion [during
my time 2007 onwards]. Google fails me on finding that, though I dug up
another report from 2004: http://lkml.org/lkml/2004/10/17/147
At that time Harald argued "iptables fundamentally relies on the
destinction", though that does not apply today thanks to module aliases.
As a resident contributor, I stand behind the changes. In the unlikely
even that it breaks, I see it as duty to fix it. The churn is on me
already practically.
Assistance is offered to users who do run into including, but not
limited to, such issues. The IRC channel is lively again, open reports
in various bugzilla trackers are actively being inspected for non-distro
faults and resolved. The overall user experience, IMHO, has greatly
improved since iptables 1.3.8, and I would like to continue on working
on it. I am sure something can be devised if your time does not permit
patch handling.
==
Anticipating pending patches from others (specifically xt_nfqueue rev 2
from Florian), git-merge is likely needed to cope with the renames, when
applying others' patch files.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 18:21 ` Jan Engelhardt
@ 2011-01-18 18:37 ` Eric Dumazet
2011-01-18 18:52 ` Jan Engelhardt
2011-01-19 16:20 ` Patrick McHardy
1 sibling, 1 reply; 14+ messages in thread
From: Eric Dumazet @ 2011-01-18 18:37 UTC (permalink / raw)
To: Jan Engelhardt
Cc: Patrick McHardy, Netfilter Developer Mailing List, Aaron Wright
Le mardi 18 janvier 2011 à 19:21 +0100, Jan Engelhardt a écrit :
> On Tuesday 2011-01-18 17:16, Patrick McHardy wrote:
> >On 18.01.2011 16:38, Jan Engelhardt wrote:
> >> http://bugzilla.netfilter.org/show_bug.cgi?id=694 [...] While I
> >> have to question why users are relying on inferior filesystems
> >> (the issue was raised before on the lists), I feel inclined to
> >> solve bugs. So here is a proposed patchset that starts the
> >> migration. [...]
> >
> >I don't want to apply this. Feel free to try to convince other
> >netfilter developers that this is a good idea and I'll pull it in, but
> >so far this looks like useless noise to me.
> >
> >[...] I don't see any benefit in causing so much churn just for one*
> >*user, who has been feeling unhappy about his scripts not working
> >properly.
>
> I'll try to add to my case then; The dependency on case-sensitivity is a
> long-known issue, so much that in fact, Bart avoided doing this again as
> early as ebtables's inception around 2002.
Why not renaming only clashing files, and make sure future files are
lowercase only ?
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 18:37 ` Eric Dumazet
@ 2011-01-18 18:52 ` Jan Engelhardt
0 siblings, 0 replies; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-18 18:52 UTC (permalink / raw)
To: Eric Dumazet
Cc: Patrick McHardy, Netfilter Developer Mailing List, Aaron Wright
On Tuesday 2011-01-18 19:37, Eric Dumazet wrote:
>Le mardi 18 janvier 2011 à 19:21 +0100, Jan Engelhardt a écrit :
>>
>>I'll try to add to my case then; The dependency on case-sensitivity is
>>a long-known issue, so much that in fact, Bart avoided doing this
>>again as early as ebtables's inception around 2002.
>
>Why not renaming only clashing files, and make sure future files are
>lowercase only ?
I did not think of it as a big deal; renames of non-conflicting files
was trivial low-hanging fruit. So might as well do it across the board
to get it into order.
It also happens to serve to not encourage users to continue using
uppercase on new submissions (since they are, at times, copy-and-paste
happy - we have seen that in the userspace code even more often than in
the kernel in the past - and don't read git logs or mailing lists to get
to know current practices).
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-18 18:21 ` Jan Engelhardt
2011-01-18 18:37 ` Eric Dumazet
@ 2011-01-19 16:20 ` Patrick McHardy
2011-01-19 19:44 ` Jan Engelhardt
1 sibling, 1 reply; 14+ messages in thread
From: Patrick McHardy @ 2011-01-19 16:20 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Developer Mailing List, Aaron Wright
On 18.01.2011 19:21, Jan Engelhardt wrote:
> On Tuesday 2011-01-18 17:16, Patrick McHardy wrote:
>> On 18.01.2011 16:38, Jan Engelhardt wrote:
>>> http://bugzilla.netfilter.org/show_bug.cgi?id=694 [...] While I
>>> have to question why users are relying on inferior filesystems
>>> (the issue was raised before on the lists), I feel inclined to
>>> solve bugs. So here is a proposed patchset that starts the
>>> migration. [...]
>>
>> I don't want to apply this. Feel free to try to convince other
>> netfilter developers that this is a good idea and I'll pull it in, but
>> so far this looks like useless noise to me.
>>
>> [...] I don't see any benefit in causing so much churn just for one*
>> *user, who has been feeling unhappy about his scripts not working
>> properly.
>
> I'll try to add to my case then; The dependency on case-sensitivity is a
> long-known issue, so much that in fact, Bart avoided doing this again as
> early as ebtables's inception around 2002.
>
> I am pretty sure there was more than just this one 2011 user -- needless
> to say you have to count me in --, and that there was discussion [during
> my time 2007 onwards]. Google fails me on finding that, though I dug up
> another report from 2004: http://lkml.org/lkml/2004/10/17/147
>
> At that time Harald argued "iptables fundamentally relies on the
> destinction", though that does not apply today thanks to module aliases.
>
> As a resident contributor, I stand behind the changes. In the unlikely
> even that it breaks, I see it as duty to fix it. The churn is on me
> already practically.
It's quite likely that something breaks. Module aliases only work for
loading modules, not for unloading them. So there's a big chance that
some scripts will break. We've done renames occasionally when necessary
(f.i. ip_conntrack => nf_conntrack), but this really rare case of users
using stupid file systems doesn't really justify this in my opinion.
Anyone actually using Linux is not going to have this problem.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-19 16:20 ` Patrick McHardy
@ 2011-01-19 19:44 ` Jan Engelhardt
2011-01-19 19:54 ` Patrick McHardy
0 siblings, 1 reply; 14+ messages in thread
From: Jan Engelhardt @ 2011-01-19 19:44 UTC (permalink / raw)
To: Patrick McHardy
Cc: Netfilter Developer Mailing List, Aaron Wright, Jon Masters
On Wednesday 2011-01-19 17:20, Patrick McHardy wrote:
>>
>> As a resident contributor, I stand behind the changes. In the unlikely
>> even that it breaks, I see it as duty to fix it. The churn is on me
>> already practically.
>
>It's quite likely that something breaks. Module aliases only work for
>loading modules, not for unloading them. So there's a big chance that
>some scripts will break.
Scripts can not rely on that being successful: Xtables modules may
pull in other modules, including using things like nf_ct_get_l3proto
which do not leave a trace in `lsmod` output. So rmmodding of xt
modules can fail _even_ in the present situation. Not to mention that
scripts currently have to battle the mulitple prefixes that are in
use (which the patchset addresses in part).
Since modinfo not following aliases has bothered myself for some time
now, I should probably just add that to m-i-t modinfo as an option and,
while at it, rmmod.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [0/5] xtables: phase out case sensitivity
2011-01-19 19:44 ` Jan Engelhardt
@ 2011-01-19 19:54 ` Patrick McHardy
0 siblings, 0 replies; 14+ messages in thread
From: Patrick McHardy @ 2011-01-19 19:54 UTC (permalink / raw)
To: Jan Engelhardt
Cc: Netfilter Developer Mailing List, Aaron Wright, Jon Masters
Am 19.01.2011 20:44, schrieb Jan Engelhardt:
>
> On Wednesday 2011-01-19 17:20, Patrick McHardy wrote:
>>>
>>> As a resident contributor, I stand behind the changes. In the unlikely
>>> even that it breaks, I see it as duty to fix it. The churn is on me
>>> already practically.
>>
>> It's quite likely that something breaks. Module aliases only work for
>> loading modules, not for unloading them. So there's a big chance that
>> some scripts will break.
>
> Scripts can not rely on that being successful: Xtables modules may
> pull in other modules, including using things like nf_ct_get_l3proto
> which do not leave a trace in `lsmod` output. So rmmodding of xt
> modules can fail _even_ in the present situation. Not to mention that
> scripts currently have to battle the mulitple prefixes that are in
> use (which the patchset addresses in part).
Pulling in other modules though things like nf_ct_get_l3proto()
is not a problem, you just have to flush the tables before trying
to rmmod. This works well and I've seen plenty of scripts doing
exactly that.
> Since modinfo not following aliases has bothered myself for some time
> now, I should probably just add that to m-i-t modinfo as an option and,
> while at it, rmmod.
Sure, that sounds fine to me, though it should probably follow
aliases by default instead of as an option if you want to
preserve compatiblity when renaming things.
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2011-01-19 19:54 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-18 15:38 [0/5] xtables: phase out case sensitivity Jan Engelhardt
2011-01-18 15:39 ` [1/5] netfilter: xtables: avoid case-sensitive filenames (1/5) Jan Engelhardt
2011-01-18 15:39 ` [2/5] netfilter: xtables: case-sensitivity avoidance (2/5) Jan Engelhardt
2011-01-18 15:39 ` [3/5] netfilter: xtables: case-sensitivity avoidance (3/5) Jan Engelhardt
2011-01-18 15:40 ` [4/5] netfilter: xtables: case-sensitivity avoidance (4/5) Jan Engelhardt
2011-01-18 15:40 ` [5/5] netfilter: xtables: case-sensitivity avoidance (5/5) Jan Engelhardt
2011-01-18 16:16 ` [0/5] xtables: phase out case sensitivity Patrick McHardy
2011-01-18 17:37 ` Sam Roberts
2011-01-18 18:21 ` Jan Engelhardt
2011-01-18 18:37 ` Eric Dumazet
2011-01-18 18:52 ` Jan Engelhardt
2011-01-19 16:20 ` Patrick McHardy
2011-01-19 19:44 ` Jan Engelhardt
2011-01-19 19:54 ` Patrick McHardy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.