onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-21 02:37:16 +01:00
Code Issues Releases Wiki Activity

fixed #1906 ASA NAT - Address objects are not properly identified by network zone and have the wrong real interface

Browse Source
This commit is contained in:
Vadim Kurland 2011-01-10 17:17:47 -08:00
parent 84a30873d5
commit 5bd095a95c
37 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/ChangeLog
View File

@ -1,5 +1,13 @@
2011-01-10 vadim <vadim@netcitadel.com>
* Helper.cpp (findInterfaceByNetzone): fixed #1906 "ASA NAT -
Address objects are not properly identified by network zone and
have the wrong real interface". The problem should have affected
both "old" (PIX 6 and 7) and "new" (ASA 8.3) configuration. When
an Address object was used in Original Source of a NAT rule,
compiler used wrong interface in the (interfac1,interface2) pair
in "nat" command.
* CompilerDriver_pix_run.cpp (run): fixed #1905 "fwbuilder crash
when compiling a rule with hosts folder as destination". Compiler
issues a warning when an empty group object is used in a rule, but

7
src/cisco_lib/Helper.cpp
View File

@ -198,7 +198,12 @@ int Helper::findInterfaceByAddress(const InetAddr *addr,
int Helper::findInterfaceByNetzone(Address *obj)
{
return findInterfaceByNetzone(obj->getAddressPtr(), obj->getNetmaskPtr());
if (IPv4::isA(obj))
{
InetAddr host_netmask("255.255.255.255");
return findInterfaceByNetzone(obj->getAddressPtr(), &host_netmask);
} else
return findInterfaceByNetzone(obj->getAddressPtr(), obj->getNetmaskPtr());
}
/**

2
test/pix/cluster1-1_pix1.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:37:02 2011 PST by vadim
! Generated Mon Jan 10 17:14:56 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/cluster1-1_pix2.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:37:02 2011 PST by vadim
! Generated Mon Jan 10 17:14:56 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/cluster1_pix1.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:37:01 2011 PST by vadim
! Generated Mon Jan 10 17:14:56 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/cluster1_pix2.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:37:02 2011 PST by vadim
! Generated Mon Jan 10 17:14:56 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/firewall.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:38 2011 PST by vadim
! Generated Mon Jan 10 17:14:33 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall1.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:39 2011 PST by vadim
! Generated Mon Jan 10 17:14:33 2011 PST by vadim
!
! Compiled for pix 6.1
! Outbound ACLs: not supported

2
test/pix/firewall10.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:40 2011 PST by vadim
! Generated Mon Jan 10 17:14:34 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall11.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:40 2011 PST by vadim
! Generated Mon Jan 10 17:14:35 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall12.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:41 2011 PST by vadim
! Generated Mon Jan 10 17:14:35 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall13.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:42 2011 PST by vadim
! Generated Mon Jan 10 17:14:36 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall14.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:42 2011 PST by vadim
! Generated Mon Jan 10 17:14:37 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall2.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:43 2011 PST by vadim
! Generated Mon Jan 10 17:14:37 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall20.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:44 2011 PST by vadim
! Generated Mon Jan 10 17:14:38 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall21-1.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:45 2011 PST by vadim
! Generated Mon Jan 10 17:14:39 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall21.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:44 2011 PST by vadim
! Generated Mon Jan 10 17:14:39 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/firewall22.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:46 2011 PST by vadim
! Generated Mon Jan 10 17:14:40 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/firewall3.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:46 2011 PST by vadim
! Generated Mon Jan 10 17:14:41 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall33.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:47 2011 PST by vadim
! Generated Mon Jan 10 17:14:41 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall34.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:48 2011 PST by vadim
! Generated Mon Jan 10 17:14:42 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall4.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:49 2011 PST by vadim
! Generated Mon Jan 10 17:14:43 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall50.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:49 2011 PST by vadim
! Generated Mon Jan 10 17:14:44 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/firewall6.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:50 2011 PST by vadim
! Generated Mon Jan 10 17:14:44 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall8.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:51 2011 PST by vadim
! Generated Mon Jan 10 17:14:46 2011 PST by vadim
!
! Compiled for pix 6.2
! Outbound ACLs: not supported

2
test/pix/firewall80.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:52 2011 PST by vadim
! Generated Mon Jan 10 17:14:46 2011 PST by vadim
!
! Compiled for pix 8.2
! Outbound ACLs: supported

2
test/pix/firewall81.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:52 2011 PST by vadim
! Generated Mon Jan 10 17:14:47 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/firewall82.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:53 2011 PST by vadim
! Generated Mon Jan 10 17:14:47 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/firewall83.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:54 2011 PST by vadim
! Generated Mon Jan 10 17:14:48 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/firewall9.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:54 2011 PST by vadim
! Generated Mon Jan 10 17:14:49 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

2
test/pix/firewall90.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:55 2011 PST by vadim
! Generated Mon Jan 10 17:14:49 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/firewall91.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:56 2011 PST by vadim
! Generated Mon Jan 10 17:14:50 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/firewall92.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:56 2011 PST by vadim
! Generated Mon Jan 10 17:14:51 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported

2
test/pix/fwsm1.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:57 2011 PST by vadim
! Generated Mon Jan 10 17:14:52 2011 PST by vadim
!
! Compiled for fwsm 2.3
! Outbound ACLs: supported

2
test/pix/fwsm2.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:58 2011 PST by vadim
! Generated Mon Jan 10 17:14:52 2011 PST by vadim
!
! Compiled for fwsm 4.x
! Outbound ACLs: supported

2
test/pix/pix515.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:36:59 2011 PST by vadim
! Generated Mon Jan 10 17:14:53 2011 PST by vadim
!
! Compiled for pix 7.0
! Outbound ACLs: supported

2
test/pix/real.fw.orig
View File

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3426
!
! Generated Mon Jan 10 16:37:00 2011 PST by vadim
! Generated Mon Jan 10 17:14:54 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported