Backport to Generals

Author: slurmlord

Generals/Code/GameEngine/Include/GameNetwork/Transport.h

@@ -50,6 +50,7 @@ class Transport //: public MemoryPoolObject
 
 	Bool init( AsciiString ip, UnsignedShort port );
 	Bool init( UnsignedInt ip, UnsignedShort port );
+	Bool bind( void );
 	void reset( void );
 	Bool update( void );									///< Call this once a GameEngine tick, regardless of whether the frame advances.
 
@@ -80,10 +81,14 @@ class Transport //: public MemoryPoolObject
 	DelayedTransportMessage m_delayedInBuffer[MAX_MESSAGES];
 #endif
 
-	UnsignedShort m_port;
 private:
+
+	void clearBuffers( void );
+
 	Bool m_winsockInit;
 	UDP *m_udpsock;
+	UnsignedInt m_ip;
+	UnsignedShort m_port;
 
 	// Latency insertion and packet loss
 	Bool m_useLatency;

Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -1451,6 +1451,7 @@ void ConnectionManager::initTransport() {
 	m_transport = new Transport;
 	m_transport->reset();
 	m_transport->init(m_localAddr, m_localPort);
+	m_transport->bind();
 }
 
 /**

Generals/Code/GameEngine/Source/GameNetwork/LANAPI.cpp

@@ -100,6 +100,8 @@ void LANAPI::init( void )
 {
 	m_gameStartTime = 0;
 	m_gameStartSeconds = 0;
+	m_transport->reset();
+	m_transport->init(m_localIP, lobbyPort);
 
 	m_pendingAction = ACT_NONE;
 	m_expiration = 0;
@@ -1255,6 +1257,10 @@ Bool LANAPI::SetLocalIP( UnsignedInt localIP )
 
 	m_transport->reset();
 	retval = m_transport->init(m_localIP, lobbyPort);
+	if (retval)
+	{
+		retval = m_transport->bind();
+	}
 	m_transport->allowBroadcasts(true);
 
 	return retval;

Generals/Code/GameEngine/Source/GameNetwork/NAT.cpp

@@ -621,6 +621,7 @@ void NAT::attachSlotList(GameSlot *slotList[], Int localSlot, UnsignedInt localI
 	DEBUG_LOG(("NAT::attachSlotList - using %d as the starting port number", m_startingPortNumber));
 	generatePortNumbers(slotList, localSlot);
 	m_transport->init(m_localIP, getSlotPort(localSlot));
+	m_transport->bind();
 }
 
 Int NAT::getSlotPort(Int slot) {

Generals/Code/GameEngine/Source/GameNetwork/Transport.cpp

@@ -103,28 +103,23 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port )
 		m_winsockInit = true;
 	}
 
-	// ------- Bind our port --------
-	if (m_udpsock)
-		delete m_udpsock;
-	m_udpsock = NEW UDP();
+	m_ip = ip;
+	m_port = port;
+	clearBuffers();
 
-	if (!m_udpsock)
-		return false;
+#if defined(RTS_DEBUG)
+	if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise)
+		m_useLatency = true;
 
-	int retval = -1;
-	time_t now = timeGetTime();
-	while ((retval != 0) && ((timeGetTime() - now) < 1000)) {
-		retval = m_udpsock->Bind(ip, port);
-	}
+	if (TheGlobalData->m_packetLoss)
+		m_usePacketLoss = true;
+#endif
 
-	if (retval != 0) {
-		DEBUG_CRASH(("Could not bind to 0x%8.8X:%d", ip, port));
-		DEBUG_LOG(("Transport::init - Failure to bind socket with error code %x", retval));
-		delete m_udpsock;
-		m_udpsock = NULL;
-		return false;
-	}
+	return true;
+}
 
+void Transport::clearBuffers(void)
+{
 	// ------- Clear buffers --------
 	int i=0;
 	for (; i<MAX_MESSAGES; ++i)
@@ -146,18 +141,35 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port )
 	}
 	m_statisticsSlot = 0;
 	m_lastSecond = timeGetTime();
+}
 
-	m_port = port;
+Bool Transport::bind(void)
+{
+	DEBUG_ASSERTCRASH(m_winsockInit, ("Transport::bind called before Transport::init"));
 
-#if defined(RTS_DEBUG)
-	if (TheGlobalData->m_latencyAverage > 0 || TheGlobalData->m_latencyNoise)
-		m_useLatency = true;
+	// ------- Bind our port --------
+	if (m_udpsock)
+		delete m_udpsock;
+	m_udpsock = NEW UDP();
 
-	if (TheGlobalData->m_packetLoss)
-		m_usePacketLoss = true;
-#endif
+	if (!m_udpsock)
+		return false;
 
-	return true;
+	int retval = -1;
+	time_t now = timeGetTime();
+	while ((retval != 0) && ((timeGetTime() - now) < 1000)) {
+		retval = m_udpsock->Bind(m_ip, m_port);
+	}
+
+	if (retval != 0) {
+		DEBUG_CRASH(("Could not bind to 0x%8.8X:%d", m_ip, m_port));
+		DEBUG_LOG(("Transport::bind - Failure to bind socket with error code %x", retval));
+		delete m_udpsock;
+		m_udpsock = NULL;
+		return false;
+	}
+
+	clearBuffers();
 }
 
 void Transport::reset( void )

GeneralsMD/Code/GameEngine/Source/GameNetwork/Transport.cpp

@@ -121,16 +121,16 @@ Bool Transport::init( UnsignedInt ip, UnsignedShort port )
 void Transport::clearBuffers( void )
 {
 	// ------- Clear buffers --------
-	int i = 0;
-	for (; i < MAX_MESSAGES; ++i)
+	int i=0;
+	for (; i<MAX_MESSAGES; ++i)
 	{
 		m_outBuffer[i].length = 0;
 		m_inBuffer[i].length = 0;
 #if defined(RTS_DEBUG)
 		m_delayedInBuffer[i].message.length = 0;
 #endif
 	}
-	for (i = 0; i < MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
+	for (i=0; i<MAX_TRANSPORT_STATISTICS_SECONDS; ++i)
 	{
 		m_incomingBytes[i] = 0;
 		m_outgoingBytes[i] = 0;
@@ -171,6 +171,7 @@ Bool Transport::bind( void )
 
 	clearBuffers();
 }
+
 void Transport::reset( void )
 {
 	if (m_udpsock)