p2p: do not send MN connection flag and challenge in the version msg …

…if the connection is not meant to be a DMN-to-DMN.
PIVX-Project · Jan 17, 2022 · 758e19f · 758e19f
1 parent cb34b51
commit 758e19f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -266,14 +266,19 @@ void PushNodeVersion(CNode* pnode, CConnman* connman, int64_t nTime)
     CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService(), addr.nServices));
     CAddress addrMe = CAddress(CService(), nLocalNodeServices);
 
-    // MN auth
-    // future: create the challenge only for mn connections.
-    uint256 mnauthChallenge;
-    GetRandBytes(mnauthChallenge.begin(), (int)mnauthChallenge.size());
-    WITH_LOCK(pnode->cs_mnauth, pnode->sentMNAuthChallenge = mnauthChallenge);
+    // Create the version message
+    auto version_msg = CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
+                                          nonce, strSubVersion, nNodeStartingHeight, true);
 
-    connman->PushMessage(pnode, CNetMsgMaker(INIT_PROTO_VERSION).Make(NetMsgType::VERSION, PROTOCOL_VERSION, (uint64_t)nLocalNodeServices, nTime, addrYou, addrMe,
-            nonce, strSubVersion, nNodeStartingHeight, true, pnode->m_masternode_connection.load(), pnode->sentMNAuthChallenge));
+    // DMN-to-DMN, set auth connection type and create challenge.
+    if (pnode->m_masternode_connection) {
+        uint256 mnauthChallenge;
+        GetRandBytes(mnauthChallenge.begin(), (int) mnauthChallenge.size());
+        WITH_LOCK(pnode->cs_mnauth, pnode->sentMNAuthChallenge = mnauthChallenge);
+        CVectorWriter{SER_NETWORK, 0 | INIT_PROTO_VERSION, version_msg.data, version_msg.data.size(), pnode->sentMNAuthChallenge};
+    }
+
+    connman->PushMessage(pnode, std::move(version_msg));
 
     if (fLogIPs)
         LogPrint(BCLog::NET, "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%d\n", PROTOCOL_VERSION, nNodeStartingHeight, addrMe.ToString(), addrYou.ToString(), nodeid);
@@ -1172,8 +1177,8 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
         }
         // Check if this is a quorum connection
         if (!vRecv.empty()) {
-            bool fOtherMasternode = false;
-            vRecv >> fOtherMasternode;
+            WITH_LOCK(pfrom->cs_mnauth, vRecv >> pfrom->receivedMNAuthChallenge;);
+            bool fOtherMasternode = !pfrom->receivedMNAuthChallenge.IsNull();
             if (pfrom->fInbound) {
                 pfrom->m_masternode_connection = fOtherMasternode;
                 if (fOtherMasternode) {
@@ -1186,9 +1191,6 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR
                 }
             }
         }
-        if (!vRecv.empty()) {
-            WITH_LOCK(pfrom->cs_mnauth, vRecv >> pfrom->receivedMNAuthChallenge;);
-        }
 
         // Disconnect if we connected to ourself
         if (pfrom->fInbound && !connman->CheckIncomingNonce(nNonce)) {

diff --git a/src/tiertwo/net_masternodes.cpp b/src/tiertwo/net_masternodes.cpp
@@ -187,8 +187,7 @@ void TierTwoConnMan::ThreadOpenMasternodeConnections()
 
         triedConnect = false;
 
-        // todo: add !fNetworkActive
-        if (!g_tiertwo_sync_state.IsBlockchainSynced()) {
+        if (!fMasterNode || !g_tiertwo_sync_state.IsBlockchainSynced() || !g_connman->GetNetworkActive()) {
             continue;
         }