Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 14:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a few bugs in torcontrol socket methods

Browse source
This commit is contained in:
csoler 2021-12-15 22:15:52 +01:00
parent 24e862ae25
commit d9368507a9
8 changed files with 56 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libretroshare/src/tor/TorControl.cpp
View file

@ -179,10 +179,10 @@ void TorControl::setStatus(TorControl::Status n)
}
mStatusChanged_callback(mStatus, old);
if (mStatus == TorControl::Connected && old < TorControl::Connected)
socketConnected();//mConnected_callback();
else if (mStatus < TorControl::Connected && old >= TorControl::Connected)
socketDisconnected();//mDisconnected_callback();
// if (mStatus == TorControl::Connected && old < TorControl::Connected)
// socketConnected();//mConnected_callback();
// else if (mStatus < TorControl::Connected && old >= TorControl::Connected)
// socketDisconnected();//mDisconnected_callback();
}
void TorControl::setTorStatus(TorControl::TorStatus n)
@ -282,11 +282,14 @@ void TorControl::connect(const std::string &address, uint16_t port)
setTorStatus(TorUnknown);
//bool b = d->socket->blockSignals(true);
mSocket->fullstop();
if(mSocket->isRunning())
mSocket->fullstop();
//d->socket->blockSignals(b);
setStatus(Connecting);
mSocket->connectToHost(address, port);
if(mSocket->connectToHost(address, port))
setStatus(SocketConnected);
}
void TorControl::reconnect()
@ -336,9 +339,9 @@ void TorControl::authenticateReply(TorControlCommand *sender)
}
void TorControl::socketConnected()
void TorControl::authenticate()
{
assert(mStatus == TorControl::Connecting);
assert(mStatus == TorControl::SocketConnected);
torCtrlDebug() << "torctrl: Connected socket; querying information" << std::endl;
setStatus(TorControl::Authenticating);