- gameserver podporuje clientov z IPv4-UDP IPv4-TCP IPv6-UDP IPv6-TCP

- client sa moze pripojit na gameserver, ktory podporuje IPv4-UDP IPv4-TCP IPv6-UDP IPv6-TCP ( nie, nie je to 
samozrejmost :) )
- client ma parametre --tcp , --udp ( ak sa neuvedie, implicitne sa berie --udp ) 
- btw. ladit, ladit, ladit



git-svn-id: http://opensvn.csie.org/tuxanci_ng@187 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 77 insertions, 36 deletions

diff --git a/src/base/server.c b/src/base/server.c
index b598810..fe01b5f 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -30,6 +30,7 @@
 #include "checkFront.h"
 #include "protect.h"
 #include "index.h"
+#include "serverSelect.h"
 
 #ifndef PUBLIC_SERVER
 #include "screen_world.h"
@@ -40,14 +41,26 @@
 #include "heightScore.h"
 #endif
 
-#define SUPPORT_UDP
-
 static list_t *listClient;
 
 static list_t *listServerTimer;
 static time_t timeUpdate;
 static int maxClients;
 
+/*
+	TRAFFIC
+
+	za 5 sekund :
+
+	up   : COUNT_PLAYERS * ( COUNT_PLAYERS - 1 ) * 1KB
+	down : COUNT_PLAYERS * 0.2KB
+
+	za 1 sekund :
+
+	up   : COUNT_PLAYERS * ( COUNT_PLAYERS - 1 ) * 1/5 KB
+	down : COUNT_PLAYERS * 1/25 KB
+*/
+
 typedef struct proto_cmd_server_struct
 {
 	char *name;
@@ -147,21 +160,15 @@ void destroyAnyClient(client_t *p)
 	free(p);
 }
 
-static void eventDelClient(client_t *client)
+static void destroyUdpOrTcpClient(client_t *client)
 {
-	int offset;
-
-	offset =  searchListItem(listClient, client);
-
-	assert( offset != -1 );
-
 	switch( client->type )
 	{
 		case CLIENT_TYPE_UDP :
-			delListItem(listClient, offset, destroyUdpClient);
+			destroyUdpClient(client);
 		break;
 		case CLIENT_TYPE_TCP :
-			delListItem(listClient, offset, destroyTcpClient);
+			destroyTcpClient(client);
 		break;
 		default :
 			assert( ! "zly typ !");
@@ -169,6 +176,17 @@ static void eventDelClient(client_t *client)
 	}
 }
 
+static void eventDelClientFromListClient(client_t *client)
+{
+	int offset;
+
+	offset =  searchListItem(listClient, client);
+
+	assert( offset != -1 );
+
+	delListItem(listClient, offset, destroyUdpOrTcpClient);
+}
+
 static void delZombieCLient(void *p_nothink)
 {
 	client_t *thisClient;
@@ -195,7 +213,7 @@ static void delZombieCLient(void *p_nothink)
 				proto_send_del_server(PROTO_SEND_ALL, NULL, thisClient->tux->id);
 			}
 
-			eventDelClient(thisClient);
+			eventDelClientFromListClient(thisClient);
 			i--;
 		}
 	}
@@ -208,7 +226,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 	int i;
 
 #ifndef PUBLIC_SERVER
-		proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, getControlTux(TUX_CONTROL_KEYBOARD_RIGHT));
+	proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, getControlTux(TUX_CONTROL_KEYBOARD_RIGHT));
 #endif
 
 	for( i = 0 ; i < listClient->count; i++ )
@@ -246,7 +264,7 @@ void setServerTimer()
 	addTaskToTimer(listServerTimer, TIMER_PERIODIC, eventSendPingClients, NULL, SERVER_TIME_PING);
 }
 
-int initServer(char *ip, int port, int proto)
+int initServer(char *ip4, int port4, char *ip6, int port6)
 {
 	int ret;
 
@@ -258,13 +276,20 @@ int initServer(char *ip, int port, int proto)
 	setServerMaxClients(SERVER_MAX_CLIENTS);
 	setServerTimer();
 
-#ifdef SUPPORT_UDP
-	ret = initUdpServer(ip, port, proto);
-#endif
+	ret = initUdpServer(ip4, port4, ip6, port6);
+
+	if( ret == 0 )
+	{
+		return -1;
+	}
+
+	ret = initTcpServer(ip4, port4, ip6, port6);
+
+	if( ret == 0 )
+	{
+		return -1;
+	}
 
-#ifdef SUPPORT_TCP
-	ret = initTcpServer(ip, port, proto);
-#endif
 	return ret;
 }
 
@@ -532,12 +557,39 @@ static void eventClientListBuffer()
 
 void eventServer()
 {
-#ifdef SUPPORT_UDP
-	eventUdpServer();
+#ifndef PUBLIC_SERVER
+	int count;
+
+	do{
+		restartSelect();
+		setServerTcpSelect();
+		actionSelect();
+		count = selectServerTcpSocket();
+	}while( count > 0 );
+
+	do{
+		restartSelect();
+		setServerUdpSelect();
+		actionSelect();
+		count = selectServerUdpSocket();
+	}while( count > 0 );
 #endif
 
-#ifdef SUPPORT_TCP
-	eventTcpServer();
+#ifdef PUBLIC_SERVER
+	int ret;
+
+	restartSelect();
+
+	setServerTcpSelect();
+	setServerUdpSelect();
+
+	ret = actionSelect();
+
+	if( ret > 0 )
+	{
+		selectServerTcpSocket();
+		selectServerUdpSocket();
+	}
 #endif
 
 	eventClientListBuffer();
@@ -550,21 +602,10 @@ void quitServer()
 
 	assert( listClient != NULL );
 
-#ifdef SUPPORT_UDP
-	destroyListItem(listClient, destroyUdpClient);
-#endif
-
-#ifdef SUPPORT_TCP
-	destroyListItem(listClient, destroyTcpClient);
-#endif
+	destroyListItem(listClient, destroyUdpOrTcpClient);
 
 	destroyTimer(listServerTimer);
 
-#ifdef SUPPORT_UDP
 	quitUdpServer();
-#endif
-
-#ifdef SUPPORT_TCP
 	quitTcpServer();
-#endif
 }