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

* AttachedNetworks.cpp (AttachedNetworks): see #1580 New object

Browse Source 
type: network object that automatically matches subnets an
interface is attached to. The object can be a child of an
interface. The object is optional and is not created automatically
for all interfaces; user can add it using context menu associated
with an interface. Dialog for this object allows editing of the
name and comment. List of network addresses represented by this
object is always generated automatically. Compiler for PF
translates this object to "en0:network" construct that is
supported by PF. Compiler for iptables expands it to the list of
ipv4 and ipv6 networks defined by the addresses of the parent
interface if interface has static addresses. If interface is
confgiured as "dynamic" and has no address in fwbuilder, then
compiler treats AttachedNetworks object as run-time and uses shell
function to determine network addresses during activation of the
firewall script. Compilers for other firewall platforms always
treat this object as compile-time and abort if it is used with
dynamic interface.
This commit is contained in:
Vadim Kurland
2011-05-14 14:44:00 -07:00
parent 6f9add86c3
commit f0dc79359e
40 changed files with 865 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/ChangeLog
+21
View File
@@ -1,3 +1,24 @@
2011-05-14 vadim <vadim@netcitadel.com>
* AttachedNetworks.cpp (AttachedNetworks): see #1580 New object
type: network object that automatically matches subnets an
interface is attached to. The object can be a child of an
interface. The object is optional and is not created automatically
for all interfaces; user can add it using context menu associated
with an interface. Dialog for this object allows editing of the
name and comment. List of network addresses represented by this
object is always generated automatically. Compiler for PF
translates this object to "en0:network" construct that is
supported by PF. Compiler for iptables expands it to the list of
ipv4 and ipv6 networks defined by the addresses of the parent
interface if interface has static addresses. If interface is
confgiured as "dynamic" and has no address in fwbuilder, then
compiler treats AttachedNetworks object as run-time and uses shell
function to determine network addresses during activation of the
firewall script. Compilers for other firewall platforms always
treat this object as compile-time and abort if it is used with
dynamic interface.
2011-05-13 vadim <vadim@netcitadel.com>
* PolicyCompiler_ipt.cpp (processNext): see #2402 "Tag action
src/iptlib/CompilerDriver_ipt_run.cpp
+2 -2
View File
@@ -44,6 +44,7 @@
#include "PolicyCompiler_ipt.h"
#include "NATCompiler_ipt.h"
#include "RoutingCompiler_ipt.h"
#include "Preprocessor_ipt.h"
#include "OSConfigurator_linux24.h"
#include "OSConfigurator_secuwall.h"
#include "OSConfigurator_ipcop.h"
@@ -52,7 +53,6 @@
#include "Configlet.h"
#include "fwcompiler/Preprocessor.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/FWException.h"
@@ -309,7 +309,7 @@ QString CompilerDriver_ipt::run(const std::string &cluster_id,
if (nat_count || policy_count)
{
Preprocessor* prep = new Preprocessor(
Preprocessor_ipt* prep = new Preprocessor_ipt(
objdb , fw, ipv6_policy);
prep->setSingleRuleCompileMode(single_rule_id);
if (inTestMode()) prep->setTestMode();
src/iptlib/OSConfigurator_linux24_interfaces.cpp
+19 -8
View File
@@ -502,15 +502,26 @@ string OSConfigurator_linux24::printDynamicAddressesConfigurationCommands()
if (iface->getName().find("*")==string::npos)
{
out << "getaddr "
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, false)
<< endl;
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, false)
<< endl;
out << "getaddr6 "
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, true)
<< endl;
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, true)
<< endl;
out << "getnet "
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, false) << "_network"
<< endl;
out << "getnet6 "
<< iface->getName()
<< " "
<< getInterfaceVarName(iface, true) << "_network"
<< endl;
}
}
}
src/iptlib/PolicyCompiler_PrintRule.cpp
+9
View File
@@ -38,6 +38,7 @@
#include "fwbuilder/Network.h"
#include "fwbuilder/DNSName.h"
#include "fwbuilder/AddressRange.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/RuleElement.h"
@@ -1246,6 +1247,14 @@ string PolicyCompiler_ipt::PrintRule::_printAddr(Address *o)
{
return atrt->getSourceName();
}
if (atrt->getSubstitutionTypeName()==AttachedNetworks::TYPENAME)
{
ostr << "$i_" << atrt->getSourceName() << "_network";
return ostr.str();
}
// at this time we only support two types of MultiAddress
// objects: AddressTable and DNSName. Both should be converted
// to MultiAddressRunTime at this point. If we get some other
src/iptlib/PolicyCompiler_ipt.cpp
+4
View File
@@ -4588,6 +4588,8 @@ string PolicyCompiler_ipt::debugPrintRule(Rule *r)
src << o->getName();
if (Group::cast(o)!=NULL)
src << "[" << o->size() << "]";
if ( MultiAddress::cast(o)!=NULL)
src << string((MultiAddress::cast(o)->isRunTime()) ? "(r)" : "(c)");
}
if (i2!=dstrel->end())
@@ -4596,6 +4598,8 @@ string PolicyCompiler_ipt::debugPrintRule(Rule *r)
dst << o->getName();
if (Group::cast(o)!=NULL)
dst << "[" << o->size() << "]";
if ( MultiAddress::cast(o)!=NULL)
dst << string((MultiAddress::cast(o)->isRunTime()) ? "(r)" : "(c)");
}
if (i3!=srvrel->end())
src/iptlib/Preprocessor_ipt.cpp
+50
View File
@@ -0,0 +1,50 @@
/*
Firewall Builder
Copyright (C) 2011 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "Preprocessor_ipt.h"
#include "fwbuilder/Interface.h"
#include "fwbuilder/AttachedNetworks.h"
using namespace libfwbuilder;
using namespace fwcompiler;
using namespace std;
void Preprocessor_ipt::convertObject(FWObject *obj)
{
if ( AttachedNetworks::isA(obj))
{
AttachedNetworks *att = AttachedNetworks::cast(obj);
Interface *intf = Interface::cast(att->getParent());
if (intf->isRegular())
{
att->setCompileTime(true);
att->loadFromSource(ipv6, inTestMode());
} else att->setRunTime(true);
} else
Preprocessor::convertObject(obj);
}
src/iptlib/Preprocessor_ipt.h
+54
View File
@@ -0,0 +1,54 @@
/*
Firewall Builder
Copyright (C) 2011 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __PREPROCESSOR_IPT_HH
#define __PREPROCESSOR_IPT_HH
#include <fwbuilder/libfwbuilder-config.h>
#include "fwcompiler/Preprocessor.h"
namespace libfwbuilder {
class FWObjectDatabase;
};
namespace fwcompiler {
class Preprocessor_ipt : public Preprocessor {
public:
Preprocessor_ipt(libfwbuilder::FWObjectDatabase *_db,
libfwbuilder::Firewall *fw,
bool ipv6_policy) :
Preprocessor(_db, fw, ipv6_policy)
{ }
virtual void convertObject(libfwbuilder::FWObject *obj);
};
}
#endif
src/iptlib/iptlib.pro
+2
View File
@@ -27,6 +27,7 @@ SOURCES = CompilerDriver_ipt.cpp \
PolicyCompiler_secuwall.cpp \
RoutingCompiler_ipt.cpp \
RoutingCompiler_ipt_writers.cpp \
Preprocessor_ipt.cpp \
combinedAddress.cpp \
AutomaticRules_ipt.cpp \
utils.cpp
@@ -42,6 +43,7 @@ HEADERS = ../../config.h \
PolicyCompiler_ipt.h \
PolicyCompiler_secuwall.h \
RoutingCompiler_ipt.h \
Preprocessor_ipt.h \
combinedAddress.h \
AutomaticRules_ipt.h \
utils.h
src/libfwbuilder/etc/fwbuilder.dtd
+7 -3
View File
@@ -85,7 +85,7 @@
>
<!ELEMENT Library
((AnyNetwork|AnyIPService|AnyInterval|ObjectGroup|StateSyncClusterGroup|FailoverClusterGroup|Host|Firewall|Cluster|Network|NetworkIPv6|IPv4|IPv6|DNSName|AddressTable|physAddress|AddressRange|ObjectRef|ServiceGroup|IPService|ICMPService|ICMP6Service|TCPService|UDPService|CustomService|ServiceRef|IntervalGroup|Interval|IntervalRef|Interface|Policy|NAT|PolicyRule|NATRule|Library|TagService|UserService)*)>
((AnyNetwork|AnyIPService|AnyInterval|ObjectGroup|StateSyncClusterGroup|FailoverClusterGroup|Host|Firewall|Cluster|Network|NetworkIPv6|AttachedNetworks|IPv4|IPv6|DNSName|AddressTable|physAddress|AddressRange|ObjectRef|ServiceGroup|IPService|ICMPService|ICMP6Service|TCPService|UDPService|CustomService|ServiceRef|IntervalGroup|Interval|IntervalRef|Interface|Policy|NAT|PolicyRule|NATRule|Library|TagService|UserService)*)>
<!ATTLIST Library
%STD_ATTRIBUTES;
color %STRING; #IMPLIED
@@ -355,7 +355,7 @@ Interface can have the following attributes:
- label human-readable label of this interface
-->
<!ELEMENT Interface (IPv4*, IPv6*, physAddress?, InterfaceOptions?, Interface*, FailoverClusterGroup?)>
<!ELEMENT Interface (IPv4*, IPv6*, physAddress?, InterfaceOptions?, Interface*, FailoverClusterGroup?, AttachedNetworks?)>
<!ATTLIST Interface
%STD_ATTRIBUTES;
dyn %BOOLEAN; #REQUIRED
@@ -369,7 +369,6 @@ Interface can have the following attributes:
label %STRING; #IMPLIED
>
<!-- Remote management information for Firewall, Host, Gateway -->
<!ELEMENT Management (SNMPManagement? , FWBDManagement?, PolicyInstallScript?)>
<!ATTLIST Management
@@ -431,6 +430,11 @@ Interface can have the following attributes:
netmask %NETMASK; #REQUIRED
>
<!ELEMENT AttachedNetworks EMPTY>
<!ATTLIST AttachedNetworks
%STD_ATTRIBUTES;
>
<!ELEMENT AddressRange EMPTY>
<!ATTLIST AddressRange
%STD_ATTRIBUTES;
src/libfwbuilder/etc/fwbuilder.dtd.in
+7 -3
View File
@@ -85,7 +85,7 @@
>
<!ELEMENT Library
((AnyNetwork|AnyIPService|AnyInterval|ObjectGroup|StateSyncClusterGroup|FailoverClusterGroup|Host|Firewall|Cluster|Network|NetworkIPv6|IPv4|IPv6|DNSName|AddressTable|physAddress|AddressRange|ObjectRef|ServiceGroup|IPService|ICMPService|ICMP6Service|TCPService|UDPService|CustomService|ServiceRef|IntervalGroup|Interval|IntervalRef|Interface|Policy|NAT|PolicyRule|NATRule|Library|TagService|UserService)*)>
((AnyNetwork|AnyIPService|AnyInterval|ObjectGroup|StateSyncClusterGroup|FailoverClusterGroup|Host|Firewall|Cluster|Network|NetworkIPv6|AttachedNetworks|IPv4|IPv6|DNSName|AddressTable|physAddress|AddressRange|ObjectRef|ServiceGroup|IPService|ICMPService|ICMP6Service|TCPService|UDPService|CustomService|ServiceRef|IntervalGroup|Interval|IntervalRef|Interface|Policy|NAT|PolicyRule|NATRule|Library|TagService|UserService)*)>
<!ATTLIST Library
%STD_ATTRIBUTES;
color %STRING; #IMPLIED
@@ -355,7 +355,7 @@ Interface can have the following attributes:
- label human-readable label of this interface
-->
<!ELEMENT Interface (IPv4*, IPv6*, physAddress?, InterfaceOptions?, Interface*, FailoverClusterGroup?)>
<!ELEMENT Interface (IPv4*, IPv6*, physAddress?, InterfaceOptions?, Interface*, FailoverClusterGroup?, AttachedNetworks?)>
<!ATTLIST Interface
%STD_ATTRIBUTES;
dyn %BOOLEAN; #REQUIRED
@@ -369,7 +369,6 @@ Interface can have the following attributes:
label %STRING; #IMPLIED
>
<!-- Remote management information for Firewall, Host, Gateway -->
<!ELEMENT Management (SNMPManagement? , FWBDManagement?, PolicyInstallScript?)>
<!ATTLIST Management
@@ -431,6 +430,11 @@ Interface can have the following attributes:
netmask %NETMASK; #REQUIRED
>
<!ELEMENT AttachedNetworks EMPTY>
<!ATTLIST AttachedNetworks
%STD_ATTRIBUTES;
>
<!ELEMENT AddressRange EMPTY>
<!ATTLIST AddressRange
%STD_ATTRIBUTES;
src/libfwbuilder/src/fwbuilder/FWObject.cpp
+3 -1
View File
@@ -96,7 +96,7 @@ void FWObject::fromXML(xmlNodePtr root) throw(FWException)
FREEXMLBUFF(n);
}
ref_counter = 0;
// ref_counter = 0;
FWObjectDatabase *dbr = getRoot();
for (xmlNodePtr cur=root->xmlChildrenNode; cur; cur=cur->next)
@@ -108,6 +108,7 @@ void FWObject::fromXML(xmlNodePtr root) throw(FWException)
{
/* Add w/o validation. Trust XML to do that */
add(o, false);
try
{
o->fromXML(cur);
@@ -408,6 +409,7 @@ FWObject* FWObject::addCopyOf(const FWObject *x, bool preserve_id)
if(!o1)
throw FWException(string("Error creating object with type: ")+
x->getTypeName());
// This adds with validation
add(o1);
src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
+1
View File
@@ -40,6 +40,7 @@
#include <fwbuilder/FWObject.h>
#include <fwbuilder/FWObjectDatabase.h>
#include <fwbuilder/AttachedNetworks.h>
#include <fwbuilder/Library.h>
#include <fwbuilder/Interval.h>
#include <fwbuilder/ICMPService.h>
src/libfwbuilder/src/fwbuilder/FWObjectDatabase.h
+3
View File
@@ -56,6 +56,7 @@ namespace libfwbuilder
// forward declarations for specialized create() methods
class AddressRange;
class AddressTable;
class AttachedNetworks;
class Cluster;
class StateSyncClusterGroup;
class FailoverClusterGroup;
@@ -123,6 +124,7 @@ namespace libfwbuilder
DECLARE_CREATE_OBJ_METHOD(AddressRange);
DECLARE_CREATE_OBJ_METHOD(AddressTable);
DECLARE_CREATE_OBJ_METHOD(AttachedNetworks);
DECLARE_CREATE_OBJ_METHOD(Cluster);
DECLARE_CREATE_OBJ_METHOD(StateSyncClusterGroup);
DECLARE_CREATE_OBJ_METHOD(FailoverClusterGroup);
@@ -474,6 +476,7 @@ public:
DECLARE_CREATE_OBJ_CLASS_METHOD(AddressRange);
DECLARE_CREATE_OBJ_CLASS_METHOD(AddressTable);
DECLARE_CREATE_OBJ_CLASS_METHOD(AttachedNetworks);
DECLARE_CREATE_OBJ_CLASS_METHOD(Cluster);
DECLARE_CREATE_OBJ_CLASS_METHOD(StateSyncClusterGroup);
DECLARE_CREATE_OBJ_CLASS_METHOD(FailoverClusterGroup);
src/libfwbuilder/src/fwbuilder/FWObjectDatabase_create_object.cpp
+5
View File
@@ -54,6 +54,7 @@
#include <fwbuilder/StateSyncClusterGroup.h>
#include <fwbuilder/FailoverClusterGroup.h>
#include <fwbuilder/AttachedNetworks.h>
#include <fwbuilder/Group.h>
#include <fwbuilder/Host.h>
#include <fwbuilder/ICMP6Service.h>
@@ -127,6 +128,8 @@ void FWObjectDatabase::init_create_methods_table()
registerObjectType("AddressTable",
&create_AddressTable);
registerObjectType("AttachedNetworks",
&create_AttachedNetworks);
registerObjectType("Cluster",
&create_Cluster);
registerObjectType("StateSyncClusterGroup",
@@ -302,6 +305,7 @@ FWObject *FWObjectDatabase::create(const string &type_name, int id, bool init)
}
FWObject *nobj = (*fn)(id);
addToIndex(nobj);
if (init) nobj->init(this);
return nobj;
@@ -331,6 +335,7 @@ FWObject *FWObjectDatabase::createFromXML(xmlNodePtr data)
CREATE_OBJ_METHOD(AddressRange);
CREATE_OBJ_METHOD(AddressTable);
CREATE_OBJ_METHOD(AttachedNetworks);
CREATE_OBJ_METHOD(Cluster);
CREATE_OBJ_METHOD(StateSyncClusterGroup);
CREATE_OBJ_METHOD(FailoverClusterGroup);
src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
+4 -2
View File
@@ -222,9 +222,10 @@ void FWObjectTreeScanner::scanAndAdd(FWObject *dst,FWObject *source)
}
}
}
}
//#define DEBUG_MERGE 1
// #define DEBUG_MERGE 1
void FWObjectTreeScanner::merge(FWObject *dst, FWObject *src)
{
@@ -293,7 +294,7 @@ void FWObjectTreeScanner::merge(FWObject *dst, FWObject *src)
if (dobj==NULL)
{
sobj = *i;
FWObject *o1=treeRoot->create( sobj->getTypeName());
FWObject *o1 = treeRoot->create( sobj->getTypeName());
FWObject *pdst = dstMap[ src->getId() ];
assert(pdst!=NULL);
@@ -313,6 +314,7 @@ void FWObjectTreeScanner::merge(FWObject *dst, FWObject *src)
o1->duplicate( sobj, false); // copy IDs as well
#ifdef DEBUG_MERGE
cerr << "duplicate #1 done" << endl;
#endif
src/libfwbuilder/src/fwbuilder/Firewall.cpp
+10 -43
View File
@@ -227,52 +227,16 @@ void Firewall::duplicateInterfaces(FWObject *target, const FWObject *source,
for (FWObjectTypedChildIterator m = source->findByType(Interface::TYPENAME);
m!=m.end(); ++m )
{
FWObject *src_interface = *m;
FWObject *dst_interface_copy = target->addCopyOf(src_interface, preserve_id);
FWObject *src_interface = *m;
FWObject *dst_interface_copy =
target->addCopyOf(src_interface, preserve_id);
id_mapping[src_interface->getId()] = dst_interface_copy->getId();
dst_interface_copy->destroyChildren();
for (FWObjectTypedChildIterator k=src_interface->findByType(IPv4::TYPENAME);
k!=k.end(); ++k )
{
FWObject *src_obj = *k;
FWObject *dst_obj_copy= dst_interface_copy->addCopyOf(src_obj,preserve_id);
if (src_obj!=NULL && dst_obj_copy!=NULL)
id_mapping[src_obj->getId()] = dst_obj_copy->getId();
}
for (FWObjectTypedChildIterator k=src_interface->findByType(IPv6::TYPENAME);
k!=k.end(); ++k )
{
FWObject *src_obj = *k;
FWObject *dst_obj_copy= dst_interface_copy->addCopyOf(src_obj,preserve_id);
if (src_obj!=NULL && dst_obj_copy!=NULL)
id_mapping[src_obj->getId()] = dst_obj_copy->getId();
}
for (FWObjectTypedChildIterator k = src_interface->findByType(physAddress::TYPENAME);
k!=k.end(); ++k )
{
FWObject *src_obj = *k;
FWObject *dst_obj_copy= dst_interface_copy->addCopyOf(src_obj,preserve_id);
if (src_obj!=NULL && dst_obj_copy!=NULL)
id_mapping[src_obj->getId()] = dst_obj_copy->getId();
}
for (FWObjectTypedChildIterator k = src_interface->findByType(InterfaceOptions::TYPENAME);
k!=k.end(); ++k )
{
FWObject *src_obj = *k;
FWObject *dst_obj_copy= dst_interface_copy->addCopyOf(src_obj,preserve_id);
if (src_obj!=NULL && dst_obj_copy!=NULL)
id_mapping[src_obj->getId()] = dst_obj_copy->getId();
}
Interface::cast(dst_interface_copy)->duplicateWithIdMapping(
src_interface, id_mapping, preserve_id);
#if 0
if (Firewall::cast(target))
{
/*
@@ -288,7 +252,8 @@ void Firewall::duplicateInterfaces(FWObject *target, const FWObject *source,
k!=k.end(); ++k )
{
FWObject *src_subinterface = *k;
FWObject *dst_subinterface_copy = dst_interface_copy->addCopyOf(src_subinterface, preserve_id);
FWObject *dst_subinterface_copy =
dst_interface_copy->addCopyOf(src_subinterface, preserve_id);
if (src_subinterface!=NULL && dst_subinterface_copy!=NULL)
id_mapping[src_subinterface->getId()] = dst_subinterface_copy->getId();
@@ -297,6 +262,8 @@ void Firewall::duplicateInterfaces(FWObject *target, const FWObject *source,
duplicateInterfaces(dst_interface_copy, src_interface,
id_mapping, preserve_id);
}
#endif
}
}
src/libfwbuilder/src/fwbuilder/Interface.cpp
+28 -4
View File
@@ -6,9 +6,6 @@
Author: Vadim Kurland vadim@fwbuilder.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@@ -34,6 +31,7 @@
#include <fwbuilder/XMLTools.h>
#include <fwbuilder/IPv4.h>
#include <fwbuilder/IPv6.h>
#include <fwbuilder/AttachedNetworks.h>
#include <fwbuilder/FWObjectDatabase.h>
#include <fwbuilder/Resources.h>
@@ -118,6 +116,28 @@ FWObject& Interface::duplicate(const FWObject *x, bool preserve_id)
return *this;
}
void Interface::duplicateWithIdMapping(const FWObject *src,
map<int,int> &id_mapping, bool preserve_id)
{
assert(src->getTypeName() == Interface::TYPENAME);
checkReadOnly();
shallowDuplicate(src, preserve_id);
destroyChildren();
for(list<FWObject*>::const_iterator m=src->begin(); m!=src->end(); ++m)
{
FWObject *src_obj = *m;
FWObject *dst_obj_copy = addCopyOf(src_obj, preserve_id);
if (src_obj!=NULL && dst_obj_copy!=NULL)
id_mapping[src_obj->getId()] = dst_obj_copy->getId();
}
setDirty(true);
}
bool Interface::cmp(const FWObject *obj, bool recursive) throw(FWException)
{
const Interface *rx = Interface::constcast(obj);
@@ -247,6 +267,9 @@ xmlNodePtr Interface::toXML(xmlNodePtr parent) throw(FWException)
o = getFirstByType(FailoverClusterGroup::TYPENAME);
if (o) o->toXML(me);
o = getFirstByType(AttachedNetworks::TYPENAME);
if (o) o->toXML(me);
return me;
}
@@ -341,7 +364,8 @@ bool Interface::validateChild(FWObject *o)
otype==IPv6::TYPENAME ||
otype==physAddress::TYPENAME ||
otype==InterfaceOptions::TYPENAME ||
otype==FailoverClusterGroup::TYPENAME);
otype==FailoverClusterGroup::TYPENAME ||
otype==AttachedNetworks::TYPENAME);
}
/*
src/libfwbuilder/src/fwbuilder/Interface.h
+6 -4
View File
@@ -195,13 +195,15 @@ public:
virtual FWObject& shallowDuplicate(const FWObject *obj,
bool preserve_id = true)
throw(FWException);
bool preserve_id = true) throw(FWException);
virtual FWObject& duplicate(const FWObject *obj,
bool preserve_id = true)
throw(FWException);
bool preserve_id = true) throw(FWException);
virtual bool cmp(const FWObject *obj, bool recursive=false) throw(FWException);
void duplicateWithIdMapping(const FWObject *src,
std::map<int,int> &id_mapping, bool preserve_id);
const std::string &getLabel() const;
void setLabel(const std::string& n);
src/libfwbuilder/src/fwbuilder/MultiAddress.h
+8 -2
View File
@@ -54,8 +54,14 @@ class MultiAddress : public ObjectGroup
virtual void setSourceName(const std::string& source_name);
virtual void loadFromSource(bool ipv6, bool test_mode=false) throw(FWException);
bool isCompileTime() const;
bool isRunTime() const;
/*
* functions isCompileTime() and isRunTime() are virtual because
* some multi-address objects allow the user to set these flags,
* while other object types behave as run-time or compile-time
* depending on attributes of other objects (e.g. AttachedNetworks)
*/
virtual bool isCompileTime() const;
virtual bool isRunTime() const;
void setCompileTime(const bool b);
void setRunTime(const bool b);
src/libfwbuilder/src/fwbuilder/fwbuilder.pro
+2
View File
@@ -50,6 +50,7 @@ SOURCES = InetAddr.cpp \
NAT.cpp \
Network.cpp \
NetworkIPv6.cpp \
AttachedNetworks.cpp \
ObjectGroup.cpp \
physAddress.cpp \
DNSName.cpp\
@@ -124,6 +125,7 @@ HEADERS = inet_net.h \
NAT.h \
Network.h \
NetworkIPv6.h \
AttachedNetworks.h \
ObjectGroup.h \
physAddress.h \
DNSName.h\
src/libfwbuilder/src/fwcompiler/Compiler.cpp
+1 -2
View File
@@ -6,8 +6,6 @@
Author: Vadim Kurland vadim@fwbuilder.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@@ -1117,6 +1115,7 @@ bool Compiler::emptyGroupsInRE::processNext()
for (FWObject::iterator i=re->begin(); i!=re->end(); i++)
{
FWObject *o = FWReference::getObject(*i);
if ( MultiAddress::cast(o)!=NULL && MultiAddress::cast(o)->isRunTime())
continue;
src/libgui/AttachedNetworksDialog.cpp
+167
View File
@@ -0,0 +1,167 @@
/*
Firewall Builder
Copyright (C) 201 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "../../config.h"
#include "global.h"
#include "utils.h"
#include "FWBTree.h"
#include "AttachedNetworksDialog.h"
#include "ProjectPanel.h"
#include "FWBSettings.h"
#include "FWCmdChange.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Interface.h"
#include "fwbuilder/IPv4.h"
#include "fwbuilder/IPv6.h"
#include "fwbuilder/FWException.h"
#include "fwbuilder/Inet6AddrMask.h"
#include <memory>
#include <qlineedit.h>
#include <qspinbox.h>
#include <qcheckbox.h>
#include <qtextedit.h>
#include <qcombobox.h>
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <QUndoStack>
#include <QtDebug>
#include <QApplication>
using namespace std;
using namespace libfwbuilder;
AttachedNetworksDialog::AttachedNetworksDialog(QWidget *parent) : BaseObjectDialog(parent)
{
m_dialog = new Ui::AttachedNetworksDialog_q;
m_dialog->setupUi(this);
obj=NULL;
}
AttachedNetworksDialog::~AttachedNetworksDialog() { delete m_dialog; }
void AttachedNetworksDialog::getHelpName(QString *str)
{
*str = "AttachedNetworksDialog";
}
void AttachedNetworksDialog::loadFWObject(FWObject *o)
{
obj=o;
AttachedNetworks *s = dynamic_cast<AttachedNetworks*>(obj);
assert(s!=NULL);
init=true;
m_dialog->obj_name->setText( QString::fromUtf8(s->getName().c_str()) );
m_dialog->comment->setText( QString::fromUtf8(s->getComment().c_str()) );
m_dialog->obj_name->setEnabled(!o->isReadOnly());
setDisabledPalette(m_dialog->obj_name);
m_dialog->addresses->setEnabled(false); // always read-only
setDisabledPalette(m_dialog->addresses);
m_dialog->comment->setReadOnly(o->isReadOnly());
setDisabledPalette(m_dialog->comment);
Interface *parent_intf = Interface::cast(obj->getParent());
assert(parent_intf);
m_dialog->addresses->clear();
FWObjectTypedChildIterator k = parent_intf->findByType(IPv4::TYPENAME);
for ( ; k!=k.end(); ++k)
{
Address *addr = Address::cast(*k);
addAddressToList(addr->getNetworkAddressPtr(), addr->getNetmaskPtr());
}
k = parent_intf->findByType(IPv6::TYPENAME);
for ( ; k!=k.end(); ++k)
{
Address *addr = Address::cast(*k);
addAddressToList(addr->getNetworkAddressPtr(), addr->getNetmaskPtr());
}
init=false;
}
void AttachedNetworksDialog::addAddressToList(const InetAddr *ip_addr,
const InetAddr *ip_netm)
{
QString name("%1/%2");
if (ip_addr->isV6())
{
m_dialog->addresses->addItem(
name.arg(ip_addr->toString().c_str()).arg(ip_netm->getLength()));
} else
{
m_dialog->addresses->addItem(
name.arg(ip_addr->toString().c_str()).arg(ip_netm->toString().c_str()));
}
}
void AttachedNetworksDialog::validate(bool *result)
{
if (fwbdebug) qDebug() << "AttachedNetworksDialog::validate";
*result = true;
AttachedNetworks *s = dynamic_cast<AttachedNetworks*>(obj);
assert(s!=NULL);
if (!validateName(this, obj, m_dialog->obj_name->text()))
{
*result = false;
}
}
void AttachedNetworksDialog::applyChanges()
{
std::auto_ptr<FWCmdChange> cmd( new FWCmdChange(m_project, obj));
FWObject* new_state = cmd->getNewState();
AttachedNetworks *s = dynamic_cast<AttachedNetworks*>(new_state);
assert(s!=NULL);
string oldname = obj->getName();
new_state->setName(string(m_dialog->obj_name->text().toUtf8().constData()));
new_state->setComment(string(
m_dialog->comment->toPlainText().toUtf8().constData()));
if (!cmd->getOldState()->cmp(new_state, true))
{
if (fwbdebug)
qDebug() << "Pushing FWCmdChange to undo stack";
if (obj->isReadOnly()) return;
m_project->undoStack->push(cmd.release());
}
}
src/libgui/AttachedNetworksDialog.h
+65
View File
@@ -0,0 +1,65 @@
/*
Firewall Builder
Copyright (C) 2011 NetCitadel, LLC
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
To get a copy of the GNU General Public License, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __ATTACHEDNETWORKSDIALOG_H_
#define __ATTACHEDNETWORKSDIALOG_H_
#include "../../config.h"
#include <ui_attachednetworksdialog_q.h>
#include "BaseObjectDialog.h"
#include <QWidget>
#include "fwbuilder/FWObject.h"
class ProjectPanel;
namespace libfwbuilder
{
class InetAddr;
};
class AttachedNetworksDialog : public BaseObjectDialog
{
Q_OBJECT;
Ui::AttachedNetworksDialog_q *m_dialog;
void addAddressToList(const libfwbuilder::InetAddr *ip_addr,
const libfwbuilder::InetAddr *ip_netm);
public:
AttachedNetworksDialog(QWidget *parent);
~AttachedNetworksDialog();
public slots:
virtual void applyChanges();
virtual void loadFWObject(libfwbuilder::FWObject *obj);
virtual void validate(bool*);
virtual void getHelpName(QString*);
};
#endif // ATTACHEDNETWORKSDIALOG_H
src/libgui/DialogFactory.cpp
+4
View File
@@ -40,6 +40,7 @@
#include "PhysicalAddressDialog.h"
#include "DNSNameDialog.h"
#include "AddressTableDialog.h"
#include "AttachedNetworksDialog.h"
#include "NetworkDialog.h"
#include "NetworkDialogIPv6.h"
#include "UserDialog.h"
@@ -98,6 +99,7 @@
#include "openaisOptionsDialog.h"
#include "pfsyncOptionsDialog.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/Firewall.h"
#include "fwbuilder/Cluster.h"
@@ -172,6 +174,8 @@ BaseObjectDialog *DialogFactory::createDialog(QWidget *parent, const QString &ob
if (objType==Interface::TYPENAME) return new InterfaceDialog(parent);
if (objType==AttachedNetworks::TYPENAME) return new AttachedNetworksDialog(parent);
if (objType==Network::TYPENAME) return new NetworkDialog(parent);
if (objType==NetworkIPv6::TYPENAME) return new NetworkDialogIPv6(parent);
src/libgui/FWBMainWindow_q.ui
+13
View File
@@ -683,6 +683,13 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="page_38">
<layout class="QGridLayout" name="gridLayout_45">
<item row="0" column="0">
<widget class="AttachedNetworksDialog" name="w_AttachedNetworksDialog" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_37">
<layout class="QGridLayout" name="gridLayout_42">
<property name="margin">
@@ -1591,6 +1598,12 @@
<header>BlankDialog.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>AttachedNetworksDialog</class>
<extends>QWidget</extends>
<header>AttachedNetworksDialog.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="MainRes.qrc"/>
src/libgui/FWBTree.cpp
+3 -2
View File
@@ -6,8 +6,6 @@
Author: Vadim Kurland vadim@fwbuilder.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@@ -53,6 +51,7 @@
#include "fwbuilder/IntervalGroup.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/NAT.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Network.h"
#include "fwbuilder/NetworkIPv6.h"
#include "fwbuilder/ObjectGroup.h"
@@ -606,6 +605,7 @@ QString FWBTree::getTranslatableObjectTypeName(const QString &type_name)
if (type_name == Cluster::TYPENAME) return QObject::tr("Cluster");
if (type_name == Host::TYPENAME) return QObject::tr("Host");
if (type_name == Interface::TYPENAME) return QObject::tr("Interface");
if (type_name == AttachedNetworks::TYPENAME) return QObject::tr("Attached Networks");
if (type_name == Network::TYPENAME) return QObject::tr("Network");
if (type_name == NetworkIPv6::TYPENAME) return QObject::tr("Network IPv6");
if (type_name == IPv4::TYPENAME) return QObject::tr("Address");
@@ -643,6 +643,7 @@ QString FWBTree::getTranslatableNewObjectMenuText(const QString &type_name)
if (type_name == Cluster::TYPENAME) return QObject::tr("New Cluster");
if (type_name == Host::TYPENAME) return QObject::tr("New Host");
if (type_name == Interface::TYPENAME) return QObject::tr("New Interface");
if (type_name == AttachedNetworks::TYPENAME) return QObject::tr("New Attached Networks Object");
if (type_name == Network::TYPENAME) return QObject::tr("New Network");
if (type_name == NetworkIPv6::TYPENAME) return QObject::tr("New Network IPv6");
if (type_name == IPv4::TYPENAME) return QObject::tr("New Address");
src/libgui/MainRes.qrc
+6
View File
@@ -28,6 +28,12 @@
<file alias="Icons/AddressTable/icon-neg-tree" >Icons/addresstable-neg_16.png</file>
<file alias="Icons/AddressTable/icon-ref" >Icons/addresstable-ref_25.png</file>
<file alias="Icons/AddressTable/icon-tree" >Icons/addresstable_16.png</file>
<file alias="Icons/AttachedNetworks/icon" >Icons/network_25.png</file>
<file alias="Icons/AttachedNetworks/icon-big" >Icons/network_64.png</file>
<file alias="Icons/AttachedNetworks/icon-neg" >Icons/network-neg_25.png</file>
<file alias="Icons/AttachedNetworks/icon-neg-tree" >Icons/network-neg_16.png</file>
<file alias="Icons/AttachedNetworks/icon-ref" >Icons/network-ref_25.png</file>
<file alias="Icons/AttachedNetworks/icon-tree" >Icons/network_16.png</file>
<file alias="Icons/Blank/icon" >Icons/blank.png</file>
<file alias="Icons/Blank/icon-big" >Icons/blank.png</file>
<file alias="Icons/Both/icon" >Icons/both_25.png</file>
src/libgui/ObjectEditor.cpp
+2
View File
@@ -63,6 +63,7 @@
#include "fwbuilder/StateSyncClusterGroup.h"
#include "fwbuilder/FailoverClusterGroup.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Network.h"
#include "fwbuilder/NetworkIPv6.h"
#include "fwbuilder/IPv4.h"
@@ -140,6 +141,7 @@ ObjectEditor::ObjectEditor( QWidget *parent):
registerObjectDialog(editorStack, StateSyncClusterGroup::TYPENAME,
"w_StateSyncClusterGroupDialog");
registerObjectDialog(editorStack, Host::TYPENAME, "w_HostDialog");
registerObjectDialog(editorStack, AttachedNetworks::TYPENAME, "w_AttachedNetworksDialog");
registerObjectDialog(editorStack, Network::TYPENAME, "w_NetworkDialog");
registerObjectDialog(editorStack, NetworkIPv6::TYPENAME, "w_NetworkDialogIPv6");
registerObjectDialog(editorStack, CustomService::TYPENAME, "w_CustomServiceDialog");
src/libgui/ObjectManipulator.cpp
+20 -1
View File
@@ -52,6 +52,7 @@
#include "fwbuilder/AddressRange.h"
#include "fwbuilder/AddressTable.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Cluster.h"
#include "fwbuilder/CustomService.h"
#include "fwbuilder/DNSName.h"
@@ -524,6 +525,20 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos)
AddObjectActions.append(
addNewObjectMenuItem(popup_menu, physAddress::TYPENAME));
/*
* Add menu item to let user add AttachedNetworks object
* to an interface, but only if this object does not exist yet.
*
* Actions added to AddObjectActions are
* enabled and disabled all together based on the decision
* made in getMenuState() (argument newMenuItem). But we
* should always allow the user to add AttachedNetworks
* object to an interface.
*/
FWObject *att = currentObj->getFirstByType(AttachedNetworks::TYPENAME);
if (att == NULL)
addNewObjectMenuItem(popup_menu, AttachedNetworks::TYPENAME);
// Check if we should add menu item that creates failover
// group. if parent is a cluster, allow one vrrp type
@@ -1224,8 +1239,12 @@ void ObjectManipulator::openLibForObject(FWObject *obj)
m_objectManipulator->libs->setCurrentIndex(
libs_model->getIdxForLib(obj->getLibrary()).row());
else
{
FWObject *parent = obj->getParent();
FWObject *lib = parent->getLibrary();
m_objectManipulator->libs->setCurrentIndex(
libs_model->getIdxForLib(obj->getParent()->getLibrary()).row());
libs_model->getIdxForLib(lib).row());
}
}
void ObjectManipulator::showObjectInTree(ObjectTreeViewItem *otvi)
src/libgui/ObjectManipulator.h
+1
View File
@@ -172,6 +172,7 @@ class ObjectManipulator : public QWidget
libfwbuilder::FWObject* newPhysicalAddress(QUndoCommand* macro);
libfwbuilder::FWObject* newPolicyRuleSet (QUndoCommand* macro);
libfwbuilder::FWObject* newNATRuleSet (QUndoCommand* macro);
libfwbuilder::FWObject* newAttachedNetworks(QUndoCommand* macro);
public slots:
src/libgui/ObjectManipulator_create_new.cpp
+26
View File
@@ -45,6 +45,7 @@
#include "fwbuilder/AddressRange.h"
#include "fwbuilder/AddressTable.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Cluster.h"
#include "fwbuilder/CustomService.h"
#include "fwbuilder/DNSName.h"
@@ -212,6 +213,7 @@ void ObjectManipulator::createNewObject()
if (type_name == Policy::TYPENAME) new_obj = newPolicyRuleSet(macro);
if (type_name == NAT::TYPENAME) new_obj = newNATRuleSet(macro);
//if (type_name == Routing::TYPENAME) new_obj = newRoutingRuleSet();
if (type_name == AttachedNetworks::TYPENAME) new_obj = newAttachedNetworks(macro);
if (new_obj == NULL) new_obj = createObject(type_name, descr, NULL, macro);
@@ -652,6 +654,30 @@ FWObject* ObjectManipulator::newFailoverClusterGroup(QUndoCommand* macro)
return o;
}
/*
* Creates new AttachedNetworks object; this method is called by
* context menu item associated with Interface object
*/
FWObject* ObjectManipulator::newAttachedNetworks(QUndoCommand* macro)
{
FWObject *currentObj = getSelectedObject();
if ( currentObj->isReadOnly() ) return NULL;
if (Interface::isA(currentObj))
{
FWObject *no = createObject(currentObj, AttachedNetworks::TYPENAME,
tr("Attached Networks"), NULL, macro);
string name = Interface::cast(currentObj)->getParentHost()->getName() +
":" + currentObj->getName() + ":attached";
no->setName(name);
return no;
} else
{
qWarning("newAttachedNetworks: invalid currentObj");
return NULL;
}
}
FWObject* ObjectManipulator::newHost(QUndoCommand* macro)
{
FWObject *parent =
src/libgui/ObjectManipulator_tree_ops.cpp
+4
View File
@@ -99,6 +99,7 @@
#include "fwbuilder/StateSyncClusterGroup.h"
#include "fwbuilder/FailoverClusterGroup.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/AttachedNetworks.h"
#include "fwbuilder/Network.h"
#include "fwbuilder/NetworkIPv6.h"
#include "fwbuilder/IPv4.h"
@@ -306,6 +307,9 @@ void ObjectManipulator::insertSubtree(ObjectTreeViewItem *itm, FWObject *obj)
for (FWObjectTypedChildIterator it = obj->findByType(FailoverClusterGroup::TYPENAME);
it != it.end(); ++it) insertSubtree( nitm, *it );
for (FWObjectTypedChildIterator it = obj->findByType(AttachedNetworks::TYPENAME);
it != it.end(); ++it) insertSubtree( nitm, *it );
return;
}
src/libgui/ProjectPanel_file_ops.cpp
+1 -1
View File
@@ -1062,7 +1062,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs)
}
mw->showStatusBarMessage(tr("Merging with system objects...") );
MergeConflictRes mcr(mainW);
objdb->merge(ndb, &mcr);
src/libgui/attachednetworksdialog_q.ui
+246
View File
@@ -0,0 +1,246 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>AttachedNetworksDialog_q</class>
<widget class="QWidget" name="AttachedNetworksDialog_q">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>949</width>
<height>258</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Network</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QFrame" name="frame7">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" rowspan="2">
<widget class="QFrame" name="object_attributes">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>350</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Name:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="obj_name">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>200</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>The list of addresses in this object is updated automatically and represents subnets attached to the parent interface.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>48</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="0" column="1" rowspan="2">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QListWidget" name="addresses">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="textLabel2">
<property name="text">
<string>Comment:</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="TextEditWidget" name="comment">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>180</height>
</size>
</property>
<property name="tabChangesFocus">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>TextEditWidget</class>
<extends>QTextEdit</extends>
<header>TextEditWidget.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>obj_name</tabstop>
<tabstop>comment</tabstop>
</tabstops>
<resources>
<include location="MainRes.qrc"/>
</resources>
<connections>
<connection>
<sender>obj_name</sender>
<signal>editingFinished()</signal>
<receiver>AttachedNetworksDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
<sender>comment</sender>
<signal>textChanged()</signal>
<receiver>AttachedNetworksDialog_q</receiver>
<slot>changed()</slot>
<hints>
<hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
<hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
</connections>
</ui>
src/libgui/libgui.pro
+3
View File
@@ -78,6 +78,7 @@ HEADERS += ../../config.h \
IPv4Dialog.h \
IPv6Dialog.h \
PhysicalAddressDialog.h \
AttachedNetworksDialog.h \
NetworkDialog.h \
NetworkDialogIPv6.h \
UserDialog.h \
@@ -287,6 +288,7 @@ SOURCES += ProjectPanel.cpp \
IPv4Dialog.cpp \
IPv6Dialog.cpp \
PhysicalAddressDialog.cpp \
AttachedNetworksDialog.cpp \
NetworkDialog.cpp \
NetworkDialogIPv6.cpp \
UserDialog.cpp \
@@ -450,6 +452,7 @@ FORMS = FWBMainWindow_q.ui \
rulesetdialog_q.ui \
addressrangedialog_q.ui \
addresstabledialog_q.ui \
attachednetworksdialog_q.ui \
networkdialog_q.ui \
networkdialogipv6_q.ui \
userdialog_q.ui \
src/pflib/PolicyCompiler_pf_writers.cpp
+8 -3
View File
@@ -4,9 +4,7 @@
Copyright (C) 2002 NetCitadel, LLC
Author: Vadim Kurland vadim@vk.crocodile.org
$Id$
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
@@ -45,6 +43,7 @@
#include "fwbuilder/DNSName.h"
#include "fwbuilder/AddressTable.h"
#include "fwbuilder/XMLTools.h"
#include "fwbuilder/AttachedNetworks.h"
#include <iostream>
#include <iomanip>
@@ -774,6 +773,12 @@ void PolicyCompiler_pf::PrintRule::_printAddr(Address *o,bool )
compiler->output << "<" << o->getName() << "> ";
return;
}
if (atrt->getSubstitutionTypeName()==AttachedNetworks::TYPENAME)
{
compiler->output << atrt->getSourceName() << ":network";
return ;
}
assert(atrt==NULL);
}
src/pflib/Preprocessor_pf.cpp
+9 -4
View File
@@ -4,9 +4,7 @@
Copyright (C) 2006 NetCitadel, LLC
Author: Vadim Kurland vadim@vk.crocodile.org
$Id$
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
@@ -27,6 +25,8 @@
#include "Preprocessor_pf.h"
#include "fwbuilder/AddressTable.h"
#include "fwbuilder/AttachedNetworks.h"
using namespace libfwbuilder;
using namespace fwcompiler;
@@ -35,6 +35,11 @@ using namespace std;
void Preprocessor_pf::convertObject(FWObject *obj)
{
Preprocessor::convertObject(obj);
// do not convert attachedNetworks object, compiler for PF always
// treats it as run-time object
if ( AttachedNetworks::isA(obj))
AttachedNetworks::cast(obj)->setRunTime(true);
else
Preprocessor::convertObject(obj);
}
src/pflib/TableFactory.cpp
+6 -3
View File
@@ -4,9 +4,7 @@
Copyright (C) 2002 NetCitadel, LLC
Author: Vadim Kurland vadim@vk.crocodile.org
$Id$
Author: Vadim Kurland vadim@fwbuilder.org
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
@@ -35,6 +33,7 @@
#include "fwbuilder/Library.h"
#include "fwbuilder/Rule.h"
#include "fwbuilder/RuleElement.h"
#include "fwbuilder/AttachedNetworks.h"
#include <algorithm>
#include <functional>
@@ -203,6 +202,10 @@ string TableFactory::PrintTables()
{
output << atrt->getSourceName() << " ";
}
if (atrt->getSubstitutionTypeName()==AttachedNetworks::TYPENAME)
{
output << atrt->getSourceName() << ":network";
}
} else
{
if (Interface::cast(o))
src/res/configlets/linux24/shell_functions
+31
View File
@@ -37,6 +37,19 @@ getaddr_internal() {
eval "${name}_list=\"$L\""
}
getnet_internal() {
dev=$1
name=$2
af=$3
L=$($IP route list proto kernel | grep $dev | grep -v default | sed 's! .*$!!')
test -z "$L" && {
eval "$name=''"
return
}
eval "${name}_list=\"$L\""
}
##
## This function reads all ipv4 addresses of interface (arg 1) and
## assignes the list to the variable which name is given as arg 2.
@@ -53,6 +66,24 @@ getaddr6() {
getaddr_internal $1 $2 "-6"
}
##
## This function reads all ipv4 addresses of interface (arg 1) and
## assignes list of addresses of attached networks with their netmasks
## to the variable which name is given as arg 2.
##
getnet() {
getnet_internal $1 $2 "-4"
}
##
## This function reads all ipv6 addresses of interface (arg 1) and
## assignes list of addresses of attached networks with their netmasks
## to the variable which name is given as arg 2.
##
getnet6() {
getnet_internal $1 $2 "-6"
}
# function getinterfaces is used to process wildcard interfaces
getinterfaces() {
NAME=$1
src/res/resources.xml
+4
View File
@@ -17,6 +17,10 @@
<description>Host</description>
</Host>
<AttachedNetworks>
<description>Attached Networks</description>
</AttachedNetworks>
<Network>
<description>Network</description>
</Network>