onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-11 07:31:25 +02:00
Code Issues Releases Wiki Activity

refactored InetAddr class, removed Inet6Addr class

Browse Source
This commit is contained in:
Vadim Kurland
2008-05-24 04:30:31 +00:00
parent 44c8f309d4
commit 848bc7b926
7 changed files with 71 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/IPv6Dialog.cpp
+10 -8
View File
@@ -34,7 +34,7 @@
#include "ProjectPanel.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/IPv6.h"
#include "fwbuilder/Inet6Addr.h"
#include "fwbuilder/InetAddr.h"
#include "fwbuilder/Interface.h"
#include "fwbuilder/FWException.h"
@@ -108,9 +108,10 @@ void IPv6Dialog::loadFWObject(FWObject *o)
* still can show netmask */
try
{
m_dialog->address->setText( Inet6Addr().toString().c_str() );
m_dialog->address->setText(InetAddr(AF_INET6, 0).toString().c_str() );
const InetAddr *inet_addr = s->getAddressPtr();
m_dialog->address->setText( inet_addr->toString().c_str());
m_dialog->address->setText(
inet_addr->toString().c_str());
} catch (FWException &ex) {}
try
@@ -159,7 +160,7 @@ void IPv6Dialog::validate(bool *res)
assert(s!=NULL);
try
{
Inet6Addr( m_dialog->address->text().toLatin1().constData() );
InetAddr(AF_INET6, m_dialog->address->text().toLatin1().constData() );
} catch (FWException &ex)
{
*res=false;
@@ -174,7 +175,7 @@ void IPv6Dialog::validate(bool *res)
try
{
bool ok = false;
Inet6Addr(m_dialog->netmask->text().toInt(&ok));
InetAddr(AF_INET6, m_dialog->netmask->text().toInt(&ok));
if (!ok) throw FWException("");
} catch (FWException &ex)
{
@@ -210,7 +211,7 @@ void IPv6Dialog::applyChanges()
try
{
s->setAddress(
Inet6Addr(m_dialog->address->text().toLatin1().constData()) );
InetAddr(AF_INET6, m_dialog->address->text().toLatin1().constData()) );
} catch (FWException &ex) { }
if ( showNetmask )
@@ -218,11 +219,12 @@ void IPv6Dialog::applyChanges()
try
{
bool ok = false;
s->setNetmask(Inet6Addr(m_dialog->netmask->text().toInt(&ok)) );
s->setNetmask(
InetAddr(AF_INET6, m_dialog->netmask->text().toInt(&ok)) );
if (!ok) throw FWException("");
} catch (FWException &ex) { }
} else
s->setNetmask(Inet6Addr());
s->setNetmask(InetAddr(AF_INET6, 0));
mw->updateObjName(obj,QString::fromUtf8(oldname.c_str()));
src/gui/NetworkDialogIPv6.cpp
+3 -4
View File
@@ -31,7 +31,6 @@
#include "FWBTree.h"
#include "NetworkDialogIPv6.h"
#include "fwbuilder/Inet6Addr.h"
#include "ProjectPanel.h"
#include "fwbuilder/Library.h"
#include "fwbuilder/Network.h"
@@ -116,7 +115,7 @@ void NetworkDialogIPv6::validate(bool *res)
assert(s!=NULL);
try
{
Inet6Addr( m_dialog->address->text().toLatin1().constData() );
InetAddr(AF_INET6, m_dialog->address->text().toLatin1().constData() );
} catch (FWException &ex)
{
*res=false;
@@ -164,10 +163,10 @@ void NetworkDialogIPv6::applyChanges()
try
{
s->setAddress(
Inet6Addr(m_dialog->address->text().toLatin1().constData()) );
InetAddr(AF_INET6, m_dialog->address->text().toLatin1().constData()) );
bool ok = false;
s->setNetmask(
Inet6Addr(m_dialog->netmask->text().toInt(&ok)) );
InetAddr(AF_INET6, m_dialog->netmask->text().toInt(&ok)) );
if (!ok) throw FWException("");
} catch (FWException &ex)
{
src/res/os/linksys.xml
+2
View File
@@ -97,7 +97,9 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% && echo 'Policy activated'
<path_lsmod>lsmod</path_lsmod>
<path_modprobe>modprobe</path_modprobe>
<path_iptables>iptables</path_iptables>
<path_ip6tables>ip6tables</path_ip6tables>
<path_iptables_restore>iptables-restore</path_iptables_restore>
<path_ip6tables_restore>ip6tables-restore</path_ip6tables_restore>
<path_ip>ip</path_ip>
<path_logger>logger</path_logger>
</Unknown>
src/res/os/linksys.xml.in
+2 -1
View File
@@ -97,8 +97,9 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>lsmod</path_lsmod>
<path_modprobe>modprobe</path_modprobe>
<path_iptables>iptables</path_iptables>
<path_ip6tables>ip6tables</path_iptables>
<path_ip6tables>ip6tables</path_ip6tables>
<path_iptables_restore>iptables-restore</path_iptables_restore>
<path_ip6tables_restore>ip6tables-restore</path_ip6tables_restore>
<path_ip>ip</path_ip>
<path_logger>logger</path_logger>
</Unknown>
src/res/os/linux24.xml
+10
View File
@@ -118,7 +118,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -127,7 +129,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -136,7 +140,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/usr/sbin/iptables</path_iptables>
<path_ip6tables>/usr/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/usr/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -145,7 +151,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -154,7 +162,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>lsmod</path_lsmod>
<path_modprobe>modprobe</path_modprobe>
<path_iptables>iptables</path_iptables>
<path_ip6tables>ip6tables</path_ip6tables>
<path_iptables_restore>iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>ip</path_ip>
<path_logger>logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
src/res/os/linux24.xml.in
+10 -5
View File
@@ -118,8 +118,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -128,8 +129,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -138,8 +140,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/usr/sbin/iptables</path_iptables>
<path_ip6tables>/usr/sbin/ip6tables</path_iptables>
<path_ip6tables>/usr/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/usr/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -148,8 +151,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>/sbin/lsmod</path_lsmod>
<path_modprobe>/sbin/modprobe</path_modprobe>
<path_iptables>/sbin/iptables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_iptables>
<path_ip6tables>/sbin/ip6tables</path_ip6tables>
<path_iptables_restore>/sbin/iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>/sbin/ip</path_ip>
<path_logger>/usr/bin/logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
@@ -158,8 +162,9 @@ sh %FWDIR%/tmp/%FWSCRIPT% &#38;&#38; echo 'Policy activated'
<path_lsmod>lsmod</path_lsmod>
<path_modprobe>modprobe</path_modprobe>
<path_iptables>iptables</path_iptables>
<path_ip6tables>ip6tables</path_iptables>
<path_ip6tables>ip6tables</path_ip6tables>
<path_iptables_restore>iptables-restore</path_iptables_restore>
<path_ip6tables_restore>/sbin/ip6tables-restore</path_ip6tables_restore>
<path_ip>ip</path_ip>
<path_logger>logger</path_logger>
<path_expect>/usr/bin/expect</path_expect>
test/ipt/objects-for-regression-tests.fwb
+34 -14
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="6" lastModified="1211435708" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="6" lastModified="1211586656" id="root">
<Library color="#d2ffd0" comment="User defined objects" id="syslib001" name="User">
<ObjectGroup id="stdid01_1" name="Objects">
<ObjectGroup id="stdid01_1_og_ats_1" name="Address Tables">
@@ -24223,10 +24223,30 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="verify_interfaces">False</Option>
</FirewallOptions>
</Firewall>
<Firewall comment="" host_OS="linux24" id="id4833F62B6131" inactive="False" lastCompiled="1211338917" lastInstalled="0" lastModified="1211408113" name="firewall-ipv6-1" platform="iptables" ro="False" version="">
<Firewall comment="" host_OS="linux24" id="id4833F62B6131" inactive="False" lastCompiled="1211586650" lastInstalled="0" lastModified="1211586656" name="firewall-ipv6-1" platform="iptables" ro="False" version="">
<NAT id="id4833F62F6131" name="NAT"/>
<Policy id="id4833F62E6131" name="Policy">
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" id="id4834578B6131" log="False" position="0">
<PolicyRule action="Accept" comment="this rule shadows the next.&#10;Note that we add command line&#10;flag -xt to the compiler" direction="Both" disabled="False" group="" id="id4837BFE628819" log="False" position="0">
<Src neg="False">
<ObjectRef ref="id4834B9206131"/>
</Src>
<Dst neg="False">
<ObjectRef ref="id4833F6316131"/>
</Dst>
<Srv neg="False">
<ServiceRef ref="tcp-SSH"/>
</Srv>
<Itf neg="False">
<ObjectRef ref="sysid0"/>
</Itf>
<When neg="False">
<IntervalRef ref="sysid2"/>
</When>
<PolicyRuleOptions>
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" id="id4834578B6131" log="False" position="1">
<Src neg="False">
<ObjectRef ref="id483426D06131"/>
</Src>
@@ -24246,7 +24266,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" id="id4834577C6131" log="True" position="1">
<PolicyRule action="Accept" direction="Both" disabled="False" id="id4834577C6131" log="True" position="2">
<Src neg="False">
<ObjectRef ref="id483426D06131"/>
</Src>
@@ -24266,7 +24286,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" group="" id="id4834D3038571" log="True" position="2">
<PolicyRule action="Accept" direction="Both" disabled="False" group="" id="id4834D3038571" log="True" position="3">
<Src neg="False">
<ObjectRef ref="id4834A2238571"/>
</Src>
@@ -24286,7 +24306,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" group="" id="id4834D3108571" log="True" position="3">
<PolicyRule action="Accept" direction="Both" disabled="False" group="" id="id4834D3108571" log="True" position="4">
<Src neg="False">
<ObjectRef ref="id4834A2278571"/>
</Src>
@@ -24306,7 +24326,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" group="" id="id4835040E8571" log="True" position="4">
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" group="" id="id4835040E8571" log="True" position="5">
<Src neg="False">
<ObjectRef ref="id4834A2238571"/>
</Src>
@@ -24326,7 +24346,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" group="" id="id4835041F8571" log="True" position="5">
<PolicyRule action="Accept" comment="" direction="Both" disabled="False" group="" id="id4835041F8571" log="True" position="6">
<Src neg="False">
<ObjectRef ref="id4834A2278571"/>
</Src>
@@ -24346,7 +24366,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Inbound" disabled="False" id="id4834576F6131" log="True" position="6">
<PolicyRule action="Accept" direction="Inbound" disabled="False" id="id4834576F6131" log="True" position="7">
<Src neg="False">
<ObjectRef ref="sysid0"/>
</Src>
@@ -24366,7 +24386,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" id="id4834B9216131" log="True" position="7">
<PolicyRule action="Accept" direction="Both" disabled="False" id="id4834B9216131" log="True" position="8">
<Src neg="False">
<ObjectRef ref="id4834B9206131"/>
</Src>
@@ -24386,7 +24406,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" id="id483566468571" log="True" position="8">
<PolicyRule action="Accept" direction="Both" disabled="False" id="id483566468571" log="True" position="9">
<Src neg="False">
<ObjectRef ref="id4834A2238571"/>
</Src>
@@ -24406,7 +24426,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule action="Accept" direction="Both" disabled="False" id="id483566548571" log="True" position="9">
<PolicyRule action="Accept" direction="Both" disabled="False" id="id483566548571" log="True" position="10">
<Src neg="False">
<ObjectRef ref="id4834A2278571"/>
</Src>
@@ -24446,10 +24466,10 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="admUser"></Option>
<Option name="altAddress"></Option>
<Option name="bridging_fw">False</Option>
<Option name="check_shading">False</Option>
<Option name="check_shading">True</Option>
<Option name="clamp_mss_to_mtu">False</Option>
<Option name="classify_mark_terminating">False</Option>
<Option name="cmdline"></Option>
<Option name="cmdline">-xt</Option>
<Option name="compiler"></Option>
<Option name="configure_interfaces">True</Option>
<Option name="debug">False</Option>