onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-05-01 22:57:33 +02:00
Code Issues Releases Wiki Activity

refs #1919 Fixed: do not put interface objects inside object-group for TSrc

Browse Source
This commit is contained in:
Vadim Kurland 2011-01-13 10:11:30 -08:00
parent ba66447d7d
commit f684d791c6
36 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cisco_lib/ObjectGroupsSupport.cpp
View File

@ -189,6 +189,9 @@ bool CreateObjectGroups::processNext()
}
re->clearChildren(false); //do not want to destroy children objects
}
} else
{
re->clearChildren(false); //do not want to destroy children objects
}
re->addRef(obj_group);

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:37 2011 PST by vadim
! Generated Thu Jan 13 10:09:34 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.3430
!
! Generated Wed Jan 12 17:40:38 2011 PST by vadim
! Generated Thu Jan 13 10:09:34 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.3430
!
! Generated Wed Jan 12 17:40:37 2011 PST by vadim
! Generated Thu Jan 13 10:09:33 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.3430
!
! Generated Wed Jan 12 17:40:37 2011 PST by vadim
! Generated Thu Jan 13 10:09:33 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.3430
!
! Generated Wed Jan 12 17:40:04 2011 PST by vadim
! Generated Thu Jan 13 10:09:09 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.3430
!
! Generated Wed Jan 12 17:40:05 2011 PST by vadim
! Generated Thu Jan 13 10:09:10 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.3430
!
! Generated Wed Jan 12 17:40:06 2011 PST by vadim
! Generated Thu Jan 13 10:09:11 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.3430
!
! Generated Wed Jan 12 17:40:07 2011 PST by vadim
! Generated Thu Jan 13 10:09:11 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.3430
!
! Generated Wed Jan 12 17:40:08 2011 PST by vadim
! Generated Thu Jan 13 10:09:12 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.3430
!
! Generated Wed Jan 12 17:40:09 2011 PST by vadim
! Generated Thu Jan 13 10:09:13 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.3430
!
! Generated Wed Jan 12 17:40:10 2011 PST by vadim
! Generated Thu Jan 13 10:09:13 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.3430
!
! Generated Wed Jan 12 17:40:11 2011 PST by vadim
! Generated Thu Jan 13 10:09:14 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.3430
!
! Generated Wed Jan 12 17:40:12 2011 PST by vadim
! Generated Thu Jan 13 10:09:15 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.3430
!
! Generated Wed Jan 12 17:40:14 2011 PST by vadim
! Generated Thu Jan 13 10:09:16 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.3430
!
! Generated Wed Jan 12 17:40:13 2011 PST by vadim
! Generated Thu Jan 13 10:09:15 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.3430
!
! Generated Wed Jan 12 17:40:15 2011 PST by vadim
! Generated Thu Jan 13 10:09:17 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.3430
!
! Generated Wed Jan 12 17:40:16 2011 PST by vadim
! Generated Thu Jan 13 10:09:17 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.3430
!
! Generated Wed Jan 12 17:40:17 2011 PST by vadim
! Generated Thu Jan 13 10:09:18 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.3430
!
! Generated Wed Jan 12 17:40:18 2011 PST by vadim
! Generated Thu Jan 13 10:09:19 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.3430
!
! Generated Wed Jan 12 17:40:19 2011 PST by vadim
! Generated Thu Jan 13 10:09:20 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.3430
!
! Generated Wed Jan 12 17:40:20 2011 PST by vadim
! Generated Thu Jan 13 10:09:21 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.3430
!
! Generated Wed Jan 12 17:40:21 2011 PST by vadim
! Generated Thu Jan 13 10:09:21 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.3430
!
! Generated Wed Jan 12 17:40:22 2011 PST by vadim
! Generated Thu Jan 13 10:09:23 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.3430
!
! Generated Wed Jan 12 17:40:23 2011 PST by vadim
! Generated Thu Jan 13 10:09:23 2011 PST by vadim
!
! Compiled for pix 8.2
! Outbound ACLs: supported

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:24 2011 PST by vadim
! Generated Thu Jan 13 10:09:24 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported
@ -142,6 +142,7 @@ quit
object network hostA:eth0
host 192.168.1.10
quit
!
! Rule 0 (NAT)
nat (outside,inside) source static any any destination static interface hostA:eth0 service http http

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:25 2011 PST by vadim
! Generated Thu Jan 13 10:09:25 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported
@ -142,6 +142,7 @@ quit
object network hostA:eth0
host 192.168.1.10
quit
!
! Rule 0 (NAT)
nat (outside,inside) source static any any destination static interface hostA:eth0 service http http

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:26 2011 PST by vadim
! Generated Thu Jan 13 00:02:09 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.3430
!
! Generated Wed Jan 12 17:40:27 2011 PST by vadim
! Generated Thu Jan 13 10:09:26 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:28 2011 PST by vadim
! Generated Thu Jan 13 10:09:26 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported
@ -130,9 +130,6 @@ quit
object service smtp
service tcp destination eq 25
quit
object network firewall90:FastEthernet1:ip-1
host 22.22.22.23
quit
object network internal_subnet_1
subnet 192.168.1.0 255.255.255.192
quit
@ -152,6 +149,10 @@ object service squid
service tcp destination eq 3128
quit
object network firewall90:FastEthernet1:ip-1
host 22.22.22.23
quit
object-group network outside.id130599X29063.tsrc.net.0
network-object host 22.22.22.21
network-object host 22.22.22.22
@ -173,14 +174,12 @@ object-group network outside.id241772X29764.tsrc.net.0
object-group network outside.id21121X3710.tsrc.net.0
network-object host 22.22.22.22
network-object host 22.22.22.30
network-object host 22.22.22.100
exit
object-group network outside.id21177X3720.tsrc.net.0
network-object host 22.22.22.22
network-object 22.22.22.128 255.255.255.224
exit
@ -246,12 +245,12 @@ nat (inside,outside) source dynamic hostA:eth0 outside_range
! for #1908 "static" vs "dynamic"
! for #1885 "named object" - create
! network object to define address range, then add it to object-group
nat (inside,outside) source dynamic hostA:eth0 outside.id21121X3710.tsrc.net.0
nat (inside,outside) source dynamic hostA:eth0 outside.id21121X3710.tsrc.net.0 interface
!
! Rule 15 (NAT)
! for #1908, #1916
! "static" vs "dynamic"
nat (inside,outside) source dynamic hostA:eth0 outside.id21177X3720.tsrc.net.0
nat (inside,outside) source dynamic hostA:eth0 outside.id21177X3720.tsrc.net.0 interface
!
! Rule 16 (NAT)
! for #1908

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:29 2011 PST by vadim
! Generated Thu Jan 13 10:09:27 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported
@ -121,6 +121,7 @@ quit
object service https
service tcp destination eq 443
quit
!
! Rule 0 (NAT)
nat (outside,inside) source static any any destination static interface hostA:eth0

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:30 2011 PST by vadim
! Generated Thu Jan 13 10:09:28 2011 PST by vadim
!
! Compiled for pix 8.3
! Outbound ACLs: supported
@ -129,6 +129,7 @@ quit
object network test_range_1
range 192.168.1.11 192.168.1.15
quit
!
! Rule 0 (NAT)
nat (inside,outside) source static Internal_net Internal_net service http http

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

@ -3,7 +3,7 @@
!
! Firewall Builder fwb_pix v4.2.0.3430
!
! Generated Wed Jan 12 17:40:31 2011 PST by vadim
! Generated Thu Jan 13 10:09:29 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.3430
!
! Generated Wed Jan 12 17:40:32 2011 PST by vadim
! Generated Thu Jan 13 10:09:30 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.3430
!
! Generated Wed Jan 12 17:40:34 2011 PST by vadim
! Generated Thu Jan 13 10:09:31 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.3430
!
! Generated Wed Jan 12 17:40:35 2011 PST by vadim
! Generated Thu Jan 13 10:09:31 2011 PST by vadim
!
! Compiled for pix 6.3
! Outbound ACLs: not supported