Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-08 09:05:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Native (Bonjour API) Nat Port Forwarding to OSX.

Browse source 
* new classe p3zcNatAssist
 * moved some common ZeroConf functions / definitions around.
 * moved virtual tick() to parent class: pqiNetAssist
 * added zcNetAssist section to makefiles. (active for OSX build)
 * setup switch between p3zcNatAssist & upnphandler in rsinit.cc

NOTE: Still to test network restart, etc, and correct exchange of external Ip Address.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-01-14 16:41:00 +00:00
parent 2805d4ca1e
commit 79998dd70c
9 changed files with 589 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libretroshare/src/zeroconf/p3zeroconf.cc
View file

@ -43,10 +43,6 @@
#define DEBUG_ZEROCONF 1
#define ZC_SERVICE_STOPPED 0
#define ZC_SERVICE_ACTIVE 1
#define ZC_MAX_QUERY_TIME 30
#define ZC_MAX_RESOLVE_TIME 30
@ -695,7 +691,7 @@ void p3ZeroConf::locked_stopRegister()
std::cerr << "p3ZeroConf::locked_stopRegister()";
std::cerr << std::endl;
if (mBrowseStatus != ZC_SERVICE_ACTIVE)
if (mRegisterStatus != ZC_SERVICE_ACTIVE)
{
return;
}
@ -1250,7 +1246,7 @@ int p3ZeroConf::locked_stopQueryIp()
std::string p3ZeroConf::displayDNSServiceError(DNSServiceErrorType errcode)
std::string displayDNSServiceError(DNSServiceErrorType errcode)
{
std::ostringstream str;
switch(errcode)