epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Foo

Browse Source
This commit is contained in:
Paul Chote
2010-12-31 18:26:03 +13:00
parent 1d3b2334d0
commit 42096cc5c9
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Game/Server/Server.cs
View File

@@ -177,7 +177,7 @@ namespace OpenRA.Server
catch (Exception) { DropClient(newConn); } catch (Exception) { DropClient(newConn); }
} }
void AcceptClient(Connection newConn, Session.Client client) void ValidateClient(Connection newConn, string data)
{ {
try try
{ {
@@ -185,10 +185,12 @@ namespace OpenRA.Server
{ {
Log.Write("server", "Rejected connection from {0}; game is already started.", Log.Write("server", "Rejected connection from {0}; game is already started.",
newConn.socket.RemoteEndPoint); newConn.socket.RemoteEndPoint);
newConn.socket.Close(); DropClient(newConn);
return; return;
} }
var client = HandshakeResponse.Deserialize(data).Client;
// Promote connection to a valid client // Promote connection to a valid client
preConns.Remove(newConn); preConns.Remove(newConn);
conns.Add(newConn); conns.Add(newConn);
@@ -327,14 +329,7 @@ namespace OpenRA.Server
break; break;
case "HandshakeResponse": case "HandshakeResponse":
var response = HandshakeResponse.Deserialize(so.Data); ValidateClient(conn, so.Data);
// TODO: Validate password
// Accept connection, set initial client info
AcceptClient(conn, response.Client);
SyncLobbyInfo();
break; break;
case "Chat": case "Chat":
case "TeamChat": case "TeamChat":