1 files changed, 4 insertions, 6 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index 298240a..36553ed 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -47,49 +47,47 @@ boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
 	}
 	else {
 		SWIFT_LOG(debug) << "Inavlid NAT-PMP response." << std::endl;
 		return boost::optional<HostAddress>();
 	}
 }
 
 boost::optional<NATPortMapping> NATPMPInterface::addPortForward(int localPort, int publicPort) {
 	NATPortMapping mapping(localPort, publicPort, NATPortMapping::TCP);
-	if (sendnewportmappingrequest(&natpmp, mapping.protocol == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, mapping.leaseInSeconds, mapping.publicPort, mapping.localPort) < 0) {
+	if (sendnewportmappingrequest(&natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, mapping.getLeaseInSeconds(), mapping.getPublicPort(), mapping.getLocalPort()) < 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;
 		FD_ZERO(&fds);
 		FD_SET(natpmp.s, &fds);
 		getnatpmprequesttimeout(&natpmp, &timeout);
 		select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
 		r = readnatpmpresponseorretry(&natpmp, &response);
 	} while(r == NATPMP_TRYAGAIN);
 
 	if (r == 0) {
-		mapping.localPort = response.pnu.newportmapping.privateport;
-		mapping.publicPort = response.pnu.newportmapping.mappedpublicport;
-		mapping.leaseInSeconds = response.pnu.newportmapping.lifetime;
-		return mapping;
+		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(&natpmp, mapping.protocol == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, 0, 0, mapping.localPort) < 0) {
+	if (sendnewportmappingrequest(&natpmp, mapping.getProtocol() == NATPortMapping::TCP ? NATPMP_PROTOCOL_TCP : NATPMP_PROTOCOL_UDP, 0, 0, mapping.getLocalPort()) < 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;