onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 19:27:13 +01:00
Code Issues Releases Wiki Activity

* Importer.cpp (Importer::getUDPService): fixed sourceforge bug

Browse Source 
3012953 name of UDP and TCP objects created during import should
follow the same pattern and not include "0-0" for the source ports
if they are equal to zero.
This commit is contained in:
Vadim Kurland 2010-06-08 19:49:47 +00:00
parent 89128241ed
commit 71f893b213
5 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2963
#define BUILD_NUM 2964

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2010-06-08 Vadim Kurland <vadim@vk.crocodile.org>
* Importer.cpp (Importer::getUDPService): fixed sourceforge bug
3012953 name of UDP and TCP objects created during import should
follow the same pattern and not include "0-0" for the source ports
if they are equal to zero.
* IPTImporter.cpp (IPTImporter::IPTImporter): fixed #1511, SF bug 3012953:
iptables import parse error icmp_type any

8
src/gui/Importer.cpp
View File

@ -716,10 +716,12 @@ FWObject* Importer::getUDPService(int srs, int sre, int drs, int dre)
<< srs << "-" << sre << ":" << drs << "-" << dre;
std::ostringstream nstr;
nstr << "udp "
<< srs << "-" << sre << ":" << drs << "-" << dre;
nstr << "udp " ;
if (srs!=0 || sre!=0) nstr << srs << "-" << sre << ":";
if (drs!=0 || dre!=0) nstr << drs << "-" << dre;
UDPService* s = UDPService::cast(createObject(UDPService::TYPENAME, nstr.str()));
UDPService* s = UDPService::cast(
createObject(UDPService::TYPENAME, nstr.str()));
s->setSrcRangeStart(srs);
s->setSrcRangeEnd(sre);
s->setDstRangeStart(drs);

12
src/gui/unit_tests/ImporterTest/test_data/ios.result
View File

@ -31,7 +31,7 @@ Ruleset: fe0_0_acl_out
Ruleset: outside
Rule comment: / / path1/path2/path3
Rule comment: access list comment
UDP Service object: udp 0-0:500-500
UDP Service object: udp 500-500
TCP Service object: tcp 80-80:
TCP Service object: tcp 80-80: est
TCP Service object: tcp 1023-65535:
@ -40,8 +40,8 @@ TCP Service object: tcp 80-80
TCP Service object: tcp 22-80
TCP Service object: tcp 2967-2967
TCP Service object: tcp 2967-2967:
UDP Service object: udp 0-0:2967-2967
UDP Service object: udp 2967-2967:0-0
UDP Service object: udp 2967-2967
UDP Service object: udp 2967-2967:
IP Service object: ip-51
IP Service object: ip-50
ICMP Service object: icmp -1/-1
@ -49,9 +49,9 @@ ICMP Service object: icmp 8/0
ICMP Service object: icmp 3/-1
ICMP Service object: icmp 3/1
ICMP Service object: icmp 3/14
UDP Service object: udp 0-0:68-68
UDP Service object: udp 0-0:67-67
UDP Service object: udp 53-53:0-0
UDP Service object: udp 68-68
UDP Service object: udp 67-67
UDP Service object: udp 53-53:
Network object: net-10.10.10.0/255.255.255.0
Ruleset: tmp_acl
Ruleset: acl_133

10
src/gui/unit_tests/ImporterTest/test_data/ipt.result
View File

@ -7,12 +7,12 @@ TCP Service object: tcp 22-22:
Custom Service object: cust-0-tcp: iptables: -m state --state RELATED,ESTABLISHED
Using automatic rule controlled by option 'Drop packet that do not match any known connection' to match state INVALID
Interface: lo
UDP Service object: udp 0-0:1604-1604
UDP Service object: udp 1604-1604
Interface: eth1
Interface: eth0
Creating branch ruleset 'Policy_eth1' to match inbound and outbound interfaces -i eth0 -o eth1
TCP Service object: tcp 0-8000
UDP Service object: udp 0-0:0-8000
UDP Service object: udp 0-8000
Network object: net-192.168.0.0/16
Network object: net-128.143.0.0/16
ICMP Service object: icmp -1/-1
@ -29,8 +29,8 @@ Address object: h-192.0.34.166
TCP Service object: tcp 137-139
TCP Service object: tcp 0-1023
TCP Service object: tcp 6000-65535
UDP Service object: udp 0-0:137-137
UDP Service object: udp 0-0:138-138
UDP Service object: udp 137-137
UDP Service object: udp 138-138
TCP Service object: tcp 139-139
TCP Service object: tcp 445-445
TCP Service object: tcp 80-80
@ -50,7 +50,7 @@ Parser error: Port spec 'foo' unknown. Error basic_ios::clear
Parser error: Port spec 'foo' unknown. Error basic_ios::clear
TCP Service object: tcp
TCP Service object: tcp 427-427
UDP Service object: udp 0-0:427-427
UDP Service object: udp 427-427
TCP Service object: tcp 548-548
TCP Service object: tcp 201-201
TCP Service object: tcp 202-202