1 files changed, 7 insertions, 1 deletions
diff --git a/Swiften/Network/NATPMPInterface.cpp b/Swiften/Network/NATPMPInterface.cpp
index c7a41ff..dcae641 100644
--- a/Swiften/Network/NATPMPInterface.cpp
+++ b/Swiften/Network/NATPMPInterface.cpp
@@ -1,70 +1,76 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+* Copyright (c) 2014 Kevin Smith
+* Licensed under the GNU General Public License v3.
+* See Documentation/Licenses/GPLv3.txt for more information.
+*/
+
 #include <Swiften/Network/NATPMPInterface.h>
 
 #include <boost/smart_ptr/make_shared.hpp>
 #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 {
 
 struct NATPMPInterface::Private {
 	natpmp_t natpmp;
 };
 
 NATPMPInterface::NATPMPInterface() : p(boost::make_shared<Private>()) {
 	initnatpmp(&p->natpmp, 0, 0);
 }
 
 NATPMPInterface::~NATPMPInterface() {
 	closenatpmp(&p->natpmp);
 }
 
 bool NATPMPInterface::isAvailable() {
-	return getPublicIP();
+	return getPublicIP() ? true : false;
 }
 
 boost::optional<HostAddress> NATPMPInterface::getPublicIP() {
 	if (sendpublicaddressrequest(&p->natpmp) < 0) {
 		SWIFT_LOG(debug) << "Failed to send NAT-PMP public address request!" << std::endl;
 		return boost::optional<HostAddress>();
 	}
 
 	int r = 0;
 	natpmpresp_t response;
 	do {
 	  fd_set fds;
 	  struct timeval timeout;
 	  FD_ZERO(&fds);
 	  FD_SET(p->natpmp.s, &fds);
 	  getnatpmprequesttimeout(&p->natpmp, &timeout);
 	  select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
 	  r = readnatpmpresponseorretry(&p->natpmp, &response);
 	} while (r == NATPMP_TRYAGAIN);
 
 	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) {
 	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()),