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

i2p: bob: convert to RS_DBG

Browse Source
This commit is contained in:
sehraf 2020-06-10 21:22:45 +02:00
parent 950703c398
commit d0c5dc4e24
No known key found for this signature in database
GPG Key ID: DF09F6EAE356B2C6
1 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
libretroshare/src/services/autoproxy/p3i2pbob.cc
View File

@ -26,7 +26,6 @@
#include "pqi/p3peermgr.h" #include "pqi/p3peermgr.h"
#include "rsitems/rsconfigitems.h" #include "rsitems/rsconfigitems.h"
#include "util/rsdebug.h"
#include "util/radix32.h" #include "util/radix32.h"
#include "util/radix64.h" #include "util/radix64.h"
#include "util/rsdebug.h" #include "util/rsdebug.h"
@ -52,8 +51,6 @@ static const int sleepFactorDefault = 10; // 0.5s
static const int sleepFactorFast = 1; // 0.05s static const int sleepFactorFast = 1; // 0.05s
static const int sleepFactorSlow = 20; // 1s static const int sleepFactorSlow = 20; // 1s
RS_SET_CONTEXT_DEBUG_LEVEL(0)
static const rstime_t selfCheckPeroid = 30; static const rstime_t selfCheckPeroid = 30;
void doSleep(useconds_t timeToSleepMS) { void doSleep(useconds_t timeToSleepMS) {
@ -83,7 +80,7 @@ bool p3I2pBob::isEnabled()
bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/) bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/)
{ {
std::cout << "p3I2pBob::initialSetup" << std::endl; RS_DBG("") << std::endl;
// update config // update config
{ {
@ -96,7 +93,7 @@ bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/)
} }
} }
std::cout << "p3I2pBob::initialSetup config updated" << std::endl; RS_DBG("config updated") << std::endl;
// request keys // request keys
// p3I2pBob::stateMachineBOB expects mProcessing to be set therefore // p3I2pBob::stateMachineBOB expects mProcessing to be set therefore
@ -106,12 +103,12 @@ bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/)
fakeTicket->task = autoProxyTask::receiveKey; fakeTicket->task = autoProxyTask::receiveKey;
processTaskAsync(fakeTicket); processTaskAsync(fakeTicket);
std::cout << "p3I2pBob::initialSetup fakeTicket requested" << std::endl; RS_DBG("fakeTicket requested") << std::endl;
// now start thread // now start thread
start("I2P-BOB gen key"); start("I2P-BOB gen key");
std::cout << "p3I2pBob::initialSetup thread started" << std::endl; RS_DBG("thread started") << std::endl;
int counter = 0; int counter = 0;
// wait for keys // wait for keys
@ -125,24 +122,24 @@ bool p3I2pBob::initialSetup(std::string &addr, uint16_t &/*port*/)
break; break;
if (++counter > 30) { if (++counter > 30) {
std::cout << "p3I2pBob::initialSetup timeout!" << std::endl; RS_DBG4("timeout!") << std::endl;
return false; return false;
} }
} }
std::cout << "p3I2pBob::initialSetup got keys" << std::endl; RS_DBG("got keys") << std::endl;
// stop thread // stop thread
fullstop(); fullstop();
std::cout << "p3I2pBob::initialSetup thread stopped" << std::endl; RS_DBG("thread stopped") << std::endl;
{ {
RS_STACK_MUTEX(mLock); RS_STACK_MUTEX(mLock);
addr = mSetting.address.base32; addr = mSetting.address.base32;
} }
std::cout << "p3I2pBob::initialSetup addr '" << addr << "'" << std::endl; RS_DBG4("addr '" + addr + "'") << std::endl;
return true; return true;
} }
@ -160,7 +157,7 @@ void p3I2pBob::processTaskAsync(taskTicket *ticket)
} }
break; break;
default: default:
RsDbg() << __PRETTY_FUNCTION__ << " unknown task" << std::endl; RS_DBG("unknown task") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
break; break;
} }
@ -175,7 +172,7 @@ void p3I2pBob::processTaskSync(taskTicket *ticket)
case autoProxyTask::status: case autoProxyTask::status:
// check if everything needed is set // check if everything needed is set
if (!data) { if (!data) {
RsDbg() << __PRETTY_FUNCTION__ << " autoProxyTask::status data is missing" << std::endl; RS_DBG("autoProxyTask::status data is missing") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
break; break;
} }
@ -189,7 +186,7 @@ void p3I2pBob::processTaskSync(taskTicket *ticket)
case autoProxyTask::getSettings: case autoProxyTask::getSettings:
// check if everything needed is set // check if everything needed is set
if (!data) { if (!data) {
RsDbg() << __PRETTY_FUNCTION__ << " autoProxyTask::getSettings data is missing" << std::endl; RS_DBG("autoProxyTask::getSettings data is missing") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
break; break;
} }
@ -203,7 +200,7 @@ void p3I2pBob::processTaskSync(taskTicket *ticket)
case autoProxyTask::setSettings: case autoProxyTask::setSettings:
// check if everything needed is set // check if everything needed is set
if (!data) { if (!data) {
RsDbg() << __PRETTY_FUNCTION__ << " autoProxyTask::setSettings data is missing" << std::endl; RS_DBG("autoProxyTask::setSettings data is missing") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
break; break;
} }
@ -223,7 +220,7 @@ void p3I2pBob::processTaskSync(taskTicket *ticket)
break; break;
case autoProxyTask::getErrorInfo: case autoProxyTask::getErrorInfo:
if (!data) { if (!data) {
RsDbg() << __PRETTY_FUNCTION__ << " autoProxyTask::getErrorInfo data is missing" << std::endl; RS_DBG("autoProxyTask::getErrorInfo data is missing") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
} else { } else {
RS_STACK_MUTEX(mLock); RS_STACK_MUTEX(mLock);
@ -232,7 +229,7 @@ void p3I2pBob::processTaskSync(taskTicket *ticket)
} }
break; break;
default: default:
RsDbg() << __PRETTY_FUNCTION__ << " unknown task" << std::endl; RS_DBG("unknown task") << std::endl;
rsAutoProxyMonitor::taskError(ticket); rsAutoProxyMonitor::taskError(ticket);
break; break;
} }
@ -253,7 +250,7 @@ void p3I2pBob::threadTick()
RS_STACK_MUTEX(mLock); RS_STACK_MUTEX(mLock);
std::stringstream ss; std::stringstream ss;
ss << "data_tick mState: " << mState << " mTask: " << mTask << " mBOBState: " << mBOBState << " mPending: " << mPending.size(); ss << "data_tick mState: " << mState << " mTask: " << mTask << " mBOBState: " << mBOBState << " mPending: " << mPending.size();
Dbg4() << __PRETTY_FUNCTION__ << " " + ss.str() << std::endl; RS_DBG4("" + ss.str()) << std::endl;
} }
sleepTime += stateMachineController(); sleepTime += stateMachineController();
@ -294,13 +291,13 @@ int p3I2pBob::stateMachineBOB()
while (answer.find("OK Listing done") == std::string::npos) { while (answer.find("OK Listing done") == std::string::npos) {
std::stringstream ss; std::stringstream ss;
ss << "stateMachineBOB status check: read loop, counter: " << counter; ss << "stateMachineBOB status check: read loop, counter: " << counter;
Dbg3() << __PRETTY_FUNCTION__ << " " + ss.str() << std::endl; RS_DBG3("" + ss.str()) << std::endl;
answer += recv(); answer += recv();
counter++; counter++;
} }
if (answer.find(mTunnelName) == std::string::npos) { if (answer.find(mTunnelName) == std::string::npos) {
RsDbg() << __PRETTY_FUNCTION__ << " status check: tunnel down!" << std::endl; RS_DBG("status check: tunnel down!") << std::endl;
// signal error // signal error
*((bool *)mProcessing->data) = true; *((bool *)mProcessing->data) = true;
} }
@ -340,8 +337,8 @@ int p3I2pBob::stateMachineBOB_locked_failure(const std::string &answer, const bo
return sleepFactorDefault; return sleepFactorDefault;
} }
RsDbg() << __PRETTY_FUNCTION__ << " FAILED to run command '" + currentState.command + "'" << std::endl; RS_DBG("FAILED to run command '" + currentState.command + "'") << std::endl;
RsDbg() << __PRETTY_FUNCTION__ << " '" + answer + "'" << std::endl; RS_DBG("'" + answer + "'") << std::endl;
mErrorMsg.append("FAILED to run command '" + currentState.command + "'" + '\n'); mErrorMsg.append("FAILED to run command '" + currentState.command + "'" + '\n');
mErrorMsg.append("reason '" + answer + "'" + '\n'); mErrorMsg.append("reason '" + answer + "'" + '\n');
@ -388,14 +385,14 @@ int p3I2pBob::stateMachineController()
return stateMachineController_locked_idle(); return stateMachineController_locked_idle();
case csDoConnect: case csDoConnect:
if (!connectI2P()) { if (!connectI2P()) {
RsDbg() << __PRETTY_FUNCTION__ << " doConnect: unable to connect" << std::endl; RS_DBG("doConnect: unable to connect") << std::endl;
mStateOld = mState; mStateOld = mState;
mState = csError; mState = csError;
mErrorMsg = "unable to connect to BOB port"; mErrorMsg = "unable to connect to BOB port";
return sleepFactorSlow; return sleepFactorSlow;
} }
Dbg4() << __PRETTY_FUNCTION__ << " doConnect: connected" << std::endl; RS_DBG4("doConnect: connected") << std::endl;
mState = csConnected; mState = csConnected;
break; break;
case csConnected: case csConnected:
@ -403,7 +400,7 @@ int p3I2pBob::stateMachineController()
case csWaitForBob: case csWaitForBob:
// check connection problems // check connection problems
if (mSocket == 0) { if (mSocket == 0) {
RsDbg() << __PRETTY_FUNCTION__ << " waitForBob: conection lost" << std::endl; RS_DBG("waitForBob: conection lost") << std::endl;
mStateOld = mState; mStateOld = mState;
mState = csError; mState = csError;
mErrorMsg = "connection lost to BOB"; mErrorMsg = "connection lost to BOB";
@ -413,21 +410,21 @@ int p3I2pBob::stateMachineController()
// check for finished BOB protocol // check for finished BOB protocol
if (mBOBState == bsCleared) { if (mBOBState == bsCleared) {
// done // done
Dbg4() << __PRETTY_FUNCTION__ << " waitForBob: mBOBState == bsCleared" << std::endl; RS_DBG4("waitForBob: mBOBState == bsCleared") << std::endl;
mState = csDoDisconnect; mState = csDoDisconnect;
} }
break; break;
case csDoDisconnect: case csDoDisconnect:
if (!disconnectI2P() || mSocket != 0) { if (!disconnectI2P() || mSocket != 0) {
// just in case // just in case
RsDbg() << __PRETTY_FUNCTION__ << " doDisconnect: can't disconnect" << std::endl; RS_DBG("doDisconnect: can't disconnect") << std::endl;
mStateOld = mState; mStateOld = mState;
mState = csError; mState = csError;
mErrorMsg = "unable to disconnect from BOB"; mErrorMsg = "unable to disconnect from BOB";
return sleepFactorDefault; return sleepFactorDefault;
} }
Dbg4() << __PRETTY_FUNCTION__ << " doDisconnect: disconnected" << std::endl; RS_DBG4("doDisconnect: disconnected") << std::endl;
mState = csDisconnected; mState = csDisconnected;
break; break;
case csDisconnected: case csDisconnected:
@ -458,7 +455,7 @@ int p3I2pBob::stateMachineController_locked_idle()
mProcessing->task == autoProxyTask::stop || mProcessing->task == autoProxyTask::stop ||
mProcessing->task == autoProxyTask::proxyStatusCheck)) { mProcessing->task == autoProxyTask::proxyStatusCheck)) {
// skip since we are not enabled // skip since we are not enabled
Dbg1() << __PRETTY_FUNCTION__ << " disabled -> skipping ticket" << std::endl; RS_DBG1("disabled -> skipping ticket") << std::endl;
rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::disabled); rsAutoProxyMonitor::taskDone(mProcessing, autoProxyStatus::disabled);
mProcessing = NULL; mProcessing = NULL;
} else { } else {
@ -480,7 +477,7 @@ int p3I2pBob::stateMachineController_locked_idle()
mTask = ctRunCheck; mTask = ctRunCheck;
break; break;
default: default:
Dbg1() << __PRETTY_FUNCTION__ << " unknown async task" << std::endl; RS_DBG1("unknown async task") << std::endl;
rsAutoProxyMonitor::taskError(mProcessing); rsAutoProxyMonitor::taskError(mProcessing);
mProcessing = NULL; mProcessing = NULL;
break; break;
@ -528,28 +525,28 @@ int p3I2pBob::stateMachineController_locked_connected()
case ctRunSetUp: case ctRunSetUp:
// when we have a key use it for server tunnel! // when we have a key use it for server tunnel!
if(mSetting.address.privateKey.empty()) { if(mSetting.address.privateKey.empty()) {
Dbg4() << __PRETTY_FUNCTION__ << " setting mBOBState = setnickC" << std::endl; RS_DBG4("setting mBOBState = setnickC") << std::endl;
mBOBState = bsSetnickC; mBOBState = bsSetnickC;
} else { } else {
Dbg4() << __PRETTY_FUNCTION__ << " setting mBOBState = setnickS" << std::endl; RS_DBG4("setting mBOBState = setnickS") << std::endl;
mBOBState = bsSetnickS; mBOBState = bsSetnickS;
} }
break; break;
case ctRunShutDown: case ctRunShutDown:
// shut down existing tunnel // shut down existing tunnel
Dbg4() << __PRETTY_FUNCTION__ << " setting mBOBState = getnick" << std::endl; RS_DBG4("setting mBOBState = getnick") << std::endl;
mBOBState = bsGetnick; mBOBState = bsGetnick;
break; break;
case ctRunCheck: case ctRunCheck:
Dbg4() << __PRETTY_FUNCTION__ << " setting mBOBState = list" << std::endl; RS_DBG4("setting mBOBState = list") << std::endl;
mBOBState = bsList; mBOBState = bsList;
break; break;
case ctRunGetKeys: case ctRunGetKeys:
Dbg4() << __PRETTY_FUNCTION__ << " setting mBOBState = setnickN" << std::endl; RS_DBG4("setting mBOBState = setnickN") << std::endl;
mBOBState = bsSetnickN; mBOBState = bsSetnickN;
break; break;
case ctIdle: case ctIdle:
RsDbg() << __PRETTY_FUNCTION__ << " task is idle. This should not happen!" << std::endl; RS_DBG("task is idle. This should not happen!") << std::endl;
break; break;
} }
@ -565,7 +562,7 @@ int p3I2pBob::stateMachineController_locked_disconnected()
if(errorHappened) { if(errorHappened) {
// reset old state // reset old state
mStateOld = csIdel; mStateOld = csIdel;
RsDbg() << __PRETTY_FUNCTION__ << " error during process!" << std::endl; RS_DBG("error during process!") << std::endl;
} }
// answer ticket // answer ticket
@ -594,12 +591,12 @@ int p3I2pBob::stateMachineController_locked_disconnected()
mTask = mTaskOld; mTask = mTaskOld;
if (!errorHappened) { if (!errorHappened) {
Dbg4() << __PRETTY_FUNCTION__ << " run check result: ok" << std::endl; RS_DBG4("run check result: ok") << std::endl;
break; break;
} }
// switch to error // switch to error
newState = csError; newState = csError;
RsDbg() << __PRETTY_FUNCTION__ << " run check result: error" << std::endl; RS_DBG("run check result: error") << std::endl;
mErrorMsg = "Connection check failed. Will try to restart tunnel."; mErrorMsg = "Connection check failed. Will try to restart tunnel.";
break; break;
@ -622,7 +619,7 @@ int p3I2pBob::stateMachineController_locked_disconnected()
mTask = mTaskOld; mTask = mTaskOld;
break; break;
case ctIdle: case ctIdle:
RsDbg() << __PRETTY_FUNCTION__ << " task is idle. This should not happen!" << std::endl; RS_DBG("task is idle. This should not happen!") << std::endl;
rsAutoProxyMonitor::taskError(mProcessing); rsAutoProxyMonitor::taskError(mProcessing);
} }
mProcessing = NULL; mProcessing = NULL;
@ -638,14 +635,14 @@ int p3I2pBob::stateMachineController_locked_error()
{ {
// wait for bob protocoll // wait for bob protocoll
if (mBOBState != bsCleared) { if (mBOBState != bsCleared) {
Dbg4() << __PRETTY_FUNCTION__ << " waiting for BOB" << std::endl; RS_DBG4("waiting for BOB") << std::endl;
return sleepFactorFast; return sleepFactorFast;
} }
#if 0 #if 0
std::stringstream ss; std::stringstream ss;
ss << "stateMachineController_locked_error: mProcessing: " << (mProcessing ? "not null" : "null"); ss << "stateMachineController_locked_error: mProcessing: " << (mProcessing ? "not null" : "null");
Dbg4() << __PRETTY_FUNCTION__ << " " + ss.str() << std::endl; RS_DBG4("" + ss.str()) << std::endl;
#endif #endif
// try to finish ticket // try to finish ticket
@ -653,7 +650,7 @@ int p3I2pBob::stateMachineController_locked_error()
switch (mTask) { switch (mTask) {
case ctRunCheck: case ctRunCheck:
// connection check failed at some point // connection check failed at some point
RsDbg() << __PRETTY_FUNCTION__ << " failed to check proxy status (it's likely dead)!" << std::endl; RS_DBG("failed to check proxy status (it's likely dead)!") << std::endl;
*((bool *)mProcessing->data) = true; *((bool *)mProcessing->data) = true;
mState = csDoDisconnect; mState = csDoDisconnect;
mStateOld = csIdel; mStateOld = csIdel;
@ -661,7 +658,7 @@ int p3I2pBob::stateMachineController_locked_error()
break; break;
case ctRunShutDown: case ctRunShutDown:
// not a big deal though // not a big deal though
RsDbg() << __PRETTY_FUNCTION__ << " failed to shut down tunnel (it's likely dead though)!" << std::endl; RS_DBG("failed to shut down tunnel (it's likely dead though)!") << std::endl;
mState = csDoDisconnect; mState = csDoDisconnect;
mStateOld = csIdel; mStateOld = csIdel;
mErrorMsg.clear(); mErrorMsg.clear();
@ -669,14 +666,14 @@ int p3I2pBob::stateMachineController_locked_error()
case ctIdle: case ctIdle:
// should not happen but we need to deal with it // should not happen but we need to deal with it
// this will produce some error messages in the log and finish the task (marked as failed) // this will produce some error messages in the log and finish the task (marked as failed)
RsDbg() << __PRETTY_FUNCTION__ << " task is idle. This should not happen!" << std::endl; RS_DBG("task is idle. This should not happen!") << std::endl;
mState = csDoDisconnect; mState = csDoDisconnect;
mStateOld = csIdel; mStateOld = csIdel;
mErrorMsg.clear(); mErrorMsg.clear();
break; break;
case ctRunGetKeys: case ctRunGetKeys:
case ctRunSetUp: case ctRunSetUp:
RsDbg() << __PRETTY_FUNCTION__ << " failed to receive key / start up" << std::endl; RS_DBG("failed to receive key / start up") << std::endl;
mStateOld = csError; mStateOld = csError;
mState = csDoDisconnect; mState = csDoDisconnect;
// keep the error message // keep the error message
@ -687,7 +684,7 @@ int p3I2pBob::stateMachineController_locked_error()
// periodically retry // periodically retry
if (mLastProxyCheck < time(NULL) - (selfCheckPeroid >> 1) && mTask == ctRunSetUp) { if (mLastProxyCheck < time(NULL) - (selfCheckPeroid >> 1) && mTask == ctRunSetUp) {
RsDbg() << __PRETTY_FUNCTION__ << " retrying" << std::endl; RS_DBG("retrying") << std::endl;
mLastProxyCheck = time(NULL); mLastProxyCheck = time(NULL);
mErrorMsg.clear(); mErrorMsg.clear();
@ -700,7 +697,7 @@ int p3I2pBob::stateMachineController_locked_error()
// check for new tickets // check for new tickets
if (!mPending.empty()) { if (!mPending.empty()) {
Dbg4() << __PRETTY_FUNCTION__ << " processing new ticket" << std::endl; RS_DBG4("processing new ticket") << std::endl;
// reset and try new task // reset and try new task
mTask = ctIdle; mTask = ctIdle;
@ -731,7 +728,7 @@ RsSerialiser *p3I2pBob::setupSerialiser()
bool p3I2pBob::saveList(bool &cleanup, std::list<RsItem *> &lst) bool p3I2pBob::saveList(bool &cleanup, std::list<RsItem *> &lst)
{ {
Dbg4() << __PRETTY_FUNCTION__ << std::endl; RS_DBG4("") << std::endl;
cleanup = true; cleanup = true;
RsConfigKeyValueSet *vitem = new RsConfigKeyValueSet; RsConfigKeyValueSet *vitem = new RsConfigKeyValueSet;
@ -766,7 +763,7 @@ bool p3I2pBob::saveList(bool &cleanup, std::list<RsItem *> &lst)
bool p3I2pBob::loadList(std::list<RsItem *> &load) bool p3I2pBob::loadList(std::list<RsItem *> &load)
{ {
Dbg4() << __PRETTY_FUNCTION__ << std::endl; RS_DBG4("") << std::endl;
for(std::list<RsItem*>::const_iterator it = load.begin(); it!=load.end(); ++it) { for(std::list<RsItem*>::const_iterator it = load.begin(); it!=load.end(); ++it) {
RsConfigKeyValueSet *vitem = dynamic_cast<RsConfigKeyValueSet*>(*it); RsConfigKeyValueSet *vitem = dynamic_cast<RsConfigKeyValueSet*>(*it);
@ -786,7 +783,7 @@ bool p3I2pBob::loadList(std::list<RsItem *> &load)
getKVSUInt(kit, kConfigKeyOutQuantity, mSetting.outQuantity) getKVSUInt(kit, kConfigKeyOutQuantity, mSetting.outQuantity)
getKVSUInt(kit, kConfigKeyOutVariance, mSetting.outVariance) getKVSUInt(kit, kConfigKeyOutVariance, mSetting.outVariance)
else else
RsDbg() << __PRETTY_FUNCTION__ << " unknown key: " + kit->key << std::endl; RS_DBG("unknown key: " + kit->key) << std::endl;
} }
} }
delete vitem; delete vitem;
@ -850,7 +847,7 @@ void p3I2pBob::getStates(bobStates *bs)
std::string p3I2pBob::executeCommand(const std::string &command) std::string p3I2pBob::executeCommand(const std::string &command)
{ {
Dbg4() << __PRETTY_FUNCTION__ << " running '" + command + "'" << std::endl; RS_DBG4("running '" + command + "'") << std::endl;
std::string copy = command; std::string copy = command;
copy.push_back('\n'); copy.push_back('\n');
@ -862,7 +859,7 @@ std::string p3I2pBob::executeCommand(const std::string &command)
// receive answer (trailing new line is already removed!) // receive answer (trailing new line is already removed!)
std::string ans = recv(); std::string ans = recv();
Dbg4() << __PRETTY_FUNCTION__ << " answer '" + ans + "'" << std::endl; RS_DBG4("answer '" + ans + "'") << std::endl;
return ans; return ans;
} }
@ -872,7 +869,7 @@ bool p3I2pBob::connectI2P()
// there is only one thread that touches mSocket - no need for a lock // there is only one thread that touches mSocket - no need for a lock
if (mSocket != 0) { if (mSocket != 0) {
RsDbg() << __PRETTY_FUNCTION__ << " mSocket != 0" << std::endl; RS_DBG("mSocket != 0") << std::endl;
return false; return false;
} }
@ -880,21 +877,21 @@ bool p3I2pBob::connectI2P()
mSocket = unix_socket(PF_INET, SOCK_STREAM, 0); mSocket = unix_socket(PF_INET, SOCK_STREAM, 0);
if (mSocket < 0) if (mSocket < 0)
{ {
RsDbg() << __PRETTY_FUNCTION__ << " Failed to open socket! Socket Error: " + socket_errorType(errno) << std::endl; RS_DBG("Failed to open socket! Socket Error: " + socket_errorType(errno)) << std::endl;
return false; return false;
} }
// connect // connect
int err = unix_connect(mSocket, mI2PProxyAddr); int err = unix_connect(mSocket, mI2PProxyAddr);
if (err != 0) { if (err != 0) {
RsDbg() << __PRETTY_FUNCTION__ << " Failed to connect to BOB! Socket Error: " + socket_errorType(errno) << std::endl; RS_DBG("Failed to connect to BOB! Socket Error: " + socket_errorType(errno)) << std::endl;
return false; return false;
} }
// receive hello msg // receive hello msg
recv(); recv();
Dbg4() << __PRETTY_FUNCTION__ << " done" << std::endl; RS_DBG4("done") << std::endl;
return true; return true;
} }
@ -903,17 +900,17 @@ bool p3I2pBob::disconnectI2P()
// there is only one thread that touches mSocket - no need for a lock // there is only one thread that touches mSocket - no need for a lock
if (mSocket == 0) { if (mSocket == 0) {
RsDbg() << __PRETTY_FUNCTION__ << " mSocket == 0" << std::endl; RS_DBG("mSocket == 0") << std::endl;
return true; return true;
} }
int err = unix_close(mSocket); int err = unix_close(mSocket);
if (err != 0) { if (err != 0) {
RsDbg() << __PRETTY_FUNCTION__ << " Failed to close socket! Socket Error: " + socket_errorType(errno) << std::endl; RS_DBG("Failed to close socket! Socket Error: " + socket_errorType(errno)) << std::endl;
return false; return false;
} }
Dbg4() << __PRETTY_FUNCTION__ << " done" << std::endl; RS_DBG4("done") << std::endl;
mSocket = 0; mSocket = 0;
return true; return true;
} }
@ -934,7 +931,7 @@ std::string toString(const std::string &a, const int8_t b) {
void p3I2pBob::finalizeSettings_locked() void p3I2pBob::finalizeSettings_locked()
{ {
Dbg4() << __PRETTY_FUNCTION__ << std::endl; RS_DBG4("") << std::endl;
sockaddr_storage_clear(mI2PProxyAddr); sockaddr_storage_clear(mI2PProxyAddr);
// get i2p proxy addr // get i2p proxy addr
@ -945,8 +942,8 @@ void p3I2pBob::finalizeSettings_locked()
sockaddr_storage_setipv4(mI2PProxyAddr, (sockaddr_in*)&proxy); sockaddr_storage_setipv4(mI2PProxyAddr, (sockaddr_in*)&proxy);
sockaddr_storage_setport(mI2PProxyAddr, 2827); sockaddr_storage_setport(mI2PProxyAddr, 2827);
Dbg4() << __PRETTY_FUNCTION__ << " using " + sockaddr_storage_tostring(mI2PProxyAddr) << std::endl; RS_DBG4("using " + sockaddr_storage_tostring(mI2PProxyAddr)) << std::endl;
Dbg4() << __PRETTY_FUNCTION__ << " using " + mSetting.address.base32 << std::endl; RS_DBG4("using " + mSetting.address.base32) << std::endl;
peerState ps; peerState ps;
mPeerMgr->getOwnNetStatus(ps); mPeerMgr->getOwnNetStatus(ps);
@ -961,7 +958,7 @@ void p3I2pBob::finalizeSettings_locked()
std::vector<uint8_t> tmp(len); std::vector<uint8_t> tmp(len);
RSRandom::random_bytes(tmp.data(), len); RSRandom::random_bytes(tmp.data(), len);
const std::string location = Radix32::encode(tmp.data(), len); const std::string location = Radix32::encode(tmp.data(), len);
Dbg4() << __PRETTY_FUNCTION__ << " using suffix " + location << std::endl; RS_DBG4("using suffix " + location) << std::endl;
mTunnelName = "RetroShare-" + location; mTunnelName = "RetroShare-" + location;
const std::string setnick = "setnick RetroShare-" + location; const std::string setnick = "setnick RetroShare-" + location;
@ -1029,7 +1026,7 @@ void p3I2pBob::finalizeSettings_locked()
void p3I2pBob::updateSettings_locked() void p3I2pBob::updateSettings_locked()
{ {
Dbg4() << __PRETTY_FUNCTION__ << std::endl; RS_DBG4("") << std::endl;
sockaddr_storage proxy; sockaddr_storage proxy;
mPeerMgr->getProxyServerAddress(RS_HIDDEN_TYPE_I2P, proxy); mPeerMgr->getProxyServerAddress(RS_HIDDEN_TYPE_I2P, proxy);
@ -1105,7 +1102,7 @@ std::string p3I2pBob::recv()
// sanity check // sanity check
if (length != bufferSize) { if (length != bufferSize) {
// expectation: a full buffer was peeked) // expectation: a full buffer was peeked)
Dbg1() << __PRETTY_FUNCTION__ << " peeked less than bufferSize but also didn't found a new line character" << std::endl; RS_DBG1("peeked less than bufferSize but also didn't found a new line character") << std::endl;
} }
// this should never happen // this should never happen
assert(length <= bufferSize); assert(length <= bufferSize);