From 79897ae09aeb4441ab0e9431883d5ac4b831f55c Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 4 Apr 2010 12:40:06 +0000 Subject: [PATCH] netfilter: fix extension list in package descriptions (closes: #7045) SVN-Revision: 20694 --- package/kernel/modules/netfilter.mk | 137 +++++++++------------------- 1 file changed, 44 insertions(+), 93 deletions(-) diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index bf46a72c4b..d19a16da3f 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -21,18 +21,13 @@ endef define KernelPackage/ipt-core/description Netfilter core kernel modules Includes: - - ipt_limit - - xt_limit - - ipt_mac - - xt_mac - - ipt_multiport - - xt_multiport - - ipt_comment - - xt_comment - - ipt_LOG - - ipt_TCPMSS - - xt_TCPMSS - - ipt_REJECT + - comment (2.6) + - limit + - LOG + - mac + - multiport + - REJECT + - TCPMSS endef $(eval $(call KernelPackage,ipt-core)) @@ -56,11 +51,10 @@ define KernelPackage/ipt-conntrack/description Netfilter (IPv4) kernel modules for connection tracking Includes: - conntrack - - defrag + - defrag (2.6) - iptables_raw - NOTRACK - state - - xt_NOTRACK endef $(eval $(call KernelPackage,ipt-conntrack)) @@ -98,10 +92,8 @@ endef define KernelPackage/ipt-filter/description Netfilter (IPv4) kernel modules for packet content inspection Includes: - - ipt_layer7 - - ipt_string - - xt_layer7 - - xt_string + - layer7 + - string endef $(eval $(call KernelPackage,ipt-filter)) @@ -118,30 +110,18 @@ endef define KernelPackage/ipt-ipopt/description Netfilter (IPv4) modules for matching/changing IP packet options Includes: - - ipt_dscp - - xt_dscp - - xt_DSCP - - ipt_ecn - - ipt_length - - xt_length - - ipt_mark - - xt_mark - - xt_statistic - - ipt_tcpmss - - xt_tcpmss - - ipt_time - - xt_time - - ipt_unclean - - ipt_CLASSIFY - - xt_CLASSIFY - - ipt_DSCP - - ipt_ECN - - ipt_MARK - - xt_MARK - - xt_tos - - xt_TOS - - xt_hl - - xt_HL + - CLASSIFY + - dscp/DSCP + - ecn/ECN + - hl/HL (2.6.30 and later) + - length + - mark/MARK + - statistic (2.6) + - tcpmss + - time + - tos/TOS (prior to 2.6.25) + - ttl/TTL (prior to 2.6.30) + - unclean endef $(eval $(call KernelPackage,ipt-ipopt)) @@ -158,10 +138,9 @@ endef define KernelPackage/ipt-ipsec/description Netfilter (IPv4) modules for matching IPSec packets Includes: - - ipt_ah - - ipt_esp - - xt_esp - - xt_policy + - ah + - esp + - policy (2.6) endef $(eval $(call KernelPackage,ipt-ipsec)) @@ -195,7 +174,7 @@ endef define KernelPackage/ipt-nat-extra/description Netfilter (IPv4) kernel modules for extra NAT targets Includes: - - MIRROR + - MIRROR (2.4) - NETMAP - REDIRECT endef @@ -214,17 +193,9 @@ endef define KernelPackage/ipt-nathelper/description Default Netfilter (IPv4) Conntrack and NAT helpers Includes: - - ip_conntrack_ftp - - ip_nat_ftp - - nf_conntrack_ftp - - nf_nat_ftp - - ip_conntrack_irc - - ip_nat_irc - - nf_conntrack_irc - - nf_nat_irc - - ip_conntrack_tftp - - nf_conntrack_tftp - - nf_nat_tftp + - ftp + - irc + - tftp endef $(eval $(call KernelPackage,ipt-nathelper)) @@ -241,33 +212,14 @@ endef define KernelPackage/ipt-nathelper-extra/description Extra Netfilter (IPv4) Conntrack and NAT helpers Includes: - - ip_conntrack_amanda - - nf_conntrack_amanda - - nf_nat_amanda - - ip_conntrack_proto_gre - - ip_nat_proto_gre - - nf_conntrack_proto_gre - - nf_nat_proto_gre - - ip_conntrack_h323 - - ip_nat_h323 - - nf_conntrack_h323 - - nf_nat_h323 - - ip_conntrack_mms - - ip_nat_mms - - ip_conntrack_pptp - - ip_nat_pptp - - nf_conntrack_pptp - - nf_nat_pptp - - ip_conntrack_rtsp - - ip_nat_rtsp - - nf_conntrack_rtsp - - nf_nat_rtsp - - ip_conntrack_sip - - ip_nat_sip - - nf_conntrack_sip - - nf_nat_sip - - ip_nat_snmp_basic - - nf_nat_snmp_basic + - amanda + - h323 + - mms + - pptp (2.6) + - proto_gre (2.6) + - rtsp + - sip (2.6) + - snmp_basic endef $(eval $(call KernelPackage,ipt-nathelper-extra)) @@ -325,7 +277,7 @@ endef define KernelPackage/ipt-ulog/description Netfilter (IPv4) module for user-space packet logging Includes: - - ipt_ULOG + - ULOG endef $(eval $(call KernelPackage,ipt-ulog)) @@ -342,7 +294,7 @@ endef define KernelPackage/ipt-iprange/description Netfilter (IPv4) module for matching ip ranges Includes: - - ipt_IPRANGE + - iprange endef $(eval $(call KernelPackage,ipt-iprange)) @@ -359,12 +311,11 @@ endef define KernelPackage/ipt-extra/description Other Netfilter (IPv4) kernel modules Includes: - - ipt_condition - - ipt_owner - - xt_physdev - - ipt_pkttype - - xt_pkttype - - xt_quota + - condition (2.4 only) + - owner + - physdev (if bridge support was enabled in kernel) + - pkttype + - quota endef $(eval $(call KernelPackage,ipt-extra)) -- 2.25.1