Merge pull request #21 from Bamcane/pr-broadcast-packet-token-fix

Bamcane · web-flow · commit 7c254530b448 · 2025-11-20T15:31:47.000+08:00
Fix incorrect reuse of the same NetToken for broadcast packets
diff --git a/src/engine/shared/network_token.cpp b/src/engine/shared/network_token.cpp
@@ -263,7 +263,7 @@ void CNetTokenCache::AddToken(const NETADDR *pAddr, TOKEN Token, int TokenFLag)
 	{
 		NETADDR NullAddr = { 0 };
 		NullAddr.type = 7;	// cover broadcasts
-		if(net_addr_comp(&pInfo->m_Addr, pAddr, true) == 0 || ((TokenFLag&NET_TOKENFLAG_ALLOWBROADCAST) && net_addr_comp(&pInfo->m_Addr, &NullAddr, false) == 0))
+		if(net_addr_comp(&pInfo->m_Addr, pAddr, true) == 0 || ((TokenFLag&NET_TOKENFLAG_ALLOWBROADCAST) && net_addr_comp(&pInfo->m_Addr, &NullAddr, false) == 0 && pInfo->m_Addr.port == pAddr->port))
 		{
 			// notify the user that the packet gets delivered
 			if(pInfo->m_pfnCallback)

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ void CNetTokenCache::AddToken(const NETADDR *pAddr, TOKEN Token, int TokenFLag)`
`263`	`263`	`{`
`264`	`264`	`NETADDR NullAddr = { 0 };`
`265`	`265`	`NullAddr.type = 7; // cover broadcasts`
`266`		`- if(net_addr_comp(&pInfo->m_Addr, pAddr, true) == 0 \|\| ((TokenFLag&NET_TOKENFLAG_ALLOWBROADCAST) && net_addr_comp(&pInfo->m_Addr, &NullAddr, false) == 0))`
	`266`	`+ if(net_addr_comp(&pInfo->m_Addr, pAddr, true) == 0 \|\| ((TokenFLag&NET_TOKENFLAG_ALLOWBROADCAST) && net_addr_comp(&pInfo->m_Addr, &NullAddr, false) == 0 && pInfo->m_Addr.port == pAddr->port))`
`267`	`267`	`{`
`268`	`268`	`// notify the user that the packet gets delivered`
`269`	`269`	`if(pInfo->m_pfnCallback)`