Planeshift: a 3D MMORPG

Revision: 3325
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3325&view=rev
Author:   KhakiLord
Date:     2009-03-27 00:20:14 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Removed send trigger in netbase as this can prevent packets being merged together.
Reduced the select timeout to 10ms since send trigger is removed and to reduce network lag.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-03-26 22:56:15 UTC (rev 3324)
+++ trunk/src/common/net/netbase.cpp	2009-03-27 00:20:14 UTC (rev 3325)
@@ -77,9 +77,9 @@
     
     profs = new psNetMsgProfiles();
     
-    // Initialize the timeout to 100ms
+    // Initialize the timeout to 10ms
     timeout.tv_sec = 0;
-    timeout.tv_usec = 100000;
+    timeout.tv_usec = 10000;
 
     msgstrings = NULL;
     engine = NULL;
@@ -1002,8 +1002,9 @@
         
 #ifndef CS_PLATFORM_WIN32
         // tell the network code there is a transmission waiting, this minimises lag time for sending network messages
-        if(pipe_fd[1] > 0)
-            write(pipe_fd[1], &notify, 1);
+        // DISABLED: This prevents multiple packets coalescing.
+        //if(pipe_fd[1] > 0)
+           // write(pipe_fd[1], &notify, 1);
 #endif
         
         bytesleft -= pktlen;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3328
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3328&view=rev
Author:   KhakiLord
Date:     2009-03-27 10:48:54 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Increased netcode timeout to 30ms.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-03-27 03:43:21 UTC (rev 3327)
+++ trunk/src/common/net/netbase.cpp	2009-03-27 10:48:54 UTC (rev 3328)
@@ -77,9 +77,9 @@
     
     profs = new psNetMsgProfiles();
     
-    // Initialize the timeout to 10ms
+    // Initialize the timeout to 30ms, adds 30ms of latency but gives time for packets to coalesce
     timeout.tv_sec = 0;
-    timeout.tv_usec = 10000;
+    timeout.tv_usec = 30000;
 
     msgstrings = NULL;
     engine = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4190
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4190&view=rev
Author:   Vengeance2001
Date:     2009-08-05 20:52:43 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Commented out annoying leftover printf.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-08-05 12:51:07 UTC (rev 4189)
+++ trunk/src/common/net/netbase.cpp	2009-08-05 20:52:43 UTC (rev 4190)
@@ -1274,7 +1274,7 @@
             // Block permanently on the full queue so we don't have a problem with fake acks
             CS_ASSERT(inqueues[i]->AddWait(me));
         }
-        printf("Just queued inbound message to be processed.\n");
+        // printf("Just queued inbound message to be processed.\n");
     }
     return success;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4992
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4992&view=rev
Author:   Khakilord
Date:     2009-12-19 02:39:31 +0000 (Sat, 19 Dec 2009)

Log Message:
-----------
Fixes to shared resending code.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-19 02:15:09 UTC (rev 4991)
+++ trunk/src/common/net/netbase.cpp	2009-12-19 02:39:31 UTC (rev 4992)
@@ -432,10 +432,11 @@
 
 void NetBase::CheckResendPkts()
 {
+	// NOTE: Globaliterators on csHash do not retrieve keys contiguously.
     csHash<csRef<psNetPacketEntry> , PacketKey>::GlobalIterator it(awaitingack.GetIterator());
     csRef<psNetPacketEntry> pkt;
     csArray<csRef<psNetPacketEntry> > pkts;
-    Connection *currentConnection = NULL;
+    csArray<Connection*> resentConnections;
 
     csTicks currenttime = csGetTicks();
     unsigned int resentCount = 0;
@@ -458,20 +459,10 @@
         	// Check the connection packet timeout
         	if (pkt->timestamp + MIN(PKTMAXRTO, connection->RTO * connection->backoff) >= currenttime)
         		continue;
+        	if (resentConnections.Find(connection) == csArrayItemNotFound)
+        	    resentConnections.Push(connection);
         }
         resentCount++;
