Skip to content

Commit 9bab521

Browse files
sipasipa
committed
Support connecting by hostnames passed to proxy (-proxydns)
1 parent a012e2d commit 9bab521

File tree

5 files changed

+145
-69
lines changed

5 files changed

+145
-69
lines changed

‎src/init.cpp

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ bool AppInit2(int argc, char* argv[])
181181
" -proxy=<ip:port> \t " + _("Connect through socks proxy") + "\n" +
182182
" -socks=<n> \t " + _("Select the version of socks proxy to use (4 or 5, 5 is default)") + "\n" +
183183
" -dns \t " + _("Allow DNS lookups for addnode and connect") + "\n" +
184+
" -proxydns \t " + _("Pass DNS requests to (SOCKS5) proxy") + "\n" +
184185
" -port=<port> \t\t " + _("Listen for connections on <port> (default: 8333 or testnet: 18333)") + "\n" +
185186
" -maxconnections=<n>\t " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
186187
" -addnode=<ip> \t " + _("Add a node to connect to and attempt to keep the connection open") + "\n" +
@@ -524,13 +525,16 @@ bool AppInit2(int argc, char* argv[])
524525
// Note: the GetBoolArg() calls for all of these must happen later.
525526
SoftSetBoolArg("-listen", false);
526527
SoftSetBoolArg("-irc", false);
527-
SoftSetBoolArg("-dnsseed", false);
528+
SoftSetBoolArg("-proxydns", true);
528529
SoftSetBoolArg("-upnp", false);
529-
SoftSetBoolArg("-dns", false);
530530
}
531531

532-
fAllowDNS = GetBoolArg("-dns");
532+
fNameLookup = GetBoolArg("-dns");
533+
fProxyNameLookup = GetBoolArg("-proxydns");
534+
if (fProxyNameLookup)
535+
fNameLookup = true;
533536
fNoListen = !GetBoolArg("-listen", true);
537+
nSocksVersion = GetArg("-socks", 5);
534538

535539
// Continue to put "/P2SH/" in the coinbase to monitor
536540
// BIP16 support.
@@ -548,17 +552,6 @@ bool AppInit2(int argc, char* argv[])
548552
}
549553
}
550554

551-
if (mapArgs.count("-addnode"))
552-
{
553-
BOOST_FOREACH(string strAddr, mapMultiArgs["-addnode"])
554-
{
555-
CAddress addr(CService(strAddr, GetDefaultPort(), fAllowDNS));
556-
addr.nTime = 0; // so it won't relay unless successfully connected
557-
if (addr.IsValid())
558-
addrman.Add(addr, CNetAddr("127.0.0.1"));
559-
}
560-
}
561-
562555
if (mapArgs.count("-paytxfee"))
563556
{
564557
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))

‎src/net.cpp

Lines changed: 79 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,14 @@ void ThreadOpenAddedConnections2(void* parg);
3535
void ThreadMapPort2(void* parg);
3636
#endif
3737
void ThreadDNSAddressSeed2(void* parg);
38-
bool OpenNetworkConnection(const CAddress& addrConnect);
38+
bool OpenNetworkConnection(const CAddress& addrConnect, const char *strDest = NULL);
3939

4040

4141

4242
//
4343
// Global state variables
4444
//
4545
bool fClient = false;
46-
bool fAllowDNS = false;
4746
static bool fUseUPnP = false;
4847
uint64 nLocalServices = (fClient ? 0 : NODE_NETWORK);
4948
CAddress addrLocalHost(CService("0.0.0.0", 0), nLocalServices);
@@ -307,6 +306,15 @@ CNode* FindNode(const CNetAddr& ip)
307306
return NULL;
308307
}
309308

