diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2016-11-21 03:17:50 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2016-11-21 03:17:50 +0300 |
| commit | 288ce8868d276aad8ba76b89e20781e518f9056e (patch) | |
| tree | 7a9c859d20a750ff9ac65da40ac77712755f1831 /net-p2p/retroshare/files/hidden_service.patch | |
| parent | 6f3333d455e4386cbc2f677dacba012cc12ae8ed (diff) | |
retroshare: fixed bind address patch, removed O0 from cflags
Diffstat (limited to 'net-p2p/retroshare/files/hidden_service.patch')
| -rw-r--r-- | net-p2p/retroshare/files/hidden_service.patch | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/net-p2p/retroshare/files/hidden_service.patch b/net-p2p/retroshare/files/hidden_service.patch index 6043423..03768b7 100644 --- a/net-p2p/retroshare/files/hidden_service.patch +++ b/net-p2p/retroshare/files/hidden_service.patch @@ -21,7 +21,7 @@ index bc5a6f1..63ee8e2 100644 if(sockaddr_storage_isLoopbackNet(mLocalAddr)) diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc -index 6503096..7427814 100644 +index f85edb5..680a84f 100644 --- a/libretroshare/src/pqi/p3peermgr.cc +++ b/libretroshare/src/pqi/p3peermgr.cc @@ -73,7 +73,7 @@ static struct RsLog::logInfo p3peermgrzoneInfo = {RsLog::Default, "p3peermgr"}; @@ -43,41 +43,29 @@ index 6503096..7427814 100644 sockaddr_storage_ipv4_setport(loopback, port); diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc -index bd4e11c..41b07d2 100644 +index d4b5fe3..22ef1b7 100644 --- a/libretroshare/src/rsserver/p3peers.cc +++ b/libretroshare/src/rsserver/p3peers.cc -@@ -311,12 +311,12 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) - d.hiddenNodePort = ps.hiddenPort; - d.hiddenType = ps.hiddenType; +@@ -313,7 +313,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) -- if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised. -+/* if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised. + if(sockaddr_storage_isnull(ps.localaddr)) // that happens if the address is not initialised. { - d.localAddr = "INVALID_IP"; +- d.localAddr = "INVALID_IP"; ++ d.localAddr = "0.0.0.0"; d.localPort = 0 ; } -- else -+ else */ - { - d.localAddr = sockaddr_storage_iptostring(ps.localaddr); - d.localPort = sockaddr_storage_port(ps.localaddr); -@@ -332,12 +332,12 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) - d.hiddenNodePort = 0; - d.hiddenType = RS_HIDDEN_TYPE_NONE; - -- if (sockaddr_storage_isnull(ps.localaddr)) -+/* if (sockaddr_storage_isnull(ps.localaddr)) + else +@@ -334,7 +334,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d) + + if (sockaddr_storage_isnull(ps.localaddr)) { - d.localAddr = "INVALID_IP"; +- d.localAddr = "INVALID_IP"; ++ d.localAddr = "0.0.0.0"; d.localPort = 0; } -- else -+ else */ - { - d.localAddr = sockaddr_storage_iptostring(ps.localaddr); - d.localPort = sockaddr_storage_port(ps.localaddr); + else diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc -index c34ae7b..e50d535 100644 +index 0f8a707..b6bc725 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -112,7 +112,7 @@ class RsInitConfig |