Add extra informations for iptables-mod-* ipk's in Config.in Remove SIP target as...

SVN-Revision: 3433

diff --git a/openwrt/package/iptables/Config.in b/openwrt/package/iptables/Config.in
index 95199821e2bbf7f568bd2a54506a5e06a36a053d..7c5e136c70efd43632ce30ebd24aab7d4de45629 100644 (file)
--- a/openwrt/package/iptables/Config.in
+++ b/openwrt/package/iptables/Config.in
@@ -30,6 +30,11 @@ config BR2_PACKAGE_IPTABLES_MOD_CONNTRACK
        help
          Iptables (IPv4) extensions for connection tracking
 
+         Includes:
+            * libipt_conntrack
+            * libipt_helper
+            * libipt_connmark/CONNMARK
+  
 config BR2_PACKAGE_IPTABLES_MOD_EXTRA
        tristate "iptables-mod-extra - Other extra Iptables extensions"
        default m if CONFIG_DEVEL
@@ -38,6 +43,13 @@ config BR2_PACKAGE_IPTABLES_MOD_EXTRA
        help
          Other extra Iptables (IPv4) extensions
 
+         Includes:
+            * libipt_limit
+            * libipt_owner
+            * libipt_physdev
+            * libipt_pkttype
+            * libipt_recent
+
 config BR2_PACKAGE_IPTABLES_MOD_FILTER
        tristate "iptables-mod-filter - Iptables extension for packet content inspection"
        default m if CONFIG_DEVEL
@@ -46,6 +58,10 @@ config BR2_PACKAGE_IPTABLES_MOD_FILTER
        help
          Iptables (IPv4) extension for packet content inspection
 
+         Includes:
+            * libipt_ipp2p
+            * libipt_layer7
+
 config BR2_PACKAGE_IPTABLES_MOD_IPOPT
        tristate "iptables-mod-ipopt - Iptables extensions for matching/changing IP packet options"
        default m if CONFIG_DEVEL
@@ -54,6 +70,16 @@ config BR2_PACKAGE_IPTABLES_MOD_IPOPT
        help
          Extra Iptables (IPv4) extensions for matching/changing IP packet options
 
+         Includes:
+            * libipt_dscp/DSCP
+            * libipt_ecn/ECN
+            * libipt_length
+            * libipt_mac
+            * libipt_tos/TOS
+            * libipt_tcpmms
+            * libipt_ttl/TTL
+            * libipt_unclean
+
 config BR2_PACKAGE_IPTABLES_MOD_IPSEC
        tristate "iptables-mod-ipsec - Iptables extensions for matching special IPsec packets"
        default m if CONFIG_DEVEL
@@ -62,6 +88,10 @@ config BR2_PACKAGE_IPTABLES_MOD_IPSEC
        help
          Iptables (IPv4) extensions for matching special IPsec packets
 
+         Includes:
+            * libipt_ah
+            * libipt_esp
+
 config BR2_PACKAGE_IPTABLES_MOD_NAT
        tristate "iptables-mod-nat - Iptables extensions for different NAT targets"
        default m if CONFIG_DEVEL
@@ -70,6 +100,9 @@ config BR2_PACKAGE_IPTABLES_MOD_NAT
        help
          Iptables (IPv4) extensions for different NAT targets
 
+         Includes:
+           * libipt_REDIRECT
+
 config BR2_PACKAGE_IPTABLES_MOD_IMQ
        tristate "iptables-mod-imq - Iptables extensions for Intermediate Queuing Device QoS-support"
        default m if CONFIG_DEVEL
@@ -85,6 +118,9 @@ config BR2_PACKAGE_IPTABLES_MOD_ULOG
        select BR2_PACKAGE_KMOD_IPT_ULOG
        help
          Iptables (IPv4) extensions for user-space packet logging
+         
+         Includes:
+         * libipt_ULOG
 
 config BR2_PACKAGE_IPTABLES_UTILS
        tristate "iptables-utils - Save and restore utilities"

diff --git a/openwrt/target/linux/netfilter.mk b/openwrt/target/linux/netfilter.mk
index 711190cf22bd2d62006399819d6128ee42f0ed86..f560d3b8db82f2ff8f026aae65e3a2220de96e84 100644 (file)
--- a/openwrt/target/linux/netfilter.mk
+++ b/openwrt/target/linux/netfilter.mk
@@ -59,8 +59,6 @@ IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PPTP) += ip_nat_pptp
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_TFTP) += ip_conntrack_tftp
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_TFTP) += ip_nat_tftp
-IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += ip_conntrack_sip
-IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += ip_nat_sip
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_H323) += ip_conntrack_h323
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_H323) += ip_nat_h323
 IPKG_KMOD_IPT_NAT_EXTRA-$(CONFIG_IP_NF_RTSP) += ip_conntrack_rtsp