brielle
/
SRFirewall
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bug fix NAT rule variable not being reset

master 2.1p2
Brie Bruns 2020-02-27 18:26:30 -07:00
parent 11003d6b04
commit cba6893c41
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -1,3 +1,6 @@
2.1p2 - 02/27/2020
- Fix issue with NAT variable not being reset after being changed
2.1p1 - 01/01/2020 2.1p1 - 01/01/2020
- Refactor NETMAP NAT target so its more flexible. See new example nat.conf file for details - Refactor NETMAP NAT target so its more flexible. See new example nat.conf file for details

2
bin/srfirewall
View File

@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Static config options, normally do not need to change # Static config options, normally do not need to change
FW_VERSION="2.1p1" FW_VERSION="2.1p2"
# Important directory locations # Important directory locations
FWPREFIX="/usr/local" FWPREFIX="/usr/local"

2
lib/iptables.inc
View File

@ -459,7 +459,9 @@ function enable_nat {
if [ -e "${FWCONFIGDIR}/ipv${IPVER}/nat.conf" ]; then if [ -e "${FWCONFIGDIR}/ipv${IPVER}/nat.conf" ]; then
${debug} ${DebugColor} "${FUNCNAME}:${DEFAULT_COLOR} read ${FWCONFIGDIR}/ipv${IPVER}/nat.conf successful" ${debug} ${DebugColor} "${FUNCNAME}:${DEFAULT_COLOR} read ${FWCONFIGDIR}/ipv${IPVER}/nat.conf successful"
ORIG_NAT=${NAT}
while read -r type srcinterface srcaddress dstinterface dstaddress custom; do while read -r type srcinterface srcaddress dstinterface dstaddress custom; do
NAT=${ORIG_NAT}
[[ ${type} = \#* ]] && continue [[ ${type} = \#* ]] && continue
[[ ${type} = "" ]] && continue [[ ${type} = "" ]] && continue
([[ ${type} != "SNAT" ]] && [[ ${type} != "MASQ" ]] && [[ ${type} != "NETMAP" ]] && [[ ${type} != "ACCEPT" ]]) \ ([[ ${type} != "SNAT" ]] && [[ ${type} != "MASQ" ]] && [[ ${type} != "NETMAP" ]] && [[ ${type} != "ACCEPT" ]]) \

10
release.json
View File

@ -1,7 +1,7 @@
{ {
"version": "2.1a1", "version": "2.1p2",
"state": "alpha", "state": "stable",
"scope": "major changes", "scope": "minor fixes",
"changes": "Added new custom options for rules in nat, filters, and forwarding (mostly useful with ipsec policy), some code cleanups, changing default rules.", "changes": "See CHANGELOG",
"download": "https://source.sosdg.org/brielle/srfirewall/repository/archive.tar.bz2?ref=v2.1a1" "download": "https://source.sosdg.org/brielle/srfirewall/repository/archive.tar.bz2?ref=v2.1p2"
} }