Revert "try some more dnc sourced changes...if this is whitespace only, please ignore"

mirror of https://github.com/SWG-Source/src.git synced 2026-07-28 22:15:49 -04:00

This reverts commit 21eaf66597.

Conflicts:
	engine/shared/library/sharedNetwork/src/shared/NetworkHandler.cpp

This commit is contained in:

CodeCodon

2015-08-09 18:11:13 -05:00

parent cc17520cdb

commit 36ea3085ec

9 changed files with 19 additions and 19 deletions

									
										engine/server/application/LogServer/src/shared/LoggingServerApi.cpp
									
		+1
		-1
	
												View File
												
				@@ -70,7 +70,7 @@ void LoggingServerApi::Connect(const char *address, int port, const char *loginN

					params.port = 0;

					params.pooledPacketMax = 1000;

					params.reliable[0].maxInstandingPackets = 512;

					params.reliable[0].maxOutstandingBytes = 1 * 1024;

					params.reliable[0].maxOutstandingBytes = 128 * 1024;

					params.reliable[0].congestionWindowMinimum = 50000;

					params.reliable[0].maxOutstandingPackets = 512;

					params.reliable[0].processOnSend = false;

									
										engine/shared/library/sharedNetwork/src/shared/ConfigSharedNetwork.cpp
									
		+4
		-4
	
												View File
												
				@@ -518,12 +518,12 @@ void ConfigSharedNetwork::install(int newClockSyncDelay)

					KEY_INT   (incomingBufferSize, 4 * 1024 * 1024);

					KEY_INT   (outgoingBufferSize, 4 * 1024 * 1024);

					KEY_INT   (maxConnections, 1000);

					KEY_INT   (maxRawPacketSize, 1460); 

					KEY_INT   (maxRawPacketSize, 496); 

					KEY_INT   (maxInstandingPackets, 400);

					KEY_INT   (maxOutstandingBytes, 1 * 1024);

					KEY_INT   (maxOutstandingBytes, 200 * 1024);

					KEY_INT   (maxOutstandingPackets, 400);

					KEY_BOOL  (processOnSend, false);

					KEY_BOOL  (processIcmpErrors, false);

					KEY_BOOL  (processIcmpErrors, true);

					KEY_INT   (fragmentSize, 496);

					KEY_INT   (pooledPacketMax, 1024);

					KEY_INT   (pooledPacketSize, -1);

				@@ -555,7 +555,7 @@ void ConfigSharedNetwork::install(int newClockSyncDelay)

					KEY_BOOL  (allowPortRemapping, true);

					KEY_BOOL  (useTcp, true);

					KEY_INT   (tcpMinimumFrame, 1000);

					KEY_BOOL  (reportUdpDisconnects, true);

					KEY_BOOL  (reportUdpDisconnects, false);

					KEY_BOOL  (reportTcpDisconnects, true);

					KEY_BOOL  (logConnectionConstructionDestruction, false);

					KEY_BOOL  (logConnectionOpenedClosed, false);

									
										external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpManager.h
									
Vendored

		+6
		-6
	
												View File
												
				@@ -562,7 +562,7 @@ class UdpManager : public UdpGuardedRefCount

				        typedef UdpParams Params;                   // DEPRECATED: in here for backwards compatibility

				        enum { cProtocolVersion = 2 };        // protocol version must match on both ends, or connect packets are simply ignored by the server

				        enum { cHardMaxRawPacketSize = 1460 };

				        enum { cHardMaxRawPacketSize = 8192 };

				        enum { cHardMaxOutstandingPackets = 30000 };    // don't change this

				        UdpManager(const UdpParams *params);

				@@ -1076,7 +1076,7 @@ inline UdpParams::UdpParams(ManagerRole role)

				    packetHistoryMax = 4;

				    maxDataHoldTime = 50;

				    maxDataHoldSize = -1;

				    maxRawPacketSize = 1460;

				    maxRawPacketSize = 512;

				    hashTableSize = 100;

				    avoidPriorityQueue = false;

				    clockSyncDelay = 0;

				@@ -1113,7 +1113,7 @@ inline UdpParams::UdpParams(ManagerRole role)

				    userSuppliedEncryptExpansionBytes2 = 0;

				    reliable[0].maxInstandingPackets = 400;

				    reliable[0].maxOutstandingBytes = 1 * 1024;

				    reliable[0].maxOutstandingBytes = 200 * 1024;

				    reliable[0].maxOutstandingPackets = 400;

				    reliable[0].outOfOrder = false;

				    reliable[0].coalesce = true;

				@@ -1143,7 +1143,7 @@ inline UdpParams::UdpParams(ManagerRole role)

				            pooledPacketInitial = 1000;

				            allowPortRemapping = false;

				            reliable[0].maxInstandingPackets = 1000;

				            reliable[0].maxOutstandingBytes = 1 * 1024;

				            reliable[0].maxOutstandingBytes = 1024 * 1024;

				            reliable[0].maxOutstandingPackets = 1000;

				            reliable[0].congestionWindowMinimum = 8192;

				            reliable[0].resendDelayAdjust = 150;

				@@ -1162,7 +1162,7 @@ inline UdpParams::UdpParams(ManagerRole role)

				            pooledPacketInitial = 100;

				            allowPortRemapping = false;

				            reliable[0].maxInstandingPackets = 1000;

				            reliable[0].maxOutstandingBytes = 1 * 1024;

				            reliable[0].maxOutstandingBytes = 1024 * 1024;

				            reliable[0].maxOutstandingPackets = 1000;

				            reliable[0].congestionWindowMinimum = 8192;

				            reliable[0].resendDelayAdjust = 150;

				@@ -1204,7 +1204,7 @@ inline UdpParams::UdpParams(ManagerRole role)

				            incomingLogicalPacketMax = 200 * 1024 * 1024;

				            callbackEventPoolMax = 50000;

				            reliable[0].maxInstandingPackets = 32000;

				            reliable[0].maxOutstandingBytes = 1 * 1024;

				            reliable[0].maxOutstandingBytes = 50 * 1024 * 1024;

				            reliable[0].maxOutstandingPackets = 32000;

				            reliable[0].congestionWindowMinimum = 300000;

				            reliable[0].toleranceLossCount = 100;

									
										external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp
									
Vendored

		+1
		-1
	
												View File
												
				@@ -169,7 +169,7 @@ namespace API_NAMESPACE

						params.allowPortRemapping					= false;				// set to false (optional)

						params.oldestUnacknowledgedTimeout			= 15 * 1000;			// set to 30000 (longer for debugging tolerance)

						params.maxDataHoldTime						= 0;					// set to 0 (this is critical)

						params.reliable[0].maxOutstandingBytes		= 1 * 1024;				// set to 2mb

						params.reliable[0].maxOutstandingBytes		= 2 * 1024 * 1024;		// set to 2mb

						params.reliable[0].maxOutstandingPackets	= 4000;					// set to 4000

						params.reliable[0].resendDelayAdjust		= 1500;					// set to 1500

						params.reliable[0].congestionWindowMinimum  = 50000;				// set to 50000

									
										external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp
									
Vendored

		+1
		-1
	
												View File
												
				@@ -140,7 +140,7 @@ namespace NAMESPACE

						params.allowPortRemapping					= false;				// set to false (optional)

						params.oldestUnacknowledgedTimeout			= 15 * 1000;			// set to 30000 (longer for debugging tolerance)

						params.maxDataHoldTime						= 0;					// set to 0 (this is critical)

						params.reliable[0].maxOutstandingBytes		= 1 * 1024;		// set to 2mb

						params.reliable[0].maxOutstandingBytes		= 2 * 1024 * 1024;		// set to 2mb

						params.reliable[0].maxOutstandingPackets	= 4000;					// set to 4000

						params.reliable[0].resendDelayAdjust		= 1500;					// set to 1500

						params.reliable[0].congestionWindowMinimum  = 50000;				// set to 50000

									
										external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.cpp
									
Vendored

		+2
		-2
	
												View File
												
				@@ -169,7 +169,7 @@ UdpManager::Params::Params()

					packetHistoryMax = 100;

					maxDataHoldTime = 50;

					maxDataHoldSize = -1;

					maxRawPacketSize = 1460;

					maxRawPacketSize = 512;

					hashTableSize = 100;

					avoidPriorityQueue = false;

					clockSyncDelay = 0;

				@@ -207,7 +207,7 @@ UdpManager::Params::Params()

					simulateOutgoingOverloadLevel = 0;

					reliable[0].maxInstandingPackets = 400;

					reliable[0].maxOutstandingBytes = 1 * 1024;

					reliable[0].maxOutstandingBytes = 200 * 1024;

					reliable[0].maxOutstandingPackets = 400;

					reliable[0].outOfOrder = false;

					reliable[0].processOnSend = false;

									
										external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/UdpLibrary/UdpLibrary.hpp
									
Vendored

		+1
		-1
	
												View File
												
				@@ -443,7 +443,7 @@ class UdpManager

						enum { cReliableChannelCount = 4 };

						enum { cEncryptPasses = 2 };

						enum { cProtocolVersion = 2 };		// protocol version must match on both ends, or connect packets are simply ignored by the server

						enum { cHardMaxRawPacketSize = 1460 };

						enum { cHardMaxRawPacketSize = 16384 };

						enum { cHardMaxOutstandingPackets = 30000 };	// don't change this

						struct ReliableConfig

									
										external/3rd/library/udplibrary/UdpLibrary.cpp
									
Vendored

		+2
		-2
	
												View File
												
				@@ -163,7 +163,7 @@ UdpManager::Params::Params()

					packetHistoryMax = 100;

					maxDataHoldTime = 50;

					maxDataHoldSize = -1;

					maxRawPacketSize = 1460;

					maxRawPacketSize = 512;

					hashTableSize = 100;

					avoidPriorityQueue = false;

					clockSyncDelay = 0;

				@@ -200,7 +200,7 @@ UdpManager::Params::Params()

					simulateOutgoingOverloadLevel = 0;

					reliable[0].maxInstandingPackets = 400;

					reliable[0].maxOutstandingBytes = 1 * 1024;

					reliable[0].maxOutstandingBytes = 200 * 1024;

					reliable[0].maxOutstandingPackets = 400;

					reliable[0].outOfOrder = false;

					reliable[0].processOnSend = false;

									
										external/3rd/library/udplibrary/UdpLibrary.hpp
									
Vendored

		+1
		-1
	
												View File
												
				@@ -441,7 +441,7 @@ class UdpManager

						enum { cReliableChannelCount = 4 };

						enum { cEncryptPasses = 2 };

						enum { cProtocolVersion = 2 };		// protocol version must match on both ends, or connect packets are simply ignored by the server

						enum { cHardMaxRawPacketSize = 1460 };

						enum { cHardMaxRawPacketSize = 16384 };

						enum { cHardMaxOutstandingPackets = 30000 };	// don't change this

						struct ReliableConfig