-        if (connection != currentConnection)
-        {
-        	// Perform exponential backoff once for each connection since pkts are ordered
-        	// by clientnum
-        	// Now backoff previous connection for the next time we need to resend those packets
-        	if (currentConnection && (currentConnection->backoff == 1 || currentConnection->backoffStart + MIN(PKTMAXRTO, currentConnection->RTO * currentConnection->backoff) <= currenttime))
-        	{
-        		currentConnection->backoffStart = currenttime;
-        		currentConnection->backoff *= 2;
-        		currentConnection = connection;
-        	}
-        }
         
         pkt->timestamp = currenttime;   // update stamp on packet
         pkt->retransmitted = true;
@@ -490,12 +481,19 @@
             }
         }
     }
-    // Backoff last connection
-	if (currentConnection && (currentConnection->backoff == 1 || currentConnection->backoffStart + MIN(PKTMAXRTO, currentConnection->RTO * currentConnection->backoff) <= currenttime))
-	{
-		currentConnection->backoffStart = currenttime;
-		currentConnection->backoff *= 2;
-	}
+    for(size_t i = 0; i < resentConnections.GetSize(); i++)
+    {
+		// Perform exponential backoff once for each connection since pkts are ordered
+		// by clientnum
+		
+		// Now backoff previous connection for the next time we need to resend those packets
+		if (resentConnections[i]->backoff == 1 || resentConnections[i]->backoffStart + MIN(PKTMAXRTO, resentConnections[i]->RTO * resentConnections[i]->backoff) <= currenttime)
+		{
+			resentConnections[i]->backoffStart = currenttime;
+			resentConnections[i]->backoff *= 2;
+		}
+    }
+
     if(resentCount > 0)
     {
         resends[resendIndex] = resentCount;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5014
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5014&view=rev
Author:   Khakilord
Date:     2009-12-21 22:13:15 +0000 (Mon, 21 Dec 2009)

Log Message:
-----------
Added more debugging info to so-called malicious messages.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-21 21:58:06 UTC (rev 5013)
+++ trunk/src/common/net/netbase.cpp	2009-12-21 22:13:15 UTC (rev 5014)
@@ -1244,8 +1244,8 @@
      */
     if (!invalidated && offset != totallength)
     {
-        Error2("Discarding MALICIOUS message.  Gaps in fragments attempt to capture data from uninitialized memory.  Missing packet with offset %u. (but total length of remaining fragments equals total message length).\n",
-                            offset);
+        Error3("Discarding MALICIOUS message.  Gaps in fragments attempt to capture data from uninitialized memory.  Missing packet with offset %u total length %u. (but total length of remaining fragments equals total message length).\n",
+                            offset, totallength);
         invalidated=true;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5027
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5027&view=rev
Author:   Khakilord
Date:     2009-12-22 17:46:05 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Compiler warning fixes.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-22 17:43:28 UTC (rev 5026)
+++ trunk/src/common/net/netbase.cpp	2009-12-22 17:46:05 UTC (rev 5027)
@@ -339,7 +339,7 @@
       
                 if (connection->estRTT > 0)
                 {
-                	int diff = elapsed - connection->estRTT;
+                	int diff = (int) (elapsed - connection->estRTT);
 					connection->estRTT += (int) (0.125 * diff);
 					if(diff < 0)
 						diff = -diff;
@@ -352,7 +352,7 @@
                 	connection->devRTT = elapsed / 2;
                 }
                 // Update the packet timeout
-				connection->RTO = connection->estRTT + 4 * connection->devRTT;
+				connection->RTO = (int) (connection->estRTT + 4 * connection->devRTT);
 				if (connection->RTO > PKTMAXRTO)
 					connection->RTO = PKTMAXRTO;
 				else if(connection->RTO < PKTMINRTO)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5028
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5028&view=rev
Author:   Khakilord
Date:     2009-12-22 17:46:51 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Compiler warning fixes.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-22 17:46:05 UTC (rev 5027)
+++ trunk/src/common/net/netbase.cpp	2009-12-22 17:46:51 UTC (rev 5028)
@@ -682,7 +682,7 @@
         if(q->Count() > 0)
         	readd.Push(q);
     }
-    for(int i = 0; i < readd.GetSize(); i++)
+    for(size_t i = 0; i < readd.GetSize(); i++)
     	senders.Add(readd[i]);
     // Statistics updating
     csTicks timeTaken = csGetTicks() - begin;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5052
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5052&view=rev
Author:   Khakilord
Date:     2009-12-26 00:14:47 +0000 (Sat, 26 Dec 2009)

Log Message:
-----------
Reduced warnings when sending messages.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-26 00:11:37 UTC (rev 5051)
+++ trunk/src/common/net/netbase.cpp	2009-12-26 00:14:47 UTC (rev 5052)
@@ -708,7 +708,7 @@
     sendStats[avgIndex].messages = sentCount;
     sendStats[avgIndex].time = timeTaken;
     
-    if(senderCount > 0 && (avgIndex == 1 || timeTaken > 50))
+    if(senderCount > 0 && (avgIndex == 1 || timeTaken > 100))
     {
         unsigned int peakSenders = 0;
         float peakMessagesPerSender = 0.0f;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5093
          http://planeshift.svn.sourceforge.net/planeshift/?rev=5093&view=rev
Author:   Khakilord
Date:     2009-12-29 10:42:45 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Small optimisation when not simulating packet loss.

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2009-12-29 10:41:51 UTC (rev 5092)
+++ trunk/src/common/net/netbase.cpp	2009-12-29 10:42:45 UTC (rev 5093)
@@ -243,7 +243,7 @@
     pkt.AttachNew(new psNetPacketEntry( bufpacket, 
             connection ? connection->clientnum : 0, packetlen));
     
-    if(randomgen->Get() < TEST_PACKETLOSS)
+    if(TEST_PACKETLOSS > 0.0 && randomgen->Get() < TEST_PACKETLOSS)
     {
 		psNetPacket* packet = pkt->packet;
 		int type = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7010
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7010&view=rev
Author:   weltall2
Date:     2011-02-27 15:22:41 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
fixed build in platforms lacking basic posix sockets support

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2011-02-27 10:38:40 UTC (rev 7009)
+++ trunk/src/common/net/netbase.cpp	2011-02-27 15:22:41 UTC (rev 7010)
@@ -47,6 +47,11 @@
 #include "util/serverconsole.h"
 #include "util/strutil.h"
 
+//temporary definition for os lacking this
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
 int NetBase::socklibrefcount=0;
 
 // warning: this messes your logs with much data


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7073
          http://planeshift.svn.sourceforge.net/planeshift/?rev=7073&view=rev
Author:   weltall2
Date:     2011-03-11 08:21:09 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
changed strcpy to strncpy

Modified Paths:
--------------
    trunk/src/common/net/netbase.cpp

Modified: trunk/src/common/net/netbase.cpp
===================================================================
--- trunk/src/common/net/netbase.cpp	2011-03-10 21:45:48 UTC (rev 7072)
+++ trunk/src/common/net/netbase.cpp	2011-03-11 08:21:09 UTC (rev 7073)
@@ -196,12 +196,12 @@
         //for win32 for now only inet_ntoa as inet_ntop wasn't supported till vista.
         //it has the same degree of compatibility of the previous code and it's supported till win2000
         #ifdef WIN32
-        strcpy(addrText, inet_ntoa(addr.sin_addr));
+        strncpy(addrText, inet_ntoa(addr.sin_addr), INET_ADDRSTRLEN);
         #else
         //there was a failure in conversion if null
         if(!inet_ntop(addr.sin_family,&addr.sin_addr, addrText, sizeof(addrText)))
         {
-            strcpy(addrText, "UNKNOWN");
+            strncpy(addrText, "UNKNOWN", INET_ADDRSTRLEN);
         }
         #endif
 
@@ -230,12 +230,12 @@
         //for win32 for now only inet_ntoa as inet_ntop wasn't supported till vista.
         //it has the same degree of compatibility of the previous code and it's supported till win2000
         #ifdef WIN32
-        strcpy(addrText, inet_ntoa(addr.sin_addr));
+        strncpy(addrText, inet_ntoa(addr.sin_addr), INET_ADDRSTRLEN);
         #else
         //there was a failure in conversion if null
         if(!inet_ntop(addr.sin_family,&addr.sin_addr, addrText, sizeof(addrText)))
         {
-            strcpy(addrText, "UNKNOWN");
+            strncpy(addrText, "UNKNOWN", INET_ADDRSTRLEN);
         }
         #endif
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.