X-Git-Url: http://deadsoftware.ru/gitweb?p=netwar.git;a=blobdiff_plain;f=server.c;h=38c6790f9ba58a05819bd7f702ccd08baeb49e15;hp=e60ac264fdffb1ac32881cf4bd0812542baba512;hb=HEAD;hpb=9648667f6005a60d828b18661a565a64eb5713da

diff --git a/server.c b/server.c
index e60ac26..38c6790 100644
--- a/server.c
+++ b/server.c
@@ -84,24 +84,29 @@ static void sv_move_player(int id, ProtocolMessage m) {
 	g_player_does(id, m.cl.does.code);
 }
 
-static void sv_register_player(IPaddress address, ProtocolMessage m) {
-	if(m.cl.info.version != PROTOCOL_VERSION)
-		SendMessage(sock, address, sv_kill("Uncompatible version"));
+static void sv_kill_address(IPaddress address, const char * msg) {
+	SDL_Log("sv_kill_address: %s", msg);
+	SendMessage(sock, address, sv_kill(msg));
+}
+
+static void sv_register_player(IPaddress address, ClInfo info) {
+	if(info.version != PROTOCOL_VERSION) {
+		sv_kill_address(address, "Uncompatible version");
+		return;
+	}
 
 	int i = 0;
 	while((i < clientlimit) && (client[i].connected))
 		++i;
 
-	int namesize = sizeof(m.cl.info.name);
 	if(i >= clientlimit) {
-		SDL_Log("Too may clints, player %.*s disconnected", namesize, m.cl.info.name);
-		SendMessage(sock, address, sv_kill("Too many clients"));
+		sv_kill_address(address, "Too many clients");
 		return;
 	}
 
 	client[i].connected = true;
 	client[i].address   = address;
-	strncpy(client[i].name, (char*) m.cl.info.name, MAX_NAMESIZE);
+	strncpy(client[i].name, (char*) info.name, MAX_NAMESIZE);
 	client[i].name[MAX_NAMESIZE - 1] = 0;
 
 	SDL_Log("Player %s (%i) connected", client[i].name, i);
@@ -111,17 +116,24 @@ static void sv_register_player(IPaddress address, ProtocolMessage m) {
 	sv_sync_client(i, true);
 }
 
+static void sv_recv_ipmsg(IPaddress address, ProtocolMessage m) {
+	int id = sv_find_client(address);
+	if(id < 0 && m.type != CL_INFO)
+		return;
+
+	switch(m.type) {
+	case CL_INFO: sv_register_player(address, m.cl.info); break;
+	case CL_KILL: sv_kill_player(id, false, "");  break;
+	case CL_DOES: sv_move_player(id, m);          break;
+	default:      sv_kill_address(address, "Invalid message");
+	}
+}
+
 static void sv_recv() {
 	IPaddress address;
 	ProtocolMessage m;
-	while(RecvMessage(sock, &address, &m)) {
-		switch(m.type) {
-		case CL_INFO: sv_register_player(address, m); break;
-		case CL_KILL: sv_kill_player(sv_find_client(address), false, ""); break;
-		case CL_DOES: sv_move_player(sv_find_client(address), m); break;
-		default:      SDL_Log("invalid message %i", m.type);
-		}
-	}
+	while(RecvMessage(sock, &address, &m))
+		sv_recv_ipmsg(address, m);
 }
 
 static void sv_send() {