fixed econ feature and tcp

1 files changed, 7 insertions, 17 deletions

diff --git a/src/engine/shared/network.h b/src/engine/shared/network.h
index d0b78d05..94e2824c 100644
--- a/src/engine/shared/network.h
+++ b/src/engine/shared/network.h
@@ -49,7 +49,7 @@ enum
 	NET_MAX_CHUNKHEADERSIZE = 5,
 	NET_PACKETHEADERSIZE = 3,
 	NET_MAX_CLIENTS = 16,
-	NET_MAX_CONSOLE_CLIENTS = 16,
+	NET_MAX_CONSOLE_CLIENTS = 4,
 	NET_MAX_SEQUENCE = 1<<10,
 	NET_SEQUENCE_MASK = NET_MAX_SEQUENCE-1,
 
@@ -196,32 +196,27 @@ public:
 class CConsoleNetConnection
 {
 private:
-	unsigned m_State;
+	int m_State;
 
 	NETADDR m_PeerAddr;
 	NETSOCKET m_Socket;
 
 	char m_aBuffer[NET_MAX_PACKETSIZE];
-	char *m_pBufferPos;
+	int m_BufferOffset;
 
 	char m_aErrorString[256];
 
-	int m_Timeout;
-	int64 m_LastRecvTime;
+	bool m_LineEndingDetected;
+	char m_aLineEnding[3];
 
 public:
-	void Init(NETSOCKET Socket);
 	void Init(NETSOCKET Socket, const NETADDR *pAddr);
-	int Connect(const NETADDR *pAddr);
 	void Disconnect(const char *pReason);
 
 	int State() const { return m_State; }
 	NETADDR PeerAddress() const { return m_PeerAddr; }
 	const char *ErrorString() const { return m_aErrorString; }
 
-	void SetTimeout(int Timeout) { m_Timeout = Timeout; }
-	int Timeout() const { return m_Timeout; }
-
 	void Reset();
 	int Update();
 	int Send(const char *pLine);
@@ -337,7 +332,7 @@ private:
 	};
 
 	NETSOCKET m_Socket;
-	CSlot m_aSlots[NET_MAX_CLIENTS];
+	CSlot m_aSlots[NET_MAX_CONSOLE_CLIENTS];
 
 	NETFUNC_NEWCLIENT m_pfnNewClient;
 	NETFUNC_DELCLIENT m_pfnDelClient;
@@ -346,14 +341,13 @@ private:
 	CNetRecvUnpacker m_RecvUnpacker;
 
 public:
-	int SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
+	void SetCallbacks(NETFUNC_NEWCLIENT pfnNewClient, NETFUNC_DELCLIENT pfnDelClient, void *pUser);
 
 	//
 	bool Open(NETADDR BindAddr, int Flags);
 	int Close();
 
 	//
-	int Broadcast(const char *pLine);
 	int Recv(char *pLine, int MaxLength, int *pClientID = 0);
 	int Send(int ClientID, const char *pLine);
 	int Update();
@@ -362,11 +356,7 @@ public:
 	int AcceptClient(NETSOCKET Socket, const NETADDR *pAddr);
 	int Drop(int ClientID, const char *pReason);
 
-	//
-	void SetTimeout(int ClientID, int Timeout) { m_aSlots[ClientID].m_Connection.SetTimeout(Timeout); }
-
 	// status requests
-	int Timeout(int ClientID) { return m_aSlots[ClientID].m_Connection.Timeout(); }
 	NETADDR ClientAddr(int ClientID) const { return m_aSlots[ClientID].m_Connection.PeerAddress(); }
 };