diff options
Diffstat (limited to 'packages/net-p2p/retroshare/files/hidden_service.patch')
| -rw-r--r-- | packages/net-p2p/retroshare/files/hidden_service.patch | 111 |
1 files changed, 111 insertions, 0 deletions
diff --git a/packages/net-p2p/retroshare/files/hidden_service.patch b/packages/net-p2p/retroshare/files/hidden_service.patch new file mode 100644 index 0000000..8efb5b1 --- /dev/null +++ b/packages/net-p2p/retroshare/files/hidden_service.patch @@ -0,0 +1,111 @@ +diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc +index 3381705cd..70c6e81cd 100644 +--- a/libretroshare/src/pqi/p3netmgr.cc ++++ b/libretroshare/src/pqi/p3netmgr.cc +@@ -996,7 +996,7 @@ bool p3NetMgrIMPL::checkNetAddress() + std::cerr << "p3NetMgrIMPL::checkNetAddress() LOOPBACK ... forcing to 127.0.0.1"; + std::cerr << std::endl; + #endif +- sockaddr_storage_ipv4_aton(prefAddr, "127.0.0.1"); ++ sockaddr_storage_ipv4_aton(prefAddr, "0.0.0.0"); + validAddr = true; + } + else +diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc +index d1e9e4e97..377d14ce5 100644 +--- a/libretroshare/src/pqi/p3peermgr.cc ++++ b/libretroshare/src/pqi/p3peermgr.cc +@@ -80,7 +80,7 @@ static struct RsLog::logInfo p3peermgrzoneInfo = {RsLog::Default, "p3peermgr"}; + #define MAX_AVAIL_PERIOD 230 //times a peer stay in available state when not connected + #define MIN_RETRY_PERIOD 140 + +-static const std::string kConfigDefaultProxyServerIpAddr = "127.0.0.1"; ++static const std::string kConfigDefaultProxyServerIpAddr = "0.0.0.0"; + static const uint16_t kConfigDefaultProxyServerPortTor = 9050; // standard port. + static const uint16_t kConfigDefaultProxyServerPortI2P = 4447; // I2Pd's standard port + +diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc +index c6d686469..0f3323eba 100644 +--- a/libretroshare/src/rsserver/p3peers.cc ++++ b/libretroshare/src/rsserver/p3peers.cc +@@ -314,7 +314,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) + + if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised. + { +- d.localAddr = "INVALID_IP"; ++ d.localAddr = "0.0.0.0"; + d.localPort = 0 ; + } + else +diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc +index 095dbaeaf..0be569c14 100644 +--- a/libretroshare/src/rsserver/rsinit.cc ++++ b/libretroshare/src/rsserver/rsinit.cc +@@ -127,7 +127,7 @@ class RsInitConfig + + /* Listening Port */ + bool forceExtPort; +- bool forceLocalAddr; ++// bool forceLocalAddr; + unsigned short port; + std::string inet ; + +@@ -188,7 +188,7 @@ void RsInit::InitRsConfig() + + rsInitConfig->load_trustedpeer = false; + rsInitConfig->port = 0 ; +- rsInitConfig->forceLocalAddr = false; ++// rsInitConfig->forceLocalAddr = false; + rsInitConfig->haveLogFile = false; + rsInitConfig->outStderr = false; + rsInitConfig->forceExtPort = false; +@@ -359,7 +359,7 @@ int RsInit::InitRetroShare(int argc, char **argv, bool /* strictCheck */) + if(rsInitConfig->autoLogin) rsInitConfig->startMinimised = true ; + if(rsInitConfig->outStderr) rsInitConfig->haveLogFile = false ; + if(!rsInitConfig->logfname.empty()) rsInitConfig->haveLogFile = true; +- if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true; ++// if(rsInitConfig->inet != "127.0.0.1") rsInitConfig->forceLocalAddr = true; + #ifdef LOCALNET_TESTING + if(!portRestrictions.empty()) doPortRestrictions = true; + #endif +@@ -1684,23 +1684,23 @@ int RsServer::StartupRetroShare() + /**************************************************************************/ + std::cerr << "Force Any Configuration before Startup (After Load)" << std::endl; + +- if (rsInitConfig->forceLocalAddr) +- { +- struct sockaddr_storage laddr; +- +- /* clean sockaddr before setting values (MaxOSX) */ +- sockaddr_storage_clear(laddr); +- +- struct sockaddr_in *lap = (struct sockaddr_in *) &laddr; +- +- lap->sin_family = AF_INET; +- lap->sin_port = htons(rsInitConfig->port); +- +- // universal +- lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str()); +- +- mPeerMgr->setLocalAddress(ownId, laddr); +- } ++// if (rsInitConfig->forceLocalAddr) ++// { ++// struct sockaddr_storage laddr; ++// ++// /* clean sockaddr before setting values (MaxOSX) */ ++// sockaddr_storage_clear(laddr); ++// ++// struct sockaddr_in *lap = (struct sockaddr_in *) &laddr; ++// ++// lap->sin_family = AF_INET; ++// lap->sin_port = htons(rsInitConfig->port); ++// ++// // universal ++// lap->sin_addr.s_addr = inet_addr(rsInitConfig->inet.c_str()); ++// ++// mPeerMgr->setLocalAddress(ownId, laddr); ++// } + + if (rsInitConfig->forceExtPort) + { |