KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewall: fix nat reflection after netifd switch (#11460)

Browse source 
SVN-Revision: 31754
This commit is contained in:
Jo-Philipp Wich 2012-05-16 13:03:54 +00:00
parent eb2fe5e863
commit 82fc13d3c2
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/firewall/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall
PKG_VERSION:=2
PKG_RELEASE:=49
PKG_RELEASE:=50
include $(INCLUDE_DIR)/package.mk

36
package/firewall/files/reflection.hotplug
View file

@ -1,9 +1,38 @@
#!/bin/sh
. /etc/functions.sh
. /usr/share/libubox/jshn.sh
find_iface_address()
{
local iface="$1"
local ipaddr="$2"
local prefix="$3"
local tmp="$(ubus call network.interface."$iface" status 2>/dev/null)"
json_load "${tmp:-{}}"
json_get_type tmp address
if [ "$tmp" = array ]; then
json_select address
json_get_type tmp 1
if [ "$tmp" = object ]; then
json_select 1
[ -n "$ipaddr" ] && json_get_var "$ipaddr" address
[ -n "$prefix" ] && json_get_var "$prefix" mask
fi
fi
}
if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
local wanip=$(uci -P/var/state get network.wan.ipaddr)
local wanip
find_iface_address wan wanip
[ -n "$wanip" ] || return
iptables -t nat -F nat_reflection_in 2>/dev/null || {
iptables -t nat -N nat_reflection_in
@ -60,8 +89,9 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
local net
for net in $(find_networks "$dest"); do
local lanip=$(uci -P/var/state get network.$net.ipaddr)
local lanmk=$(uci -P/var/state get network.$net.netmask)
local lanip lanmk
find_iface_address "$net" lanip lanmk
[ -n "$lanip" ] || return
local proto
config_get proto "$cfg" proto