twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

delay torrent initialization

miguelfreitas
Miguel Freitas 11 years ago
parent
08cadbb78e
commit
0b906f2494
2 changed files with 32 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/clientversion.h
  2. 46
      src/twister.cpp

2
src/clientversion.h
Unescape View File

@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 9 #define CLIENT_VERSION_MINOR 9
#define CLIENT_VERSION_REVISION 9 #define CLIENT_VERSION_REVISION 10
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build // Set to true for release, false for prerelease or test build

46
src/twister.cpp
Unescape View File

@ -481,7 +481,8 @@ void ThreadMaintainDHTNodes()
void ThreadSessionAlerts() void ThreadSessionAlerts()
{ {
static map<sha1_hash, entry> neighborCheck; static map<sha1_hash, bool> neighborCheck;
static map<sha1_hash, bool> statusCheck;
while(!ses) { while(!ses) {
MilliSleep(200); MilliSleep(200);
@ -563,14 +564,22 @@ void ThreadSessionAlerts()
LOCK(cs_twister); LOCK(cs_twister);
knownTorrent = m_userTorrent.count(n->string()); knownTorrent = m_userTorrent.count(n->string());
} }
if( !neighborCheck.count(ih) && !knownTorrent ) { if( !knownTorrent ) {
printf("possiblyNeighbor of [%s,%s,%s] - starting a new dhtget to be sure\n", if( !neighborCheck.count(ih) ) {
n->string().c_str(), printf("possiblyNeighbor of [%s,%s,%s] - starting a new dhtget to be sure\n",
r->string().c_str(), n->string().c_str(),
t->string().c_str()); r->string().c_str(),
t->string().c_str());
neighborCheck[ih] = gd->m_target;
ses->dht_getData(n->string(), r->string(), t->string() == "m"); neighborCheck[ih] = false;
ses->dht_getData(n->string(), r->string(), t->string() == "m");
} else if( neighborCheck[ih] ) {
printf("known neighbor. starting a new dhtget check of [%s,%s,%s]\n",
n->string().c_str(), "status", "s");
sha1_hash ihStatus = dhtTargetHash(n->string(), "status", "s");
statusCheck[ihStatus] = false;
ses->dht_getData(n->string(), "status", false);
}
} }
} }
} }
@ -599,13 +608,20 @@ void ThreadSessionAlerts()
} }
} }
if( dd->m_is_neighbor && m_specialResources.count(dd->m_resource) && if( neighborCheck.count(ih) ) {
neighborCheck.count(ih) ) { neighborCheck[ih] = dd->m_is_neighbor;
// Do something! if( dd->m_is_neighbor && dd->m_resource == "tracker" ) {
if( dd->m_resource == "tracker" ) { printf("is neighbor. starting a new dhtget check of [%s,%s,%s]\n",
dd->m_username.c_str(), "status", "s");
sha1_hash ihStatus = dhtTargetHash(dd->m_username, "status", "s");
statusCheck[ihStatus] = false;
ses->dht_getData(dd->m_username, "status", false);
}
}
if( statusCheck.count(ih) ) {
statusCheck[ih] = dd->m_got_data;
if( dd->m_got_data ) {
startTorrentUser(dd->m_username, false); startTorrentUser(dd->m_username, false);
} else {
printf("Neighbor of special resource - do something!\n");
} }
} }
continue; continue;

Write Preview
Loading…
Cancel
Save