309+
CNode* FindNode(std::string addrName)
310+
{
311+
LOCK(cs_vNodes);
312+
BOOST_FOREACH(CNode* pnode, vNodes)
313+
if (pnode->addrName == addrName)
314+
return (pnode);
315+
return NULL;
316+
}
317+
310318
CNode* FindNode(const CService& addr)
311319
{
312320
{
@@ -318,35 +326,38 @@ CNode* FindNode(const CService& addr)
318326
return NULL;
319327
}
320328

321-
CNode* ConnectNode(CAddress addrConnect, int64 nTimeout)
329+
CNode* ConnectNode(CAddress addrConnect, const char *pszDest, int64 nTimeout)
322330
{
323-
if ((CNetAddr)addrConnect == (CNetAddr)addrLocalHost)
324-
return NULL;
331+
if (pszDest != NULL) {
332+
if ((CNetAddr)addrConnect == (CNetAddr)addrLocalHost)
333+
return NULL;
325334

326-
// Look for an existing connection
327-
CNode* pnode = FindNode((CService)addrConnect);
328-
if (pnode)
329-
{
330-
if (nTimeout != 0)
331-
pnode->AddRef(nTimeout);
332-
else
333-
pnode->AddRef();
334-
return pnode;
335+
// Look for an existing connection
336+
CNode* pnode = FindNode((CService)addrConnect);
337+
if (pnode)
338+
{
339+
if (nTimeout != 0)
340+
pnode->AddRef(nTimeout);
341+
else
342+
pnode->AddRef();
343+
return pnode;
344+
}
335345
}
336346

347+
337348
/// debug print
338349
printf("trying connection %s lastseen=%.1fhrs\n",
339-
addrConnect.ToString().c_str(),
340-
(double)(addrConnect.nTime - GetAdjustedTime())/3600.0);
341-
342-
addrman.Attempt(addrConnect);
350+
pszDest ? pszDest : addrConnect.ToString().c_str(),
351+
pszDest ? 0 : (double)(addrConnect.nTime - GetAdjustedTime())/3600.0);
343352

344353
// Connect
345354
SOCKET hSocket;
346-
if (ConnectSocket(addrConnect, hSocket))
355+
if (pszDest ? ConnectSocketByName(addrConnect, hSocket, pszDest, GetDefaultPort()) : ConnectSocket(addrConnect, hSocket))
347356
{
357+
addrman.Attempt(addrConnect);
358+
348359
/// debug print
349-
printf("connected %s\n", addrConnect.ToString().c_str());
360+
printf("connected %s\n", pszDest ? pszDest : addrConnect.ToString().c_str());
350361

351362
// Set to nonblocking
352363
#ifdef WIN32
@@ -359,11 +370,12 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout)
359370
#endif
360371

361372
// Add node
362-
CNode* pnode = new CNode(hSocket, addrConnect, false);
373+
CNode* pnode = new CNode(hSocket, addrConnect, pszDest ? pszDest : "", false);
363374
if (nTimeout != 0)
364375
pnode->AddRef(nTimeout);
365376
else
366377
pnode->AddRef();
378+
367379
{
368380
LOCK(cs_vNodes);
369381
vNodes.push_back(pnode);
@@ -389,7 +401,7 @@ void CNode::CloseSocketDisconnect()
389401
{
390402
if (fDebug)
391403
printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
392-
printf("disconnecting node %s\n", addr.ToString().c_str());
404+
printf("disconnecting node %s\n", addrName.c_str());
393405
closesocket(hSocket);
394406
hSocket = INVALID_SOCKET;
395407
vRecv.clear();
@@ -444,7 +456,7 @@ bool CNode::Misbehaving(int howmuch)
444456
{
445457
if (addr.IsLocal())
446458
{
447-
printf("Warning: local node %s misbehaving\n", addr.ToString().c_str());
459+
printf("Warning: local node %s misbehaving\n", addrName.c_str());
448460
return false;
449461
}
450462

@@ -458,7 +470,7 @@ bool CNode::Misbehaving(int howmuch)
458470
setBanned[addr] = banTime;
459471
}
460472
CloseSocketDisconnect();
461-
printf("Disconnected %s for misbehavior (score=%d)\n", addr.ToString().c_str(), nMisbehavior);
473+
printf("Disconnected %s for misbehavior (score=%d)\n", addrName.c_str(), nMisbehavior);
462474
return true;
463475
}
464476
return false;
@@ -675,7 +687,7 @@ void ThreadSocketHandler2(void* parg)
675687
else
676688
{
677689
printf("accepted connection %s\n", addr.ToString().c_str());
678-
CNode* pnode = new CNode(hSocket, addr, true);
690+
CNode* pnode = new CNode(hSocket, addr, "", true);
679691
pnode->AddRef();
680692
{
681693
LOCK(cs_vNodes);
@@ -1025,20 +1037,25 @@ void ThreadDNSAddressSeed2(void* parg)
10251037
printf("Loading addresses from DNS seeds (could take a while)\n");
10261038

10271039
for (unsigned int seed_idx = 0; seed_idx < ARRAYLEN(strDNSSeed); seed_idx++) {
1028-
vector<CNetAddr> vaddr;
1029-
vector<CAddress> vAdd;
1030-
if (LookupHost(strDNSSeed[seed_idx][1], vaddr))
1031-
{
1032-
BOOST_FOREACH(CNetAddr& ip, vaddr)
1040+
if (fProxyNameLookup) {
1041+
CAddress addr;
1042+
OpenNetworkConnection(addr, strDNSSeed[seed_idx][1]);
1043+
} else {
1044+
vector<CNetAddr> vaddr;
1045+
vector<CAddress> vAdd;
1046+
if (LookupHost(strDNSSeed[seed_idx][1], vaddr))
10331047
{
1034-
int nOneDay = 24*3600;
1035-
CAddress addr = CAddress(CService(ip, GetDefaultPort()));
1036-
addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old
1037-
vAdd.push_back(addr);
1038-
found++;
1048+
BOOST_FOREACH(CNetAddr& ip, vaddr)
1049+
{
1050+
int nOneDay = 24*3600;
1051+
CAddress addr = CAddress(CService(ip, GetDefaultPort()));
1052+
addr.nTime = GetTime() - 3*nOneDay - GetRand(4*nOneDay); // use a random age between 3 and 7 days old
1053+
vAdd.push_back(addr);
1054+
found++;
1055+
}
10391056
}
1057+
addrman.Add(vAdd, CNetAddr(strDNSSeed[seed_idx][0], true));
10401058
}
1041-
addrman.Add(vAdd, CNetAddr(strDNSSeed[seed_idx][0], true));
10421059
}
10431060
}
10441061

@@ -1199,9 +1216,8 @@ void ThreadOpenConnections2(void* parg)
11991216
{
12001217
BOOST_FOREACH(string strAddr, mapMultiArgs["-connect"])
12011218
{
1202-
CAddress addr(CService(strAddr, GetDefaultPort(), fAllowDNS));
1203-
if (addr.IsValid())
1204-
OpenNetworkConnection(addr);
1219+
CAddress addr(CService("0.0.0.0:0"));
1220+
OpenNetworkConnection(addr, strAddr.c_str());
12051221
for (int i = 0; i < 10 && i < nLoop; i++)
12061222
{
12071223
Sleep(500);
@@ -1325,11 +1341,25 @@ void ThreadOpenAddedConnections2(void* parg)
13251341
if (mapArgs.count("-addnode") == 0)
13261342
return;
13271343

1344+
if (fProxyNameLookup) {
1345+
while(!fShutdown) {
1346+
BOOST_FOREACH(string& strAddNode, mapMultiArgs["-addnode"]) {
1347+
CAddress addr;
1348+
OpenNetworkConnection(addr, strAddNode.c_str());
1349+
Sleep(500);
1350+
}
1351+
vnThreadsRunning[THREAD_ADDEDCONNECTIONS]--;
1352+
Sleep(120000); // Retry every 2 minutes
1353+
vnThreadsRunning[THREAD_ADDEDCONNECTIONS]++;
1354+
}
1355+
return;
1356+
}
1357+
13281358
vector<vector<CService> > vservAddressesToAdd(0);
13291359
BOOST_FOREACH(string& strAddNode, mapMultiArgs["-addnode"])
13301360
{
13311361
vector<CService> vservNode(0);
1332-
if(Lookup(strAddNode.c_str(), vservNode, GetDefaultPort(), fAllowDNS, 0))
1362+
if(Lookup(strAddNode.c_str(), vservNode, GetDefaultPort(), fNameLookup, 0))
13331363
{
13341364
vservAddressesToAdd.push_back(vservNode);
13351365
{
@@ -1343,7 +1373,7 @@ void ThreadOpenAddedConnections2(void* parg)
13431373
{
13441374
vector<vector<CService> > vservConnectAddresses = vservAddressesToAdd;
13451375
// Attempt to connect to each IP for each addnode entry until at least one is successful per addnode entry
1346-
// (keeping in mind that addnode entries can have many IPs if fAllowDNS)
1376+
// (keeping in mind that addnode entries can have many IPs if fNameLookup)
13471377
{
13481378
LOCK(cs_vNodes);
13491379
BOOST_FOREACH(CNode* pnode, vNodes)
@@ -1373,19 +1403,23 @@ void ThreadOpenAddedConnections2(void* parg)
13731403
}
13741404
}
13751405

1376-
bool OpenNetworkConnection(const CAddress& addrConnect)
1406+
bool OpenNetworkConnection(const CAddress& addrConnect, const char *strDest)
13771407
{
13781408
//
13791409
// Initiate outbound network connection
13801410
//
13811411
if (fShutdown)
13821412
return false;
1383-
if ((CNetAddr)addrConnect == (CNetAddr)addrLocalHost || !addrConnect.IsIPv4() ||
1384-
FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect))
1413+
if (!strDest)
1414+
if ((CNetAddr)addrConnect == (CNetAddr)addrLocalHost || !addrConnect.IsIPv4() ||
1415+
FindNode((CNetAddr)addrConnect) || CNode::IsBanned(addrConnect) ||
1416+
FindNode(addrConnect.ToStringIPPort().c_str()))
1417+
return false;
1418+
if (strDest && FindNode(strDest))
13851419
return false;
13861420

13871421
vnThreadsRunning[THREAD_OPENCONNECTIONS]--;
1388-
CNode* pnode = ConnectNode(addrConnect);
1422+
CNode* pnode = ConnectNode(addrConnect, strDest);
13891423
vnThreadsRunning[THREAD_OPENCONNECTIONS]++;
13901424
if (fShutdown)
13911425
return false;

‎src/net.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ bool GetMyExternalIP(CNetAddr& ipRet);
3535
void AddressCurrentlyConnected(const CService& addr);
3636
CNode* FindNode(const CNetAddr& ip);
3737
CNode* FindNode(const CService& ip);
38-
CNode* ConnectNode(CAddress addrConnect, int64 nTimeout=0);
38+
CNode* ConnectNode(CAddress addrConnect, const char *strDest = NULL, int64 nTimeout=0);
3939
void MapPort(bool fMapPort);
4040
bool BindListenPort(std::string& strError=REF(std::string()));
4141
void StartNode(void* parg);
@@ -83,7 +83,6 @@ enum threadId
8383
};
8484

8585
extern bool fClient;
86-
extern bool fAllowDNS;
8786
extern uint64 nLocalServices;
8887
extern CAddress addrLocalHost;
8988
extern uint64 nLocalHostNonce;
@@ -120,6 +119,7 @@ class CNode
120119
int nHeaderStart;
121120
unsigned int nMessageStart;
122121
CAddress addr;
122+
std::string addrName;
123123
int nVersion;
124124
std::string strSubVer;
125125
bool fClient;
@@ -157,7 +157,7 @@ class CNode
157157
CCriticalSection cs_inventory;
158158
std::multimap<int64, CInv> mapAskFor;
159159

160-
CNode(SOCKET hSocketIn, CAddress addrIn, bool fInboundIn=false) : vSend(SER_NETWORK, MIN_PROTO_VERSION), vRecv(SER_NETWORK, MIN_PROTO_VERSION)
160+
CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false) : vSend(SER_NETWORK, MIN_PROTO_VERSION), vRecv(SER_NETWORK, MIN_PROTO_VERSION)
161161
{
162162
nServices = 0;
163163
hSocket = hSocketIn;
@@ -168,6 +168,7 @@ class CNode
168168
nHeaderStart = -1;
169169
nMessageStart = -1;
170170
addr = addrIn;
171+
addrName = addrNameIn == "" ? addr.ToStringIPPort() : addrNameIn;
171172
nVersion = 0;
172173
strSubVer = "";
173174
fClient = false; // set by version message

0 commit comments

Comments
 (0)