premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

support specifying salt to dht put tool

This commit is contained in:
arvidn 2020-03-16 15:01:47 +01:00 committed by Arvid Norberg
parent 83338a6cf0
commit aa6e7a501d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tools/dht_put.cpp
View File

@ -108,10 +108,12 @@ void usage()
" the specified file\n" " the specified file\n"
"dump-key <key-file> - dump ed25519 keypair from the specified key\n" "dump-key <key-file> - dump ed25519 keypair from the specified key\n"
" file.\n" " file.\n"
"mput <key-file> <string> - puts the specified string as a mutable\n" "mput <key-file> <string> [salt]\n"
" object under the public key in key-file\n" " - puts the specified string as a mutable\n"
"mget <public-key> - get a mutable object under the specified\n" " object under the public key in key-file,\n"
" public key\n" " and optionally specified salt\n"
"mget <public-key> [salt] - get a mutable object under the specified\n"
" public key, and salt (optional)\n"
); );
exit(1); exit(1);
} }
@ -126,10 +128,9 @@ alert* wait_for_alert(lt::session& s, int alert_type)
std::vector<alert*> alerts; std::vector<alert*> alerts;
s.pop_alerts(&alerts); s.pop_alerts(&alerts);
for (std::vector<alert*>::iterator i = alerts.begin() for (auto const a : alerts)
, end(alerts.end()); i != end; ++i)
{ {
if ((*i)->type() != alert_type) if (a->type() != alert_type)
{ {
static int spinner = 0; static int spinner = 0;
static const char anim[] = {'-', '\\', '|', '/'}; static const char anim[] = {'-', '\\', '|', '/'};
@ -139,7 +140,7 @@ alert* wait_for_alert(lt::session& s, int alert_type)
//print some alerts? //print some alerts?
continue; continue;
} }
ret = *i; ret = a;
found = true; found = true;
} }
} }
@ -360,12 +361,16 @@ int main(int argc, char* argv[])
public_key pk; public_key pk;
secret_key sk; secret_key sk;
std::tie(pk, sk) = ed25519_create_keypair(seed); std::tie(pk, sk) = ed25519_create_keypair(seed);
std::string salt;
if (argc > 1) salt = argv[1];
bootstrap(s); bootstrap(s);
s.dht_put_item(pk.bytes, std::bind(&put_string, _1, _2, _3, _4 s.dht_put_item(pk.bytes, std::bind(&put_string, _1, _2, _3, _4
, pk.bytes, sk.bytes, argv[0])); , pk.bytes, sk.bytes, argv[0]), salt);
std::printf("MPUT public key: %s\n", to_hex(pk.bytes).c_str()); std::printf("MPUT public key: %s [salt: %s]\n", to_hex(pk.bytes).c_str()
, salt.c_str());
alert* a = wait_for_alert(s, dht_put_alert::alert_type); alert* a = wait_for_alert(s, dht_put_alert::alert_type);
dht_put_alert* pa = alert_cast<dht_put_alert>(a); dht_put_alert* pa = alert_cast<dht_put_alert>(a);
@ -390,9 +395,12 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
std::string salt;
if (argc > 1) salt = argv[1];
bootstrap(s); bootstrap(s);
s.dht_get_item(public_key); s.dht_get_item(public_key, salt);
std::printf("MGET %s\n", argv[0]); std::printf("MGET %s [salt: %s]\n", argv[0], salt.c_str());
bool authoritative = false; bool authoritative = false;