Changeset 16980


Ignore:
Timestamp:
2009-07-25T21:47:48+02:00 (7 years ago)
Author:
florian
Message:

[package] split ebtables packages and modules into ebtables ipv4/6 and watchers (#5001)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/netfilter.mk

    r16964 r16980  
    1313P_V6:=ipv6/netfilter/ 
    1414P_XT:=netfilter/ 
     15P_EBT:=bridge/netfilter/ 
    1516endif 
    1617 
     
    2829$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_FILTER, $(P_V4)iptable_filter),)) 
    2930$(eval $(if $(NF_KMOD),$(call nf_add,IPT_CORE,CONFIG_IP_NF_MANGLE, $(P_V4)iptable_mangle),)) 
     31 
     32# 
     33# ebtables 
     34# 
     35 
     36$(eval $(if $(NF_KMOD),$(call nf_add,EBTABLES,CONFIG_BRIDGE_NF_EBTABLES, $(P_EBT)ebtables),)) 
     37 
     38# ebtables: tables 
     39$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_BROUTE, $(P_EBT)ebtable_broute)) 
     40$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_FILTER, $(P_EBT)ebtable_filter)) 
     41$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_T_NAT, $(P_EBT)ebtable_nat)) 
     42 
     43# ebtables: matches 
     44$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_802_3, $(P_EBT)ebt_802_3)) 
     45$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_AMONG, $(P_EBT)ebt_among)) 
     46$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARP, $(P_EBT)ebt_arp)) 
     47$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_IP, $(P_EBT)ebt_ip)) 
     48$(eval $(call nf_add,EBTABLES_IP6,CONFIG_BRIDGE_EBT_IP6, $(P_EBT)ebt_ip6)) 
     49$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_LIMIT, $(P_EBT)ebt_limit)) 
     50$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK, $(P_EBT)ebt_mark_m)) 
     51$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_PKTTYPE, $(P_EBT)ebt_pkttype)) 
     52$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_STP, $(P_EBT)ebt_stp)) 
     53$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_VLAN, $(P_EBT)ebt_vlan)) 
     54 
     55# targets 
     56$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_ARPREPLY, $(P_EBT)ebt_arpreply)) 
     57$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_MARK_T, $(P_EBT)ebt_mark)) 
     58$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_DNAT, $(P_EBT)ebt_dnat)) 
     59$(eval $(call nf_add,EBTABLES,CONFIG_BRIDGE_EBT_REDIRECT, $(P_EBT)ebt_redirect)) 
     60$(eval $(call nf_add,EBTABLES_IP4,CONFIG_BRIDGE_EBT_SNAT, $(P_EBT)ebt_snat)) 
     61 
     62# watchers 
     63$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_LOG, $(P_EBT)ebt_log)) 
     64$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_ULOG, $(P_EBT)ebt_ulog)) 
     65$(eval $(call nf_add,EBTABLES_WATCHERS,CONFIG_BRIDGE_EBT_NFLOG, $(P_EBT)ebt_nflog)) 
    3066 
    3167# userland only 
     
    298334IPT_BUILTIN += $(IPT_NATHELPER_EXTRA-y) 
    299335IPT_BUILTIN += $(IPT_ULOG-y) 
     336IPT_BUILTIN += $(EBTABLES-y) 
     337IPT_BUILTIN += $(EBTABLES_IP4-y) 
     338IPT_BUILTIN += $(EBTALTES_IP6-y) 
     339IPT_BUILTIN += $(EBTABLES_WATCHERS-y) 
    300340 
    301341endif # __inc_netfilter 
  • trunk/package/kernel/modules/netfilter.mk

    r16726 r16980  
    388388  TITLE:=Bridge firewalling modules 
    389389  DEPENDS:=@LINUX_2_6 
    390   FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) 
     390  FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) 
    391391  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ 
    392         CONFIG_BRIDGE_NF_EBTABLES 
    393   AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.$(LINUX_KMOD_SUFFIX),%,ebtables.$(LINUX_KMOD_SUFFIX) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX))))) 
     392        $(KCONFIG_EBTABLES) 
     393  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES-m))) 
    394394endef 
    395395 
    396396define KernelPackage/ebtables/description 
    397  Kernel modules for Ethernet Bridge firewalling 
     397  ebtables is a general, extensible frame/packet identification 
     398  framework. It provides you to do Ethernet 
     399  filtering/NAT/brouting on the Ethernet bridge. 
    398400endef 
    399401 
    400402$(eval $(call KernelPackage,ebtables)) 
    401403 
     404define KernelPackage/ebtables-ipv4 
     405  SUBMENU:=$(NF_MENU) 
     406  TITLE:=ebtables: IPv4 support 
     407  DEPENDS:= kmod-ebtables 
     408  FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) 
     409  KCONFIG:=$(KCONFIG_EBTABLES_IP4) 
     410  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m))) 
     411endef 
     412 
     413define KernelPackage/ebtables-ipv4/description 
     414 This option adds the IPv4 support to ebtables, which allows basic 
     415 IPv4 header field filtering, ARP filtering as well as SNAT, DNAT targets. 
     416endef 
     417 
     418$(eval $(call KernelPackage,ebtables-ipv4)) 
     419 
     420define KernelPackage/ebtables-ipv6 
     421  SUBMENU:=$(NF_MENU) 
     422  TITLE:=ebtables: IPv6 support 
     423  DEPENDS:= kmod-ebtables 
     424  FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) 
     425  KCONFIG:=$(KCONFIG_EBTABLES_IP6) 
     426  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m))) 
     427endef 
     428 
     429define KernelPackage/ebtables-ipv6/description 
     430 This option adds the IPv6 support to ebtables, which allows basic 
     431 IPv6 header field filtering and target support. 
     432endef 
     433 
     434$(eval $(call KernelPackage,ebtables-ipv6)) 
     435 
     436define KernelPackage/ebtables-watchers 
     437  SUBMENU:=$(NF_MENU) 
     438  TITLE:=ebtables: watchers support 
     439  DEPENDS:= kmod-ebtables 
     440  FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) 
     441  KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) 
     442  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m))) 
     443endef 
     444 
     445define KernelPackage/ebtables-watchers/description 
     446 This option adds the log watchers, that you can use in any rule 
     447 in any ebtables table. 
     448endef 
     449 
     450$(eval $(call KernelPackage,ebtables-watchers)) 
    402451 
    403452define KernelPackage/nfnetlink 
Note: See TracChangeset for help on using the changeset viewer.