Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit fa0413c7ab76f8bb84e40f99cf499eb20d1a3cb4
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Tue Dec 9 21:24:02 2014 +0100
Adapt the code in getZoneSettings,getForwardPorts,getSources and Zone to recent
changes
---------------------------------------------------------------
src/Daemon/DBus/getZoneSettings.cpp | 6 +++---
src/Daemon/DBus/zone/getForwardPorts.cpp | 6 +++---
src/Daemon/DBus/zone/getSources.cpp | 2 +-
src/Daemon/Firewall/Zone.cpp | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Daemon/DBus/getZoneSettings.cpp b/src/Daemon/DBus/getZoneSettings.cpp
index d1bbbde..a924177 100644
--- a/src/Daemon/DBus/getZoneSettings.cpp
+++ b/src/Daemon/DBus/getZoneSettings.cpp
@@ -70,7 +70,7 @@ namespace firewalld
int forward_index = 0;
for (auto const& map_entry : zone->getPortForwards()) {
Pointer<const PortForward> port_forward = map_entry.second;
- forward_array[forward_index] <<
UString(port_forward->sourcePort()->range().toString());
+ forward_array[forward_index] <<
UString(port_forward->sourcePort()->range().toUString());
switch(port_forward->protocol()) {
case Port::Protocol::TCP:
forward_array[forward_index] << UString("tcp");
@@ -81,8 +81,8 @@ namespace firewalld
default:
throw FirewallError("INVALID_ZONE", "Ambiguous port protocol");
}
- forward_array[forward_index] <<
UString(port_forward->destinationPort()->range().toString());
- forward_array[forward_index] << port_forward->destinationAddress();
+ forward_array[forward_index] <<
port_forward->destinationPort()->range().toUString();
+ forward_array[forward_index] <<
port_forward->destinationAddress().toUString();
++forward_index;
}
diff --git a/src/Daemon/DBus/zone/getForwardPorts.cpp
b/src/Daemon/DBus/zone/getForwardPorts.cpp
index e8abbe6..eb9e71d 100644
--- a/src/Daemon/DBus/zone/getForwardPorts.cpp
+++ b/src/Daemon/DBus/zone/getForwardPorts.cpp
@@ -38,11 +38,11 @@ namespace firewalld
for (auto const& map_entry : port_forwards) {
Pointer<const PortForward> port_forward = map_entry.second;
- result[i][0] = port_forward->sourcePort()->range().toString();
+ result[i][0] = port_forward->sourcePort()->range().toUString();
result[i][1] = (port_forward->sourcePort()->protocol() == Port::Protocol::TCP ? \
UString("tcp") : UString("udp"));
- result[i][2] = port_forward->destinationPort()->range().toString();
- result[i][3] = port_forward->destinationAddress();
+ result[i][2] = port_forward->destinationPort()->range().toUString();
+ result[i][3] = port_forward->destinationAddress().toUString();
++i;
}
}
diff --git a/src/Daemon/DBus/zone/getSources.cpp b/src/Daemon/DBus/zone/getSources.cpp
index 4f206a7..f1737e4 100644
--- a/src/Daemon/DBus/zone/getSources.cpp
+++ b/src/Daemon/DBus/zone/getSources.cpp
@@ -37,7 +37,7 @@ namespace firewalld
for (auto const& map_entry : source_map) {
Pointer<const Source> source = map_entry.second;
- source_spec_vector.push_back(source->specification());
+ source_spec_vector.push_back(source->address().toUString());
}
result = source_spec_vector;
diff --git a/src/Daemon/Firewall/Zone.cpp b/src/Daemon/Firewall/Zone.cpp
index 46e5ca2..175fc26 100644
--- a/src/Daemon/Firewall/Zone.cpp
+++ b/src/Daemon/Firewall/Zone.cpp
@@ -733,7 +733,7 @@ namespace firewalld
if (forward->sourcePort() != forward->destinationPort()) {
stream << " to-port=\"" <<
forward->destinationPort()->range().toString() << "\"";
}
- if (!forward->destinationAddress().empty()) {
+ if (!forward->destinationAddress()) {
stream << " to-addr=\"" << forward->destinationAddress()
<< "\"";
}