From 81e1978a8399348f86876e25e4576e99d2c257b7 Mon Sep 17 00:00:00 2001 From: joss17 Date: Fri, 30 Oct 2009 00:39:26 +0000 Subject: [PATCH] store exaddr from upnp to stun git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1763 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3connmgr.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libretroshare/src/pqi/p3connmgr.cc b/libretroshare/src/pqi/p3connmgr.cc index eb38c1905..a8c67159c 100644 --- a/libretroshare/src/pqi/p3connmgr.cc +++ b/libretroshare/src/pqi/p3connmgr.cc @@ -649,8 +649,7 @@ void p3ConnectMgr::netUpnpCheck() struct sockaddr_in extAddr; int upnpState = netAssistFirewallActive(); - if ((upnpState < 0) || - ((upnpState == 0) && (delta > MAX_UPNP_INIT))) + if ((upnpState == 0) && (delta > MAX_UPNP_INIT)) { #ifdef CONN_DEBUG std::cerr << "p3ConnectMgr::netUpnpCheck() "; @@ -1062,12 +1061,13 @@ bool p3ConnectMgr::stunCheck() else { #ifdef CONN_DEBUG - std::cerr << "Stun : No Ext Address. Checking upnp est address." << std::endl; + std::cerr << "Stun : No Ext Address. Checking upnp ext address." << std::endl; #endif struct sockaddr_in extAddr; bool upnpExtAdress = netAssistExtAddress(extAddr); if (upnpExtAdress) { //don't do a reset + mStunExtAddr = extAddr; #ifdef CONN_DEBUG std::cerr << "Found upnp Ext Address. don't do a reset." << std::endl; #endif