DRY with net_addr_comp_noport

src/engine/server/register.cpp

@@ -239,13 +239,9 @@ int CRegister::RegisterProcessPacket(CNetChunk *pPacket)
 {
 	// check for masterserver address
 	bool Valid = false;
-	NETADDR Addr1 = pPacket->m_Address;
-	Addr1.port = 0;
 	for(int i = 0; i < IMasterServer::MAX_MASTERSERVERS; i++)
 	{
-		NETADDR Addr2 = m_aMasterserverInfo[i].m_Addr;
+		if(net_addr_comp_noport(&pPacket->m_Address, &m_aMasterserverInfo[i].m_Addr) == 0)
-		Addr2.port = 0;
-		if(net_addr_comp(&Addr1, &Addr2) == 0)
 		{
 			Valid = true;
 			break;

src/engine/shared/network_conn.cpp

@@ -312,12 +312,8 @@ int CNetConnection::Feed(CNetPacketConstruct *pPacket, NETADDR *pAddr, SECURITY_
 			{
 				if(CtrlMsg == NET_CTRLMSG_CONNECT)
 				{
-					NETADDR nAddr;
-					mem_copy(&nAddr, pAddr, sizeof(nAddr));
-					nAddr.port = 0;
-					m_PeerAddr.port = 0;
 #ifndef FUZZING
-					if(net_addr_comp(&m_PeerAddr, &nAddr) == 0 && time_get() - m_LastUpdateTime < time_freq() * 3)
+					if(net_addr_comp_noport(&m_PeerAddr, pAddr) == 0 && time_get() - m_LastUpdateTime < time_freq() * 3)
 						return 0;
 #endif
 

src/engine/shared/network_server.cpp

@@ -168,11 +168,7 @@ void CNetServer::SendControl(NETADDR &Addr, int ControlMsg, const void *pExtra,
 
 int CNetServer::NumClientsWithAddr(NETADDR Addr)
 {
-	NETADDR ThisAddr = Addr, OtherAddr;
-
 	int FoundAddr = 0;
-	ThisAddr.port = 0;
-
 	for(int i = 0; i < MaxClients(); ++i)
 	{
 		if(m_aSlots[i].m_Connection.State() == NET_CONNSTATE_OFFLINE ||
@@ -181,9 +177,7 @@ int CNetServer::NumClientsWithAddr(NETADDR Addr)
 				 !m_aSlots[i].m_Connection.m_TimeoutSituation)))
 			continue;
 
-		OtherAddr = *m_aSlots[i].m_Connection.PeerAddress();
+		if(!net_addr_comp_noport(&Addr, m_aSlots[i].m_Connection.PeerAddress()))
-		OtherAddr.port = 0;
-		if(!net_addr_comp(&ThisAddr, &OtherAddr))
 			FoundAddr++;
 	}
 

src/game/server/ddracecommands.cpp

@@ -351,12 +351,10 @@ void CGameContext::VoteMute(IConsole::IResult *pResult, NETADDR *pAddr, int Secs
 	char aBuf[128];
 	bool Found = 0;
 
-	pAddr->port = 0; // ignore port number for vote mutes
-
 	// find a matching vote mute for this ip, update expiration time if found
 	for(int i = 0; i < m_NumVoteMutes; i++)
 	{
-		if(net_addr_comp(&m_aVoteMutes[i].m_Addr, pAddr) == 0)
+		if(net_addr_comp_noport(&m_aVoteMutes[i].m_Addr, pAddr) == 0)
 		{
 			m_aVoteMutes[i].m_Expire = Server()->Tick()
 				+ Secs * Server()->TickSpeed();
@@ -389,18 +387,16 @@ void CGameContext::VoteMute(IConsole::IResult *pResult, NETADDR *pAddr, int Secs
 		Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "votemute", "vote mute array is full");
 }
 
-void CGameContext::Mute(IConsole::IResult *pResult, NETADDR *Addr, int Secs,
+void CGameContext::Mute(IConsole::IResult *pResult, NETADDR *pAddr, int Secs,
 		const char *pDisplayName)
 {
 	char aBuf[128];
 	int Found = 0;
 
-	Addr->port = 0; // ignore port number for mutes
-
 	// find a matching mute for this ip, update expiration time if found
 	for (int i = 0; i < m_NumMutes; i++)
 	{
-		if (net_addr_comp(&m_aMutes[i].m_Addr, Addr) == 0)
+		if (net_addr_comp_noport(&m_aMutes[i].m_Addr, pAddr) == 0)
 		{
 			m_aMutes[i].m_Expire = Server()->Tick()
 							+ Secs * Server()->TickSpeed();
@@ -412,7 +408,7 @@ void CGameContext::Mute(IConsole::IResult *pResult, NETADDR *Addr, int Secs,
 	{
 		if (m_NumMutes < MAX_MUTES)
 		{
-			m_aMutes[m_NumMutes].m_Addr = *Addr;
+			m_aMutes[m_NumMutes].m_Addr = *pAddr;
 			m_aMutes[m_NumMutes].m_Expire = Server()->Tick()
 							+ Secs * Server()->TickSpeed();
 			m_NumMutes++;

src/game/server/gamecontext.cpp

@@ -1382,10 +1382,9 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
 
 			NETADDR Addr;
 			Server()->GetClientAddr(ClientID, &Addr);
-			Addr.port = 0; // ignore port number
 			int VoteMuted = 0;
 			for(int i = 0; i < m_NumVoteMutes && !VoteMuted; i++)
-				if(!net_addr_comp(&Addr, &m_aVoteMutes[i].m_Addr))
+				if(!net_addr_comp_noport(&Addr, &m_aVoteMutes[i].m_Addr))
 					VoteMuted = (m_aVoteMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
 			if(VoteMuted > 0)
 			{
@@ -3280,12 +3279,11 @@ int CGameContext::ProcessSpamProtection(int ClientID)
 		m_apPlayers[ClientID]->m_LastChat = Server()->Tick();
 	NETADDR Addr;
 	Server()->GetClientAddr(ClientID, &Addr);
-	Addr.port = 0; // ignore port number for mutes
 	int Muted = 0;
 
 	for(int i = 0; i < m_NumMutes && !Muted; i++)
 	{
-		if(!net_addr_comp(&Addr, &m_aMutes[i].m_Addr))
+		if(!net_addr_comp_noport(&Addr, &m_aMutes[i].m_Addr))
 			Muted = (m_aMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
 	}