onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-15 01:19:29 +02:00
Code Issues Releases Wiki Activity

fixed bug 2712514

Browse Source
This commit is contained in:
Vadim Kurland
2009-03-26 04:07:26 +00:00
parent c18f9a88da
commit f83a49d745
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 791 #define BUILD_NUM 792
doc/ChangeLog
+12
View File
@@ -1,3 +1,15 @@
2009-03-25 vadim <vadim@vk.crocodile.org>
* NATCompiler_pf_writers.cpp (PrintRule::_printPort): fixed bug
#2712514: "Bug in PF NAT Writer - 'tagged' keyword". Keyword
'tagged' is only allowed on the left hand side of '->' in nat
and rdr rules.
* RuleElement.cpp (RuleElementTSrv::validateChild): (change in
libfwbuilder) fixed bug #2712575: "NAT RuleSetView allows
TagService to be in Translated Svc". TagService object should not
be allowed in "Translated Service" in NAT rules.
2009-03-24 vadim <vadim@vk.crocodile.org> 2009-03-24 vadim <vadim@vk.crocodile.org>
* DialogData.cpp (DialogData::loadToWidget): fixed bug #2710309: * DialogData.cpp (DialogData::loadToWidget): fixed bug #2710309:
src/pflib/NATCompiler_pf.h
+2 -1
View File
@@ -343,7 +343,8 @@ namespace fwcompiler {
std::string current_rule_label; std::string current_rule_label;
virtual void _printProtocol(libfwbuilder::Service *srv); virtual void _printProtocol(libfwbuilder::Service *srv);
virtual void _printPort(libfwbuilder::Service *srv,bool print_range_end); virtual void _printPort(libfwbuilder::Service *srv,
bool lhs);
virtual void _printAddrList(libfwbuilder::FWObject *o,bool negflag); virtual void _printAddrList(libfwbuilder::FWObject *o,bool negflag);
virtual void _printREAddr(libfwbuilder::RuleElement *o); virtual void _printREAddr(libfwbuilder::RuleElement *o);
src/pflib/NATCompiler_pf_writers.cpp
+13 -3
View File
@@ -249,7 +249,16 @@ void NATCompiler_pf::PrintRule::_printProtocol(Service *srv)
} }
} }
void NATCompiler_pf::PrintRule::_printPort(Service *srv, bool print_range_end) /*
* print port numbers for the service. For most platforms that inherit
* classes for PF this is sufficient, but PF itself also supports
* TagService and this method prints "tagged" keyword for it as well.
* Arg <lhs> controls which side of the "->" this service is on. On
* the right hand side PF supports shortcut spec 'NNNN:*', but it is
* not allowed on the left hand side. Also keyword "tagged" is only
* allowed on the left hand side of "->".
*/
void NATCompiler_pf::PrintRule::_printPort(Service *srv, bool lhs)
{ {
if (TCPService::isA(srv) || UDPService::isA(srv)) if (TCPService::isA(srv) || UDPService::isA(srv))
{ {
@@ -260,7 +269,7 @@ void NATCompiler_pf::PrintRule::_printPort(Service *srv, bool print_range_end)
compiler->output << "port " << drs; compiler->output << "port " << drs;
if (dre!=0 && dre!=drs) if (dre!=0 && dre!=drs)
{ {
if (print_range_end) if (lhs)
compiler->output << ":" << dre; compiler->output << ":" << dre;
else else
compiler->output << ":*"; compiler->output << ":*";
@@ -268,7 +277,8 @@ void NATCompiler_pf::PrintRule::_printPort(Service *srv, bool print_range_end)
} }
compiler->output << " "; compiler->output << " ";
} }
if (TagService::isA(srv))
if (lhs && TagService::isA(srv))
{ {
compiler->output << "tagged " compiler->output << "tagged "
<< TagService::constcast(srv)->getCode() << " "; << TagService::constcast(srv)->getCode() << " ";