add support for IPV4 proxy

- this will allow crawling over TOR
This commit is contained in:
Jonas Schnelli 2015-07-20 13:48:19 +02:00
parent 6e5a39185e
commit 1d9d182b2b

View file

@ -27,6 +27,7 @@ public:
const char *ns; const char *ns;
const char *host; const char *host;
const char *tor; const char *tor;
const char *ipv4_proxy;
CDnsSeedOpts() : nThreads(96), nDnsThreads(4), nPort(53), mbox(NULL), ns(NULL), host(NULL), tor(NULL), fUseTestNet(false), fWipeBan(false), fWipeIgnore(false) {} CDnsSeedOpts() : nThreads(96), nDnsThreads(4), nPort(53), mbox(NULL), ns(NULL), host(NULL), tor(NULL), fUseTestNet(false), fWipeBan(false), fWipeIgnore(false) {}
@ -42,6 +43,7 @@ public:
"-d <threads> Number of DNS server threads (default 4)\n" "-d <threads> Number of DNS server threads (default 4)\n"
"-p <port> UDP port to listen on (default 53)\n" "-p <port> UDP port to listen on (default 53)\n"
"-o <ip:port> Tor proxy IP/Port\n" "-o <ip:port> Tor proxy IP/Port\n"
"-i <ip:port> IPV4 proxy IP/Port\n"
"--testnet Use testnet\n" "--testnet Use testnet\n"
"--wipeban Wipe list of banned nodes\n" "--wipeban Wipe list of banned nodes\n"
"--wipeignore Wipe list of ignored nodes\n" "--wipeignore Wipe list of ignored nodes\n"
@ -58,6 +60,7 @@ public:
{"dnsthreads", required_argument, 0, 'd'}, {"dnsthreads", required_argument, 0, 'd'},
{"port", required_argument, 0, 'p'}, {"port", required_argument, 0, 'p'},
{"onion", required_argument, 0, 'o'}, {"onion", required_argument, 0, 'o'},
{"proxy", required_argument, 0, 'i'},
{"testnet", no_argument, &fUseTestNet, 1}, {"testnet", no_argument, &fUseTestNet, 1},
{"wipeban", no_argument, &fWipeBan, 1}, {"wipeban", no_argument, &fWipeBan, 1},
{"wipeignore", no_argument, &fWipeBan, 1}, {"wipeignore", no_argument, &fWipeBan, 1},
@ -65,7 +68,7 @@ public:
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int option_index = 0; int option_index = 0;
int c = getopt_long(argc, argv, "h:n:m:t:p:d:o:", long_options, &option_index); int c = getopt_long(argc, argv, "h:n:m:t:p:d:o:i:", long_options, &option_index);
if (c == -1) break; if (c == -1) break;
switch (c) { switch (c) {
case 'h': { case 'h': {
@ -106,6 +109,11 @@ public:
break; break;
} }
case 'i': {
ipv4_proxy = optarg;
break;
}
case '?': { case '?': {
showHelp = true; showHelp = true;
break; break;
@ -371,6 +379,13 @@ int main(int argc, char **argv) {
SetProxy(NET_TOR, service); SetProxy(NET_TOR, service);
} }
} }
if (opts.ipv4_proxy) {
CService service(opts.ipv4_proxy, 9050);
if (service.IsValid()) {
printf("Using IPv4 proxy at %s\n", service.ToStringIPPort().c_str());
SetProxy(NET_IPV4, service);
}
}
bool fDNS = true; bool fDNS = true;
if (opts.fUseTestNet) { if (opts.fUseTestNet) {
printf("Using testnet.\n"); printf("Using testnet.\n");