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

small fixes

Browse source
This commit is contained in:
sehraf 2015-09-14 14:56:14 +02:00
parent 6ec191944d
commit 6b87c38951
4 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libretroshare/src/pqi/p3peermgr.cc
View file

@ -566,14 +566,14 @@ bool p3PeerMgrIMPL::setProxyServerAddress(const uint32_t type, const struct sock
switch (type) { switch (type) {
case RS_HIDDEN_TYPE_I2P: case RS_HIDDEN_TYPE_I2P:
if (!sockaddr_storage_same(mProxyServerAddressI2P,proxy_addr)) if (!sockaddr_storage_same(mProxyServerAddressI2P, proxy_addr))
{ {
IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/ IndicateConfigChanged(); /**** INDICATE MSG CONFIG CHANGED! *****/
mProxyServerAddressI2P = proxy_addr; mProxyServerAddressI2P = proxy_addr;
} }
break; break;
case RS_HIDDEN_TYPE_TOR: case RS_HIDDEN_TYPE_TOR:
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;
@ -1938,7 +1938,7 @@ bool p3PeerMgrIMPL::saveList(bool &cleanup, std::list<RsItem *>& saveData)
// I2P // I2P
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "Saving proxyServerAddress for I2P: " << sockaddr_storage_tostring(proxy_addr_tor); std::cerr << "Saving proxyServerAddress for I2P: " << sockaddr_storage_tostring(proxy_addr_i2p);
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
@ -1986,7 +1986,7 @@ bool p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
std::string proxyIpAddressTor = kConfigDefaultProxyServerIpAddr; std::string proxyIpAddressTor = kConfigDefaultProxyServerIpAddr;
uint16_t proxyPortTor = kConfigDefaultProxyServerPort; uint16_t proxyPortTor = kConfigDefaultProxyServerPort;
std::string proxyIpAddressI2P = kConfigDefaultProxyServerIpAddr; std::string proxyIpAddressI2P = kConfigDefaultProxyServerIpAddr;
uint16_t proxyPortI2P = kConfigDefaultProxyServerPort; uint16_t proxyPortI2P = kConfigDefaultProxyServerPort + 1;
if (load.empty()) { if (load.empty()) {
std::cerr << "p3PeerMgrIMPL::loadList() list is empty, it may be a configuration problem." << std::endl; std::cerr << "p3PeerMgrIMPL::loadList() list is empty, it may be a configuration problem." << std::endl;
@ -2108,7 +2108,6 @@ bool p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
std::cerr << "Loaded proxyIpAddress for I2P: " << proxyIpAddressI2P; std::cerr << "Loaded proxyIpAddress for I2P: " << proxyIpAddressI2P;
std::cerr << std::endl ; std::cerr << std::endl ;
#endif #endif
} }
else if (kit->key == kConfigKeyProxyServerPortI2P) else if (kit->key == kConfigKeyProxyServerPortI2P)
{ {

2
libretroshare/src/pqi/p3peermgr.h
View file

@ -90,7 +90,7 @@ class peerState
bool hiddenNode; /* all IP addresses / dyndns must be blank */ bool hiddenNode; /* all IP addresses / dyndns must be blank */
std::string hiddenDomain; std::string hiddenDomain;
uint16_t hiddenPort; uint16_t hiddenPort;
uint32_t hiddenType; uint32_t hiddenType;
std::string location; std::string location;
std::string name; std::string name;

16
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -813,7 +813,7 @@ void ServerPage::saveAddresses()
rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() ); rsConfig->SetMaxDataRates( ui.totalDownloadRate->value(), ui.totalUploadRate->value() );
// HANDLE PROXY SERVER. // HANDLE PROXY SERVER.
std::string orig_proxyaddr,new_proxyaddr; std::string orig_proxyaddr, new_proxyaddr;
uint16_t orig_proxyport, new_proxyport; uint16_t orig_proxyport, new_proxyport;
uint32_t status ; uint32_t status ;
// Tor // Tor
@ -1151,7 +1151,7 @@ void ServerPage::updateOutProxyIndicator()
else else
{ {
ui.iconlabel_i2p_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ; ui.iconlabel_i2p_outgoing->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_i2p_outgoing->setToolTip(tr("Tor proxy is not enabled")) ; ui.iconlabel_i2p_outgoing->setToolTip(tr("I2P proxy is not enabled")) ;
} }
} }
@ -1181,11 +1181,11 @@ void ServerPage::updateInProxyIndicator()
} }
proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ; proxy.setCapabilities(QNetworkProxy::HostNameLookupCapability | proxy.capabilities()) ;
//ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ; //ui.iconlabel_tor_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
//ui.testIncomingTor_PB->setIcon(QIcon(":/loader/circleball-16.gif")) ; //ui.testIncomingTor_PB->setIcon(QIcon(":/loader/circleball-16.gif")) ;
QMovie *movie = new QMovie(":/images/loader/circleball-16.gif"); QMovie *movie = new QMovie(":/images/loader/circleball-16.gif");
ui.iconlabel_service_incoming->setMovie(movie); ui.iconlabel_service_incoming->setMovie(movie);
movie->start() ; movie->start() ;
QNetworkProxy::setApplicationProxy(proxy) ; QNetworkProxy::setApplicationProxy(proxy) ;
@ -1217,7 +1217,7 @@ void ServerPage::handleNetworkReply(QNetworkReply *reply)
//ui.testIncomingTor_PB->setIcon(QIcon(ICON_STATUS_UNKNOWN)) ; //ui.testIncomingTor_PB->setIcon(QIcon(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_service_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ; ui.iconlabel_service_incoming->setPixmap(QPixmap(ICON_STATUS_UNKNOWN)) ;
ui.iconlabel_service_incoming->setToolTip(tr("The proxy is not enabled or broken.\Are all services up and running fine??\nAlso check your ports!")) ; ui.iconlabel_service_incoming->setToolTip(tr("The proxy is not enabled or broken.\nAre all services up and running fine??\nAlso check your ports!")) ;
} }
reply->close(); reply->close();

2
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -1087,7 +1087,7 @@ Once this is done, paste the Onion/I2P (Base32) Address in the box above.
This is your external address on the Tor/I2P network. This is your external address on the Tor/I2P network.
Finally make sure that the Ports match the configuration. Finally make sure that the Ports match the configuration.
If you have issues connecting over Tor check the Tor logs, too.</string> If you have issues connecting over Tor check the Tor logs too.</string>
</property> </property>
</widget> </widget>
</item> </item>