Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set

TheBlueMatt · TheBlueMatt · commit 236618061a44 · 2017-01-25T18:59:16.000-05:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -342,8 +342,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         CNode* pnode = FindNode((CService)addrConnect);
         if (pnode)
         {
-            pnode->AddRef();
-            return pnode;
+            LogPrintf("Failed to open new connection, already connected\n");
+            return NULL;
         }
     }
 
@@ -373,12 +373,12 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
             CNode* pnode = FindNode((CService)addrConnect);
             if (pnode)
             {
-                pnode->AddRef();
                 if (pnode->addrName.empty()) {
                     pnode->addrName = std::string(pszDest);
                 }
                 CloseSocket(hSocket);
-                return pnode;
+                LogPrintf("Failed to open new connection, already connected\n");
+                return NULL;
             }
         }
 
@@ -391,11 +391,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo
         pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);
         pnode->nTimeConnected = GetTime();
         pnode->AddRef();
-        GetNodeSignals().InitializeNode(pnode, *this);
-        {
-            LOCK(cs_vNodes);
-            vNodes.push_back(pnode);
-        }
 
         return pnode;
     } else if (!proxyConnectionFailed) {
@@ -1838,6 +1833,12 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai
     if (fAddnode)
         pnode->fAddnode = true;
 
+    {
+        LOCK(cs_vNodes);
+        vNodes.push_back(pnode);
+    }
+    GetNodeSignals().InitializeNode(pnode, *this);
+
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,8 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo`
`342`	`342`	`CNode* pnode = FindNode((CService)addrConnect);`
`343`	`343`	`if (pnode)`
`344`	`344`	`{`
`345`		`- pnode->AddRef();`
`346`		`- return pnode;`
	`345`	`+ LogPrintf("Failed to open new connection, already connected\n");`
	`346`	`+ return NULL;`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`
`@@ -373,12 +373,12 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo`
`373`	`373`	`CNode* pnode = FindNode((CService)addrConnect);`
`374`	`374`	`if (pnode)`
`375`	`375`	`{`
`376`		`- pnode->AddRef();`
`377`	`376`	`if (pnode->addrName.empty()) {`
`378`	`377`	`pnode->addrName = std::string(pszDest);`
`379`	`378`	`}`
`380`	`379`	`CloseSocket(hSocket);`
`381`		`- return pnode;`
	`380`	`+ LogPrintf("Failed to open new connection, already connected\n");`
	`381`	`+ return NULL;`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
`@@ -391,11 +391,6 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo`
`391`	`391`	`pnode->nServicesExpected = ServiceFlags(addrConnect.nServices & nRelevantServices);`
`392`	`392`	`pnode->nTimeConnected = GetTime();`
`393`	`393`	`pnode->AddRef();`
`394`		`- GetNodeSignals().InitializeNode(pnode, *this);`
`395`		`- {`
`396`		`- LOCK(cs_vNodes);`
`397`		`- vNodes.push_back(pnode);`
`398`		`- }`
`399`	`394`
`400`	`395`	`return pnode;`
`401`	`396`	`} else if (!proxyConnectionFailed) {`
`@@ -1838,6 +1833,12 @@ bool CConnman::OpenNetworkConnection(const CAddress& addrConnect, bool fCountFai`
`1838`	`1833`	`if (fAddnode)`
`1839`	`1834`	`pnode->fAddnode = true;`
`1840`	`1835`
	`1836`	`+ {`
	`1837`	`+ LOCK(cs_vNodes);`
	`1838`	`+ vNodes.push_back(pnode);`
	`1839`	`+ }`
	`1840`	`+ GetNodeSignals().InitializeNode(pnode, *this);`
	`1841`	`+`
`1841`	`1842`	`return true;`
`1842`	`1843`	`}`
`1843`	`1844`