From ba53471109641d735aaee426e4dd39accc6d02ac Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 1 Mar 2011 18:04:14 +0000 Subject: [PATCH] [package] firewall: fix rule generation for v4 or v6 only zones (#8955) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25813 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/firewall/Makefile | 4 ++-- package/firewall/files/lib/core_interface.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 4a8a5d319..3d61e0988 100644 --- a/package/firewall/Makefile +++ b/package/firewall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2010 OpenWrt.org +# Copyright (C) 2008-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=firewall PKG_VERSION:=2 -PKG_RELEASE:=21 +PKG_RELEASE:=22 include $(INCLUDE_DIR)/package.mk diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh index f08975952..aff664180 100644 --- a/package/firewall/files/lib/core_interface.sh +++ b/package/firewall/files/lib/core_interface.sh @@ -70,6 +70,9 @@ fw_configure_interface() { # Need v4 while zone is v6 */*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;; + + # Strip prefix + *) mode="${mode#G}" ;; esac lock /var/run/firewall-interface.lock -- 2.20.1