Merge dashpay#6574: fix: ReconnectionInfo should also store Dash-specific flags

PastaPastaPasta · PastaPastaPasta · commit 38762f7388ff · 2025-02-14T13:19:29.000-06:00
17f0aa3 fix: ReconnectionInfo should also store Dash-specific flags (UdjinM6) Pull request description: ## Issue being fixed or feature implemented Mixing with p2p v2 protocol enabled on p2p v1 masternodes triggers reconnection which "forgets" about Dash-specific flags so these connections aren't dropped on mixing session timeouts like they should. Most nodes on testnet are upgraded so the issue wasn't noticeable there unfortunately. ## What was done? Store Dash-specific flags in `ReconnectionInfo` and use them in `PerformReconnections()` later ## How Has This Been Tested? ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: kwvg: ACK 17f0aa3 PastaPastaPasta: utACK 17f0aa3 Tree-SHA512: eb69716e79acc29529b900900d284ddd2d6565d847b1039194c8764fa4575a7a8f51e95b733dc58a550819f9cf5be11de759ceb6884ce44723ede912231cc574
diff --git a/src/net.cpp b/src/net.cpp
@@ -2247,7 +2247,9 @@ void CConnman::DisconnectNodes()
                         .grant = std::move(pnode->grantOutbound),
                         .destination = pnode->m_dest,
                         .conn_type = pnode->m_conn_type,
-                        .use_v2transport = false});
+                        .use_v2transport = false,
+                        .masternode_connection = pnode->m_masternode_connection,
+                        .masternode_probe_connection = pnode->m_masternode_probe_connection});
                     LogPrint(BCLog::NET, "retrying with v1 transport protocol for peer=%d\n", pnode->GetId());
                 }
 
@@ -5171,7 +5173,9 @@ void CConnman::PerformReconnections()
                               std::move(item.grant),
                               item.destination.empty() ? nullptr : item.destination.c_str(),
                               item.conn_type,
-                              item.use_v2transport);
+                              item.use_v2transport,
+                              item.masternode_connection ? MasternodeConn::IsConnection : MasternodeConn::IsNotConnection,
+                              item.masternode_probe_connection ? MasternodeProbeConn::IsConnection : MasternodeProbeConn::IsNotConnection);
     }
 }
 
diff --git a/src/net.h b/src/net.h
@@ -1981,6 +1981,8 @@ friend class CNode;
         std::string destination;
         ConnectionType conn_type;
         bool use_v2transport;
+        bool masternode_connection;
+        bool masternode_probe_connection;
     };
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2247,7 +2247,9 @@ void CConnman::DisconnectNodes()`
`2247`	`2247`	`.grant = std::move(pnode->grantOutbound),`
`2248`	`2248`	`.destination = pnode->m_dest,`
`2249`	`2249`	`.conn_type = pnode->m_conn_type,`
`2250`		`- .use_v2transport = false});`
	`2250`	`+ .use_v2transport = false,`
	`2251`	`+ .masternode_connection = pnode->m_masternode_connection,`
	`2252`	`+ .masternode_probe_connection = pnode->m_masternode_probe_connection});`
`2251`	`2253`	`LogPrint(BCLog::NET, "retrying with v1 transport protocol for peer=%d\n", pnode->GetId());`
`2252`	`2254`	`}`
`2253`	`2255`
`@@ -5171,7 +5173,9 @@ void CConnman::PerformReconnections()`
`5171`	`5173`	`std::move(item.grant),`
`5172`	`5174`	`item.destination.empty() ? nullptr : item.destination.c_str(),`
`5173`	`5175`	`item.conn_type,`
`5174`		`- item.use_v2transport);`
	`5176`	`+ item.use_v2transport,`
	`5177`	`+ item.masternode_connection ? MasternodeConn::IsConnection : MasternodeConn::IsNotConnection,`
	`5178`	`+ item.masternode_probe_connection ? MasternodeProbeConn::IsConnection : MasternodeProbeConn::IsNotConnection);`
`5175`	`5179`	`}`
`5176`	`5180`	`}`
`5177`	`5181`