mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-29 01:16:20 -05:00
Added Random Timeouts / Retries to p3bitdht level.
* Fixed UdpRelay Interface Output. * added more variables to ConnectStateBox. * Changed Wait logic from sec since last attempt, to explicit attemptTS. * Improved PeerConnectStateBox::connectState(). * Added RETRY_ATTEMPT updateCB. * removed stupid clearing of addresses (killed Relay connections). * added more debugging git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4455 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a63173b19e
commit
a5c77d02e7
@ -26,6 +26,8 @@
|
|||||||
#include "dht/connectstatebox.h"
|
#include "dht/connectstatebox.h"
|
||||||
#include "retroshare/rsconfig.h"
|
#include "retroshare/rsconfig.h"
|
||||||
|
|
||||||
|
#include "util/rsrandom.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
@ -34,32 +36,49 @@
|
|||||||
#ifdef TESTING_PERIODS
|
#ifdef TESTING_PERIODS
|
||||||
#define FAILED_WAIT_TIME (1800) // 5 minutes.
|
#define FAILED_WAIT_TIME (1800) // 5 minutes.
|
||||||
#define TCP_WAIT_TIME (10) // 1/6 minutes.
|
#define TCP_WAIT_TIME (10) // 1/6 minutes.
|
||||||
#define DIRECT_WAIT_TIME (10) // 1/6 minutes.
|
#define DIRECT_MAX_WAIT_TIME (30) // 1/6 minutes.
|
||||||
#define PROXY_WAIT_TIME (30) // 1/6 minutes.
|
#define PROXY_MAX_WAIT_TIME (30) // 1/6 minutes.
|
||||||
#define RELAY_WAIT_TIME (30) // 1/6 minutes.
|
#define RELAY_MAX_WAIT_TIME (30) // 1/6 minutes.
|
||||||
#define REVERSE_WAIT_TIME (30) // 1/2 minutes.
|
#define REVERSE_WAIT_TIME (30) // 1/2 minutes.
|
||||||
|
|
||||||
|
#define MAX_DIRECT_ATTEMPTS (3)
|
||||||
|
#define MAX_PROXY_ATTEMPTS (3)
|
||||||
|
#define MAX_RELAY_ATTEMPTS (3)
|
||||||
|
|
||||||
|
#define MAX_DIRECT_FAILED_ATTEMPTS (1)
|
||||||
|
#define MAX_PROXY_FAILED_ATTEMPTS (1)
|
||||||
|
#define MAX_RELAY_FAILED_ATTEMPTS (1)
|
||||||
#else
|
#else
|
||||||
#define FAILED_WAIT_TIME (1800) // 30 minutes.
|
#define FAILED_WAIT_TIME (1800) // 30 minutes.
|
||||||
#define TCP_WAIT_TIME (60) // 1 minutes.
|
#define TCP_WAIT_TIME (60) // 1 minutes.
|
||||||
#define DIRECT_WAIT_TIME (60) // 1 minutes.
|
#define DIRECT_MAX_WAIT_TIME (60) // 1 minutes.
|
||||||
#define PROXY_WAIT_TIME (60) // 1 minutes.
|
#define PROXY_MAX_WAIT_TIME (60) // 1 minutes.
|
||||||
#define RELAY_WAIT_TIME (60) // 1 minutes.
|
#define RELAY_MAX_WAIT_TIME (60) // 1 minutes.
|
||||||
#define REVERSE_WAIT_TIME (300) // 5 minutes.
|
#define REVERSE_WAIT_TIME (300) // 5 minutes.
|
||||||
|
|
||||||
|
#define MAX_DIRECT_ATTEMPTS (10)
|
||||||
|
#define MAX_PROXY_ATTEMPTS (10)
|
||||||
|
#define MAX_RELAY_ATTEMPTS (10)
|
||||||
|
|
||||||
|
#define MAX_DIRECT_FAILED_ATTEMPTS (3)
|
||||||
|
#define MAX_PROXY_FAILED_ATTEMPTS (3)
|
||||||
|
#define MAX_RELAY_FAILED_ATTEMPTS (3)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define MAX_DIRECT_ATTEMPTS (3)
|
|
||||||
#define MAX_PROXY_ATTEMPTS (3)
|
|
||||||
#define MAX_RELAY_ATTEMPTS (3)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PeerConnectStateBox::PeerConnectStateBox()
|
PeerConnectStateBox::PeerConnectStateBox()
|
||||||
{
|
{
|
||||||
//mPeerId = id;
|
//mPeerId = id;
|
||||||
|
time_t now = time(NULL);
|
||||||
mState = CSB_START;
|
mState = CSB_START;
|
||||||
mNetState = CSB_NETSTATE_UNKNOWN;
|
mNetState = CSB_NETSTATE_UNKNOWN;
|
||||||
mStateTS = 0;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
|
mNextAttemptTS = now;
|
||||||
|
mAttemptLength = 0;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -210,7 +229,18 @@ std::string PeerConnectStateBox::connectState() const
|
|||||||
std::string str = StateAsString(mState);
|
std::string str = StateAsString(mState);
|
||||||
std::ostringstream out;
|
std::ostringstream out;
|
||||||
time_t now = time(NULL);
|
time_t now = time(NULL);
|
||||||
out << str << "(" << mNoAttempts << ") for " << now - mStateTS << " secs";
|
out << str << "(" << mNoAttempts << "/" << mNoFailedAttempts << ") for " << now - mStateTS << " secs";
|
||||||
|
out << " LA: " << mAttemptLength;
|
||||||
|
if ( (mState == CSB_CONNECTED) || (mState == CSB_DIRECT_ATTEMPT) ||
|
||||||
|
(mState == CSB_PROXY_ATTEMPT) || (mState == CSB_RELAY_ATTEMPT) )
|
||||||
|
{
|
||||||
|
// nothing here... as we are not dependent on the timer.
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
out << " NextAttempt: " << mNextAttemptTS - now;
|
||||||
|
}
|
||||||
|
|
||||||
return out.str();
|
return out.str();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -327,7 +357,8 @@ uint32_t PeerConnectStateBox::connectCb_direct()
|
|||||||
case CSB_FAILED_WAIT:
|
case CSB_FAILED_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < FAILED_WAIT_TIME)
|
//if (now - mStateTS < FAILED_WAIT_TIME)
|
||||||
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
@ -354,13 +385,16 @@ uint32_t PeerConnectStateBox::connectCb_direct()
|
|||||||
retval = CSB_ACTION_TCP_CONN;
|
retval = CSB_ACTION_TCP_CONN;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
|
mNextAttemptTS = now + TCP_WAIT_TIME;
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CSB_TCP_WAIT:
|
case CSB_TCP_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < TCP_WAIT_TIME)
|
//if (now - mStateTS < TCP_WAIT_TIME)
|
||||||
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
@ -372,6 +406,7 @@ uint32_t PeerConnectStateBox::connectCb_direct()
|
|||||||
retval = CSB_ACTION_DIRECT_CONN | CSB_ACTION_DHT_PORT;
|
retval = CSB_ACTION_DIRECT_CONN | CSB_ACTION_DHT_PORT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -379,18 +414,23 @@ uint32_t PeerConnectStateBox::connectCb_direct()
|
|||||||
case CSB_DIRECT_WAIT:
|
case CSB_DIRECT_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < DIRECT_WAIT_TIME)
|
//if (now - mStateTS < DIRECT_WAIT_TIME)
|
||||||
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
}
|
}
|
||||||
else if (mNoAttempts >= MAX_DIRECT_ATTEMPTS) /* if too many attempts */
|
else if ((mNoAttempts >= MAX_DIRECT_ATTEMPTS) ||
|
||||||
|
(mNoFailedAttempts >= MAX_DIRECT_FAILED_ATTEMPTS))
|
||||||
{
|
{
|
||||||
|
/* if too many attempts */
|
||||||
/* no RELAY attempt => FAILED_WAIT */
|
/* no RELAY attempt => FAILED_WAIT */
|
||||||
mState = CSB_FAILED_WAIT;
|
mState = CSB_FAILED_WAIT;
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
|
mNextAttemptTS = now + FAILED_WAIT_TIME;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -453,7 +493,8 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
case CSB_FAILED_WAIT:
|
case CSB_FAILED_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < FAILED_WAIT_TIME)
|
//if (now - mStateTS < FAILED_WAIT_TIME)
|
||||||
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
stateMsg(std::cerr, "too soon, no action", 0);
|
stateMsg(std::cerr, "too soon, no action", 0);
|
||||||
@ -479,13 +520,15 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
retval = CSB_ACTION_WAIT; /* NO POINT TRYING A TCP_CONN */
|
retval = CSB_ACTION_WAIT; /* NO POINT TRYING A TCP_CONN */
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
|
mNextAttemptTS = now + TCP_WAIT_TIME;
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CSB_TCP_WAIT:
|
case CSB_TCP_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < TCP_WAIT_TIME)
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
@ -509,6 +552,7 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
|
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -516,20 +560,23 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
case CSB_PROXY_WAIT:
|
case CSB_PROXY_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < PROXY_WAIT_TIME)
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
stateMsg(std::cerr, "too soon, no action", 0);
|
stateMsg(std::cerr, "too soon, no action", 0);
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
}
|
}
|
||||||
else if (mNoAttempts >= MAX_PROXY_ATTEMPTS) /* if too many attempts */
|
else if ((mNoAttempts >= MAX_PROXY_ATTEMPTS) ||
|
||||||
|
(mNoFailedAttempts >= MAX_PROXY_FAILED_ATTEMPTS))
|
||||||
{
|
{
|
||||||
|
/* if too many attempts */
|
||||||
/* switch to RELAY attempt */
|
/* switch to RELAY attempt */
|
||||||
stateMsg(std::cerr, "too many PROXY => RELAY_ATTEMPT", 0);
|
stateMsg(std::cerr, "too many PROXY => RELAY_ATTEMPT", 0);
|
||||||
mState = CSB_RELAY_ATTEMPT;
|
mState = CSB_RELAY_ATTEMPT;
|
||||||
retval = CSB_ACTION_RELAY_CONN | CSB_ACTION_DHT_PORT;
|
retval = CSB_ACTION_RELAY_CONN | CSB_ACTION_DHT_PORT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -546,7 +593,8 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
case CSB_REVERSE_WAIT:
|
case CSB_REVERSE_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < REVERSE_WAIT_TIME)
|
//if (now - mStateTS < REVERSE_WAIT_TIME)
|
||||||
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
stateMsg(std::cerr, "too soon, no action", 0);
|
stateMsg(std::cerr, "too soon, no action", 0);
|
||||||
@ -560,6 +608,7 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
retval = CSB_ACTION_RELAY_CONN | CSB_ACTION_DHT_PORT;
|
retval = CSB_ACTION_RELAY_CONN | CSB_ACTION_DHT_PORT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -567,20 +616,24 @@ uint32_t PeerConnectStateBox::connectCb_unreachable()
|
|||||||
case CSB_RELAY_WAIT:
|
case CSB_RELAY_WAIT:
|
||||||
{
|
{
|
||||||
/* if too soon */
|
/* if too soon */
|
||||||
if (now - mStateTS < RELAY_WAIT_TIME)
|
if (mNextAttemptTS > now)
|
||||||
{
|
{
|
||||||
/* same state */
|
/* same state */
|
||||||
stateMsg(std::cerr, "too soon, no action", 0);
|
stateMsg(std::cerr, "too soon, no action", 0);
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
}
|
}
|
||||||
else if (mNoAttempts >= MAX_RELAY_ATTEMPTS) /* if too many attempts */
|
else if ((mNoAttempts >= MAX_RELAY_ATTEMPTS) ||
|
||||||
|
(mNoFailedAttempts >= MAX_RELAY_FAILED_ATTEMPTS))
|
||||||
{
|
{
|
||||||
|
/* if too many attempts */
|
||||||
/* switch to RELAY attempt */
|
/* switch to RELAY attempt */
|
||||||
stateMsg(std::cerr, "too many RELAY => FAILED_WAIT", 0);
|
stateMsg(std::cerr, "too many RELAY => FAILED_WAIT", 0);
|
||||||
mState = CSB_FAILED_WAIT;
|
mState = CSB_FAILED_WAIT;
|
||||||
retval = CSB_ACTION_WAIT;
|
retval = CSB_ACTION_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
|
mNoFailedAttempts = 0;
|
||||||
|
mNextAttemptTS = now + FAILED_WAIT_TIME;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -615,29 +668,31 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
* Possible Errors:
|
* Possible Errors:
|
||||||
* 1) AUTH DENIED. (fatal)
|
* 1) AUTH DENIED. (fatal)
|
||||||
* 2) MODE UNAVILABLE
|
* 2) MODE UNAVILABLE
|
||||||
* 3) FAILED ATTEMPT
|
* 3) RETRY ATTEMPT
|
||||||
* 4) CONNECTION
|
* 4) FAILED ATTEMPT
|
||||||
* 5) DISCONNECTED.
|
* 5) CONNECTION
|
||||||
|
* 6) DISCONNECTED.
|
||||||
*
|
*
|
||||||
* Fitting these into the states:
|
* Fitting these into the states:
|
||||||
case CSB_START:
|
case CSB_START:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
case CSB_CONNECTED:
|
case CSB_CONNECTED:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
DISCONNECTED => CSB_START
|
DISCONNECTED => CSB_START
|
||||||
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT
|
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT
|
||||||
|
|
||||||
case CSB_FAILED_WAIT:
|
case CSB_FAILED_WAIT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
case CSB_REVERSE_WAIT:
|
case CSB_REVERSE_WAIT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
case CSB_DIRECT_ATTEMPT:
|
case CSB_DIRECT_ATTEMPT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
AUTH DENIED => CSB_FAILED_WAIT
|
AUTH DENIED => CSB_FAILED_WAIT
|
||||||
FAILED ATTEMPT => stay here.
|
FAILED ATTEMPT => stay here.
|
||||||
|
RETRY ATTEMPT => stay here
|
||||||
MODE UNAVAILABLE - probably error => CSB_FAILED_WAIT
|
MODE UNAVAILABLE - probably error => CSB_FAILED_WAIT
|
||||||
error if: MODE UNAVAILABLE, DISCONNECTED
|
error if: MODE UNAVAILABLE, DISCONNECTED
|
||||||
|
|
||||||
@ -645,6 +700,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
AUTH DENIED => CSB_FAILED_WAIT
|
AUTH DENIED => CSB_FAILED_WAIT
|
||||||
FAILED ATTEMPT => stay here.
|
FAILED ATTEMPT => stay here.
|
||||||
|
RETRY ATTEMPT => stay here
|
||||||
MODE_UNAVAILABLE => CSB_REVERSE_WAIT | CSB_RELAY_ATTEMPT
|
MODE_UNAVAILABLE => CSB_REVERSE_WAIT | CSB_RELAY_ATTEMPT
|
||||||
error if: DISCONNECTED
|
error if: DISCONNECTED
|
||||||
|
|
||||||
@ -652,18 +708,19 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
AUTH DENIED => CSB_FAILED_WAIT
|
AUTH DENIED => CSB_FAILED_WAIT
|
||||||
FAILED ATTEMPT => stay here.
|
FAILED ATTEMPT => stay here.
|
||||||
|
RETRY ATTEMPT => stay here
|
||||||
MODE_UNAVAILABLE => CSB_FAILED_WAIT
|
MODE_UNAVAILABLE => CSB_FAILED_WAIT
|
||||||
error if: DISCONNECTED
|
error if: DISCONNECTED
|
||||||
|
|
||||||
case CSB_DIRECT_WAIT:
|
case CSB_DIRECT_WAIT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
case CSB_PROXY_WAIT:
|
case CSB_PROXY_WAIT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH_DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH_DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
case CSB_RELAY_ATTEMPT:
|
case CSB_RELAY_ATTEMPT:
|
||||||
CONNECTION => CSB_CONNECTED
|
CONNECTION => CSB_CONNECTED
|
||||||
error if: AUTH_DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, DISCONNECTED
|
error if: AUTH_DENIED, MODE UNAVAILABLE, FAILED ATTEMPT, RETRY ATTEMPT, DISCONNECTED
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* DO Connect / Disconnect Updates ... very specific! */
|
/* DO Connect / Disconnect Updates ... very specific! */
|
||||||
@ -672,9 +729,19 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
{
|
{
|
||||||
case CSB_UPDATE_CONNECTED:
|
case CSB_UPDATE_CONNECTED:
|
||||||
{
|
{
|
||||||
|
if ((mState == CSB_DIRECT_ATTEMPT) || (mState == CSB_PROXY_ATTEMPT) || (mState == CSB_PROXY_ATTEMPT))
|
||||||
|
{
|
||||||
|
mAttemptLength = now - mStateTS;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mAttemptLength = 0;
|
||||||
|
}
|
||||||
|
|
||||||
stateMsg(std::cerr, "=> CONNECTED", update);
|
stateMsg(std::cerr, "=> CONNECTED", update);
|
||||||
mState = CSB_CONNECTED;
|
mState = CSB_CONNECTED;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -740,27 +807,63 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
stateMsg(std::cerr, "=> FAILED WAIT", update);
|
stateMsg(std::cerr, "=> FAILED WAIT", update);
|
||||||
mState = CSB_FAILED_WAIT;
|
mState = CSB_FAILED_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mAttemptLength = now - mStateTS;
|
||||||
|
mNextAttemptTS = now + FAILED_WAIT_TIME;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
/* if standard FAIL => stay where we are */
|
/* if standard FAIL => stay where we are */
|
||||||
case CSB_UPDATE_FAILED_ATTEMPT:
|
case CSB_UPDATE_RETRY_ATTEMPT:
|
||||||
{
|
{
|
||||||
stateMsg(std::cerr, "STANDARD FAIL => switch to wait state", update);
|
stateMsg(std::cerr, "RETRY FAIL => switch to wait state", update);
|
||||||
|
mAttemptLength = now - mStateTS;
|
||||||
switch(mState)
|
switch(mState)
|
||||||
{
|
{
|
||||||
case CSB_DIRECT_ATTEMPT:
|
case CSB_DIRECT_ATTEMPT:
|
||||||
mState = CSB_DIRECT_WAIT;
|
mState = CSB_DIRECT_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % DIRECT_MAX_WAIT_TIME;
|
||||||
break;
|
break;
|
||||||
case CSB_PROXY_ATTEMPT:
|
case CSB_PROXY_ATTEMPT:
|
||||||
mState = CSB_PROXY_WAIT;
|
mState = CSB_PROXY_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % PROXY_MAX_WAIT_TIME;
|
||||||
break;
|
break;
|
||||||
case CSB_RELAY_ATTEMPT:
|
case CSB_RELAY_ATTEMPT:
|
||||||
mState = CSB_RELAY_WAIT;
|
mState = CSB_RELAY_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % RELAY_MAX_WAIT_TIME;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
stateMsg(std::cerr, "RETRY FAIL, but unusual state", update);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
/* if standard FAIL => stay where we are */
|
||||||
|
case CSB_UPDATE_FAILED_ATTEMPT:
|
||||||
|
{
|
||||||
|
stateMsg(std::cerr, "STANDARD FAIL => switch to wait state", update);
|
||||||
|
mNoFailedAttempts++;
|
||||||
|
mAttemptLength = now - mStateTS;
|
||||||
|
switch(mState)
|
||||||
|
{
|
||||||
|
case CSB_DIRECT_ATTEMPT:
|
||||||
|
mState = CSB_DIRECT_WAIT;
|
||||||
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % DIRECT_MAX_WAIT_TIME;
|
||||||
|
break;
|
||||||
|
case CSB_PROXY_ATTEMPT:
|
||||||
|
mState = CSB_PROXY_WAIT;
|
||||||
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % PROXY_MAX_WAIT_TIME;
|
||||||
|
break;
|
||||||
|
case CSB_RELAY_ATTEMPT:
|
||||||
|
mState = CSB_RELAY_WAIT;
|
||||||
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % RELAY_MAX_WAIT_TIME;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
stateMsg(std::cerr, "STANDARD FAIL, but unusual state", update);
|
stateMsg(std::cerr, "STANDARD FAIL, but unusual state", update);
|
||||||
@ -774,6 +877,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
/* finally MODE_UNAVAILABLE */
|
/* finally MODE_UNAVAILABLE */
|
||||||
case CSB_UPDATE_MODE_UNAVAILABLE:
|
case CSB_UPDATE_MODE_UNAVAILABLE:
|
||||||
{
|
{
|
||||||
|
mAttemptLength = now - mStateTS;
|
||||||
if (mState == CSB_PROXY_ATTEMPT)
|
if (mState == CSB_PROXY_ATTEMPT)
|
||||||
{
|
{
|
||||||
if (mNetState == CSB_NETSTATE_FORWARD)
|
if (mNetState == CSB_NETSTATE_FORWARD)
|
||||||
@ -781,6 +885,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
stateMsg(std::cerr, "as FORWARDED => REVERSE_WAIT", update);
|
stateMsg(std::cerr, "as FORWARDED => REVERSE_WAIT", update);
|
||||||
mState = CSB_REVERSE_WAIT;
|
mState = CSB_REVERSE_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + REVERSE_WAIT_TIME;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -788,6 +893,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
mState = CSB_RELAY_WAIT;
|
mState = CSB_RELAY_WAIT;
|
||||||
mNoAttempts = 0;
|
mNoAttempts = 0;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + RSRandom::random_u32() % RELAY_MAX_WAIT_TIME;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -796,6 +902,7 @@ uint32_t PeerConnectStateBox::updateCb(uint32_t update)
|
|||||||
stateMsg(std::cerr, "MODE UNAVAIL => FAILED_WAIT", update);
|
stateMsg(std::cerr, "MODE UNAVAIL => FAILED_WAIT", update);
|
||||||
mState = CSB_FAILED_WAIT;
|
mState = CSB_FAILED_WAIT;
|
||||||
mStateTS = now;
|
mStateTS = now;
|
||||||
|
mNextAttemptTS = now + FAILED_WAIT_TIME;
|
||||||
|
|
||||||
if ((mState == CSB_DIRECT_ATTEMPT)
|
if ((mState == CSB_DIRECT_ATTEMPT)
|
||||||
|| (mState == CSB_PROXY_ATTEMPT))
|
|| (mState == CSB_PROXY_ATTEMPT))
|
||||||
|
@ -68,8 +68,9 @@
|
|||||||
#define CSB_UPDATE_CONNECTED 0x0001
|
#define CSB_UPDATE_CONNECTED 0x0001
|
||||||
#define CSB_UPDATE_DISCONNECTED 0x0002
|
#define CSB_UPDATE_DISCONNECTED 0x0002
|
||||||
#define CSB_UPDATE_AUTH_DENIED 0x0003
|
#define CSB_UPDATE_AUTH_DENIED 0x0003
|
||||||
#define CSB_UPDATE_FAILED_ATTEMPT 0x0004
|
#define CSB_UPDATE_RETRY_ATTEMPT 0x0004
|
||||||
#define CSB_UPDATE_MODE_UNAVAILABLE 0x0005
|
#define CSB_UPDATE_FAILED_ATTEMPT 0x0005
|
||||||
|
#define CSB_UPDATE_MODE_UNAVAILABLE 0x0006
|
||||||
|
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -108,6 +109,9 @@ class PeerConnectStateBox
|
|||||||
uint32_t mNetState;
|
uint32_t mNetState;
|
||||||
time_t mStateTS;
|
time_t mStateTS;
|
||||||
uint32_t mNoAttempts;
|
uint32_t mNoAttempts;
|
||||||
|
uint32_t mNoFailedAttempts;
|
||||||
|
time_t mNextAttemptTS;
|
||||||
|
time_t mAttemptLength;
|
||||||
|
|
||||||
// ProxyPort Storage.
|
// ProxyPort Storage.
|
||||||
uint32_t mProxyPortFlags;
|
uint32_t mProxyPortFlags;
|
||||||
|
@ -213,18 +213,23 @@ void convertDhtPeerDetailsToRsDhtNetPeer(RsDhtNetPeer &status, const DhtPeerDeta
|
|||||||
|
|
||||||
void convertUdpRelayEndtoRsDhtRelayEnd(RsDhtRelayEnd &end, const UdpRelayEnd &int_end)
|
void convertUdpRelayEndtoRsDhtRelayEnd(RsDhtRelayEnd &end, const UdpRelayEnd &int_end)
|
||||||
{
|
{
|
||||||
std::ostringstream addr;
|
{
|
||||||
addr << rs_inet_ntoa(int_end.mLocalAddr.sin_addr) << ":" << ntohs(int_end.mLocalAddr.sin_port);
|
std::ostringstream addr;
|
||||||
end.mLocalAddr = addr.str();
|
addr << rs_inet_ntoa(int_end.mLocalAddr.sin_addr) << ":" << ntohs(int_end.mLocalAddr.sin_port);
|
||||||
|
end.mLocalAddr = addr.str();
|
||||||
|
}
|
||||||
|
|
||||||
addr.clear();
|
{
|
||||||
addr << rs_inet_ntoa(int_end.mProxyAddr.sin_addr) << ":" << ntohs(int_end.mProxyAddr.sin_port);
|
std::ostringstream addr;
|
||||||
end.mProxyAddr = addr.str();
|
addr << rs_inet_ntoa(int_end.mProxyAddr.sin_addr) << ":" << ntohs(int_end.mProxyAddr.sin_port);
|
||||||
|
end.mProxyAddr = addr.str();
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
addr.clear();
|
std::ostringstream addr;
|
||||||
addr << rs_inet_ntoa(int_end.mRemoteAddr.sin_addr) << ":" << ntohs(int_end.mRemoteAddr.sin_port);
|
addr << rs_inet_ntoa(int_end.mRemoteAddr.sin_addr) << ":" << ntohs(int_end.mRemoteAddr.sin_port);
|
||||||
end.mRemoteAddr = addr.str();
|
end.mRemoteAddr = addr.str();
|
||||||
|
}
|
||||||
|
|
||||||
end.mCreateTS = 0;
|
end.mCreateTS = 0;
|
||||||
return;
|
return;
|
||||||
@ -232,13 +237,17 @@ void convertUdpRelayEndtoRsDhtRelayEnd(RsDhtRelayEnd &end, const UdpRelayEnd &in
|
|||||||
|
|
||||||
void convertUdpRelayProxytoRsDhtRelayProxy(RsDhtRelayProxy &proxy, const UdpRelayProxy &int_proxy)
|
void convertUdpRelayProxytoRsDhtRelayProxy(RsDhtRelayProxy &proxy, const UdpRelayProxy &int_proxy)
|
||||||
{
|
{
|
||||||
std::ostringstream addr;
|
{
|
||||||
addr << rs_inet_ntoa(int_proxy.mAddrs.mSrcAddr.sin_addr) << ":" << ntohs(int_proxy.mAddrs.mSrcAddr.sin_port);
|
std::ostringstream addr;
|
||||||
proxy.mSrcAddr = addr.str();
|
addr << rs_inet_ntoa(int_proxy.mAddrs.mSrcAddr.sin_addr) << ":" << ntohs(int_proxy.mAddrs.mSrcAddr.sin_port);
|
||||||
|
proxy.mSrcAddr = addr.str();
|
||||||
|
}
|
||||||
|
|
||||||
addr.clear();
|
{
|
||||||
addr << rs_inet_ntoa(int_proxy.mAddrs.mDestAddr.sin_addr) << ":" << ntohs(int_proxy.mAddrs.mDestAddr.sin_port);
|
std::ostringstream addr;
|
||||||
proxy.mDestAddr = addr.str();
|
addr << rs_inet_ntoa(int_proxy.mAddrs.mDestAddr.sin_addr) << ":" << ntohs(int_proxy.mAddrs.mDestAddr.sin_port);
|
||||||
|
proxy.mDestAddr = addr.str();
|
||||||
|
}
|
||||||
|
|
||||||
proxy.mBandwidth = int_proxy.mBandwidth;
|
proxy.mBandwidth = int_proxy.mBandwidth;
|
||||||
proxy.mRelayClass = int_proxy.mRelayClass;
|
proxy.mRelayClass = int_proxy.mRelayClass;
|
||||||
|
@ -877,14 +877,20 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
/* retry attempts */
|
||||||
|
case BITDHT_CONNECT_ERROR_TEMPUNAVAIL:
|
||||||
|
case BITDHT_CONNECT_ERROR_DUPLICATE:
|
||||||
|
{
|
||||||
|
updatecode = CSB_UPDATE_RETRY_ATTEMPT;
|
||||||
|
}
|
||||||
|
break;
|
||||||
/* standard failed attempts */
|
/* standard failed attempts */
|
||||||
case BITDHT_CONNECT_ERROR_GENERIC:
|
case BITDHT_CONNECT_ERROR_GENERIC:
|
||||||
case BITDHT_CONNECT_ERROR_PROTOCOL:
|
case BITDHT_CONNECT_ERROR_PROTOCOL:
|
||||||
case BITDHT_CONNECT_ERROR_TIMEOUT:
|
case BITDHT_CONNECT_ERROR_TIMEOUT:
|
||||||
case BITDHT_CONNECT_ERROR_TEMPUNAVAIL:
|
|
||||||
case BITDHT_CONNECT_ERROR_NOADDRESS:
|
case BITDHT_CONNECT_ERROR_NOADDRESS:
|
||||||
case BITDHT_CONNECT_ERROR_OVERLOADED:
|
case BITDHT_CONNECT_ERROR_OVERLOADED:
|
||||||
case BITDHT_CONNECT_ERROR_DUPLICATE:
|
|
||||||
/* CB_REQUEST errors */
|
/* CB_REQUEST errors */
|
||||||
case BITDHT_CONNECT_ERROR_TOOMANYRETRY:
|
case BITDHT_CONNECT_ERROR_TOOMANYRETRY:
|
||||||
case BITDHT_CONNECT_ERROR_OUTOFPROXY:
|
case BITDHT_CONNECT_ERROR_OUTOFPROXY:
|
||||||
@ -1502,10 +1508,6 @@ void p3BitDht::ConnectCalloutRelay(const std::string &peerId,
|
|||||||
struct sockaddr_in srcaddr, struct sockaddr_in proxyaddr, struct sockaddr_in destaddr,
|
struct sockaddr_in srcaddr, struct sockaddr_in proxyaddr, struct sockaddr_in destaddr,
|
||||||
uint32_t connectFlags, uint32_t bandwidth)
|
uint32_t connectFlags, uint32_t bandwidth)
|
||||||
{
|
{
|
||||||
|
|
||||||
sockaddr_clear(&proxyaddr);
|
|
||||||
sockaddr_clear(&srcaddr);
|
|
||||||
|
|
||||||
uint32_t source = RS_CB_DHT;
|
uint32_t source = RS_CB_DHT;
|
||||||
uint32_t delay = 0;
|
uint32_t delay = 0;
|
||||||
|
|
||||||
@ -1523,7 +1525,20 @@ void p3BitDht::ConnectCalloutRelay(const std::string &peerId,
|
|||||||
void p3BitDht::initiateConnection(const bdId *srcId, const bdId *proxyId, const bdId *destId, uint32_t mode, uint32_t loc, uint32_t answer)
|
void p3BitDht::initiateConnection(const bdId *srcId, const bdId *proxyId, const bdId *destId, uint32_t mode, uint32_t loc, uint32_t answer)
|
||||||
{
|
{
|
||||||
std::cerr << "p3BitDht::initiateConnection()";
|
std::cerr << "p3BitDht::initiateConnection()";
|
||||||
std::cerr << " mode: " << mode;
|
std::cerr << std::endl;
|
||||||
|
std::cerr << "\t srcId: ";
|
||||||
|
bdStdPrintId(std::cerr, srcId);
|
||||||
|
std::cerr << std::endl;
|
||||||
|
|
||||||
|
std::cerr << "\t proxyId: ";
|
||||||
|
bdStdPrintId(std::cerr, proxyId);
|
||||||
|
std::cerr << std::endl;
|
||||||
|
|
||||||
|
std::cerr << "\t destId: ";
|
||||||
|
bdStdPrintId(std::cerr, destId);
|
||||||
|
std::cerr << std::endl;
|
||||||
|
|
||||||
|
std::cerr << "\t Mode: " << mode << " loc: " << loc << " answer: " << answer;
|
||||||
std::cerr << std::endl;
|
std::cerr << std::endl;
|
||||||
|
|
||||||
bdId peerConnectId;
|
bdId peerConnectId;
|
||||||
@ -1634,7 +1649,7 @@ void p3BitDht::initiateConnection(const bdId *srcId, const bdId *proxyId, const
|
|||||||
|
|
||||||
case BITDHT_CONNECT_MODE_RELAY:
|
case BITDHT_CONNECT_MODE_RELAY:
|
||||||
touConnectMode = RSDHT_TOU_MODE_RELAY;
|
touConnectMode = RSDHT_TOU_MODE_RELAY;
|
||||||
connectFlags |= RS_CB_FLAG_MODE_UDP_DIRECT;
|
connectFlags |= RS_CB_FLAG_MODE_UDP_RELAY;
|
||||||
bandwidth = answer;
|
bandwidth = answer;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user