Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added some error handling

Browse Source
This commit is contained in:
sehraf 2015-09-08 13:48:30 +02:00
parent 03d99ae4af
commit 0bc77d75ae
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/pqi/p3linkmgr.cc
View File

@ -2030,9 +2030,13 @@ void p3LinkMgrIMPL::locked_ConnectAttempt_ProxyAddress(peerConnectState *peer,
case RS_HIDDEN_TYPE_I2P: case RS_HIDDEN_TYPE_I2P:
pca.type = RS_NET_CONN_TCP_HIDDEN_I2P; pca.type = RS_NET_CONN_TCP_HIDDEN_I2P;
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_UNKNOWN:
default: default:
/* default tor */ #ifdef LINKMGR_DEBUG
std::cerr << "p3LinkMgrIMPL::locked_ConnectAttempt_ProxyAddress() hidden type of addr: " << domain_addr << " is unkown -> fallback to tor" << std::endl;
#endif
/* the type should be set! since this connection involves a proxy -> fallback to tor */
case RS_HIDDEN_TYPE_TOR:
pca.type = RS_NET_CONN_TCP_HIDDEN_TOR; pca.type = RS_NET_CONN_TCP_HIDDEN_TOR;
break; break;
} }

35
libretroshare/src/pqi/p3peermgr.cc
View File

@ -483,7 +483,7 @@ uint32_t p3PeerMgrIMPL::hiddenDomainToHiddenType(const std::string &domain)
std::cerr << "p3PeerMgrIMPL::hiddenDomainToHiddenType() unknown hidden type: " << domain; std::cerr << "p3PeerMgrIMPL::hiddenDomainToHiddenType() unknown hidden type: " << domain;
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
return RS_HIDDEN_TYPE_NONE; return RS_HIDDEN_TYPE_UNKNOWN;
} }
bool p3PeerMgrIMPL::setHiddenDomainPort(const RsPeerId &ssl_id, const std::string &domain_addr, const uint16_t domain_port) bool p3PeerMgrIMPL::setHiddenDomainPort(const RsPeerId &ssl_id, const std::string &domain_addr, const uint16_t domain_port)
@ -560,13 +560,19 @@ bool p3PeerMgrIMPL::setProxyServerAddress(const uint32_t type, const struct sock
} }
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
if (!sockaddr_storage_same(mProxyServerAddressTor,proxy_addr)) if (!sockaddr_storage_same(mProxyServerAddressTor,proxy_addr))
{ {
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
mProxyServerAddressTor = proxy_addr; mProxyServerAddressTor = proxy_addr;
} }
break; break;
case RS_HIDDEN_TYPE_UNKNOWN:
default:
#ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::setProxyServerAddress() unknown hidden type " << type << " -> false";
std::cerr << std::endl;
#endif
return false;
} }
return true; return true;
@ -593,9 +599,15 @@ bool p3PeerMgrIMPL::getProxyServerStatus(const uint32_t type, uint32_t& proxy_st
proxy_status = mProxyServerStatusI2P; proxy_status = mProxyServerStatusI2P;
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
proxy_status = mProxyServerStatusTor; proxy_status = mProxyServerStatusTor;
break; break;
case RS_HIDDEN_TYPE_UNKNOWN:
default:
#ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::getProxyServerStatus() unknown hidden type " << type << " -> false";
std::cerr << std::endl;
#endif
return false;
} }
return true; return true;
@ -610,9 +622,15 @@ bool p3PeerMgrIMPL::getProxyServerAddress(const uint32_t type, struct sockaddr_s
proxy_addr = mProxyServerAddressI2P; proxy_addr = mProxyServerAddressI2P;
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
proxy_addr = mProxyServerAddressTor; proxy_addr = mProxyServerAddressTor;
break; break;
case RS_HIDDEN_TYPE_UNKNOWN:
default:
#ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::getProxyServerAddress() unknown hidden type " << type << " -> false";
std::cerr << std::endl;
#endif
return false;
} }
return true; return true;
} }
@ -642,10 +660,15 @@ bool p3PeerMgrIMPL::getProxyAddress(const RsPeerId &ssl_id, struct sockaddr_stor
proxy_addr = mProxyServerAddressI2P; proxy_addr = mProxyServerAddressI2P;
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
default:
/* default tor */
proxy_addr = mProxyServerAddressTor; proxy_addr = mProxyServerAddressTor;
break; break;
case RS_HIDDEN_TYPE_UNKNOWN:
default:
#ifdef PEER_DEBUG
std::cerr << "p3PeerMgrIMPL::getProxyAddress() no valid hidden type (" << it->second.hiddenType << ") for peer id " << ssl_id << " -> false";
std::cerr << std::endl;
#endif
return false;
} }
return true; return true;
} }

5
libretroshare/src/retroshare/rspeers.h
View File

@ -65,8 +65,9 @@ const uint32_t RS_NETMODE_UNREACHABLE = 0x0005;
/* Hidden Type */ /* Hidden Type */
const uint32_t RS_HIDDEN_TYPE_NONE = 0x0000; const uint32_t RS_HIDDEN_TYPE_NONE = 0x0000;
const uint32_t RS_HIDDEN_TYPE_TOR = 0x0001; const uint32_t RS_HIDDEN_TYPE_UNKNOWN = 0x0001;
const uint32_t RS_HIDDEN_TYPE_I2P = 0x0002; const uint32_t RS_HIDDEN_TYPE_TOR = 0x0002;
const uint32_t RS_HIDDEN_TYPE_I2P = 0x0004;
/* Visibility */ /* Visibility */
const uint32_t RS_VS_DISC_OFF = 0x0000; const uint32_t RS_VS_DISC_OFF = 0x0000;