net: use the exposed GetNodeSignals() rather than g_signals directly

theuni · theuni · commit 563f375cdeae · 2016-05-05T13:22:25.000-04:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -439,7 +439,7 @@ void CNode::CloseSocketDisconnect()
 
 void CNode::PushVersion()
 {
-    int nBestHeight = g_signals.GetHeight().get_value_or(0);
+    int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);
 
     int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
@@ -1742,7 +1742,7 @@ void ThreadMessageHandler()
                 TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);
                 if (lockRecv)
                 {
-                    if (!g_signals.ProcessMessages(pnode))
+                    if (!GetNodeSignals().ProcessMessages(pnode))
                         pnode->CloseSocketDisconnect();
 
                     if (pnode->nSendSize < SendBufferSize())
@@ -1760,7 +1760,7 @@ void ThreadMessageHandler()
             {
                 TRY_LOCK(pnode->cs_vSend, lockSend);
                 if (lockSend)
-                    g_signals.SendMessages(pnode);
+                    GetNodeSignals().SendMessages(pnode);
             }
             boost::this_thread::interruption_point();
         }

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ void CNode::CloseSocketDisconnect()`
`439`	`439`
`440`	`440`	`void CNode::PushVersion()`
`441`	`441`	`{`
`442`		`- int nBestHeight = g_signals.GetHeight().get_value_or(0);`
	`442`	`+ int nBestHeight = GetNodeSignals().GetHeight().get_value_or(0);`
`443`	`443`
`444`	`444`	`int64_t nTime = (fInbound ? GetAdjustedTime() : GetTime());`
`445`	`445`	`CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));`
`@@ -1742,7 +1742,7 @@ void ThreadMessageHandler()`
`1742`	`1742`	`TRY_LOCK(pnode->cs_vRecvMsg, lockRecv);`
`1743`	`1743`	`if (lockRecv)`
`1744`	`1744`	`{`
`1745`		`- if (!g_signals.ProcessMessages(pnode))`
	`1745`	`+ if (!GetNodeSignals().ProcessMessages(pnode))`
`1746`	`1746`	`pnode->CloseSocketDisconnect();`
`1747`	`1747`
`1748`	`1748`	`if (pnode->nSendSize < SendBufferSize())`
`@@ -1760,7 +1760,7 @@ void ThreadMessageHandler()`
`1760`	`1760`	`{`
`1761`	`1761`	`TRY_LOCK(pnode->cs_vSend, lockSend);`
`1762`	`1762`	`if (lockSend)`
`1763`		`- g_signals.SendMessages(pnode);`
	`1763`	`+ GetNodeSignals().SendMessages(pnode);`
`1764`	`1764`	`}`
`1765`	`1765`	`boost::this_thread::interruption_point();`
`1766`	`1766`	`}`