1 files changed, 7 insertions, 9 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index 5e0b3b3..0c33c1f 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -1,27 +1,25 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014-2016 Isode Limited.
+ * Copyright (c) 2014-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/NATPMPInterface.h>
 
 #include <memory>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <Swiften/Base/Log.h>
 
 // This has to be included after the previous headers, because of WIN32 macro
 // being defined somewhere.
 #include <natpmp.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
 namespace Swift {
@@ -68,26 +66,26 @@ boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
     if (r == 0) {
         return boost::optional<HostAddress>(HostAddress(reinterpret_cast<const unsigned char*>(&(response.pnu.publicaddress.addr)), 4));
     }
     else {
         SWIFT_LOG(debug) << "Inavlid NAT-PMP response." << std::endl;
         return boost::optional<HostAddress>();
     }
 }
 
-boost::optional<NATPortMapping> NATPMPInterface::addPortForward(int localPort, int publicPort) {
+boost::optional<NATPortMapping> NATPMPInterface::addPortForward(unsigned short localPort, unsigned short publicPort) {
     NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP);
     if (sendnewportmappingrequest(
                 &p->natpmp,
                 mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP,
-                boost::numeric_cast<uint16_t>(mapping.getLocalPort()),
-                boost::numeric_cast<uint16_t>(mapping.getPublicPort()),
-                boost::numeric_cast<uint32_t>(mapping.getLeaseInSeconds())) < 0) {
+                mapping.getLocalPort(),
+                mapping.getPublicPort(),
+                mapping.getLeaseInSeconds()) < 0) {
         SWIFT_LOG(debug) << "Failed to send NAT-PMP port forwarding request!" << std::endl;
         return boost::optional<NATPortMapping>();
     }
 
     int r = 0;
     natpmpresp_t response;
     do {
         fd_set fds;
         struct timeval timeout;
@@ -98,29 +96,29 @@ boost::optional<NATPortMapping> NATPMPInterface::addPortForward(int localPort, i
         // Limit NAT-PMP timeout to ten seconds.
         timeout.tv_sec = 10;
         timeout.tv_usec = 0;
 
         select(FD_SETSIZE, &fds, nullptr, nullptr, &timeout);
         r = readnatpmpresponseorretry(&p->natpmp, &response);
     } while(false /*r == NATPMP_TRYAGAIN*/);
 
     if (r == 0) {
-        NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, boost::numeric_cast<int>(response.pnu.newportmapping.lifetime));
+        NATPortMapping result(response.pnu.newportmapping.privateport, response.pnu.newportmapping.mappedpublicport, NATPortMapping::TCP, response.pnu.newportmapping.lifetime);
         return result;
     }
     else {
         SWIFT_LOG(debug) << "Invalid NAT-PMP response." << std::endl;
         return boost::optional<NATPortMapping>();
     }
 }
 
 bool NATPMPInterface::removePortForward(const NATPortMapping& mapping) {
-    if (sendnewportmappingrequest(&p->natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, 0, 0, boost::numeric_cast<uint32_t>(mapping.getLocalPort())) < 0) {
+    if (sendnewportmappingrequest(&p->natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, mapping.getLocalPort(), 0, 0) < 0) {
         SWIFT_LOG(debug) << "Failed to send NAT-PMP remove forwarding request!" << std::endl;
         return false;
     }
 
     int r = 0;
     natpmpresp_t response;
     do {
       fd_set fds;
       struct timeval timeout;