Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Network/NATPMPInterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Network/NATPMPInterface.cpp')
-rw-r--r--Swiften/Network/NATPMPInterface.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index 8ab26d4..0c33c1f 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -14,8 +14,6 @@
14 14
15#include <memory> 15#include <memory>
16 16
17#include <boost/numeric/conversion/cast.hpp>
18
19#include <Swiften/Base/Log.h> 17#include <Swiften/Base/Log.h>
20 18
21// This has to be included after the previous headers, because of WIN32 macro 19// This has to be included after the previous headers, because of WIN32 macro
@@ -81,7 +79,7 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short l
81 mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, 79 mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP,
82 mapping.getLocalPort(), 80 mapping.getLocalPort(),
83 mapping.getPublicPort(), 81 mapping.getPublicPort(),
84 boost::numeric_cast<uint32_t>(mapping.getLeaseInSeconds())) < 0) { 82 mapping.getLeaseInSeconds()) < 0) {
85 SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl; 83 SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl;
86 return boost::optional<NATPortMapping>(); 84 return boost::optional<NATPortMapping>();
87 } 85 }
@@ -104,7 +102,7 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short l
104 } while(false /*r == NATPMP_TRYAGAIN*/); 102 } while(false /*r == NATPMP_TRYAGAIN*/);
105 103
106 if (r == 0) { 104 if (r == 0) {
107 NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, boost::numeric_cast<int>(response.pnu.newportmapping.lifetime)); 105 NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, response.pnu.newportmapping.lifetime);
108 return result; 106 return result;
109 } 107 }
110 else { 108 else {
@@ -114,7 +112,7 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short l
114} 112}
115 113
116bool NATPMPInterface::removePortForward(const NATPortMapping& mapping) { 114bool NATPMPInterface::removePortForward(const NATPortMapping& mapping) {
117 if (sendnewportmappingrequest(&p->natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, 0, 0, boost::numeric_cast<uint32_t>(mapping.getLocalPort())) < 0) { 115 if (sendnewportmappingrequest(&p->natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, mapping.getLocalPort(), 0, 0) < 0) {
118 SWIFT_LOG(debug) << "Failed to send NAT-PMP remove forwarding request!" << std::endl; 116 SWIFT_LOG(debug) << "Failed to send NAT-PMP remove forwarding request!" << std::endl;
119 return false; 117 return false;
120 } 118 }