podpora downServera v gameServery ;)

5 files changed, 368 insertions, 12 deletions

diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index f6f3935..1a16cbf 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -308,22 +308,17 @@ void loadArenaFile(char *path)
 	addList(listArenaFile, newArenaFile(path));
 }
 
-void initArenaFile()
+static void loadArenaFromDirector(char *director)
 {
 	director_t *p;
 	int i;
 
-#ifndef PUBLIC_SERVER
-	assert(isImageInicialized() == TRUE);
-#endif
-	isArenaFileInit = TRUE;
-	listArenaFile = newList();
-
-	p = loadDirector(PATH_ARENA);
+	printf(_("Load arena file from %s\n"), director);
+	p = loadDirector(director);
 
 	if (p==NULL)
 	{
-		fprintf(stderr, _("Director " PATH_ARENA " not found !\n"));
+		fprintf(stderr, _("Director %s not found !\n"), director);
 		exit(-1);
 	}
 
@@ -335,7 +330,14 @@ void initArenaFile()
 		if (strstr(line, ".zip") != NULL && strstr(line, "~") == NULL) {
 			char path[STR_PATH_SIZE];
 
-			sprintf(path, PATH_ARENA "%s", line);
+			if( director[strlen(director)-1] == '/' )
+			{
+				sprintf(path, "%s%s", director, line);
+			}
+			else
+			{
+				sprintf(path, "%s/%s", director, line);
+			}
 #ifdef DEBUG
 			printf(_("Loading arena: %s\n"), line);
 #endif
@@ -343,8 +345,23 @@ void initArenaFile()
 			loadArenaFile(path);
 		}
 	}
+
 	//printf("No. of Arens: %d\n", listArenaFile->count);
 	destroyDirector(p);
+
+}
+
+void initArenaFile()
+{
+#ifndef PUBLIC_SERVER
+	assert(isImageInicialized() == TRUE);
+#endif
+	isArenaFileInit = TRUE;
+	listArenaFile = newList();
+
+	loadArenaFromDirector(PATH_ARENA);
+	loadArenaFromDirector(getHomeDirector());
+
 }
 
 void quitArenaFile()
diff --git a/src/base/downServer.c b/src/base/downServer.c
new file mode 100644
index 0000000..f0625a9
--- /dev/null
+++ b/src/base/downServer.c
@@ -0,0 +1,312 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/types.h>
+
+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+#include "main.h"
+#include "list.h"
+#include "server.h"
+#include "myTimer.h"
+#include "arena.h"
+#include "serverSelect.h"
+#include "downServer.h"
+#include "arenaFile.h"
+
+#include "tcp.h"
+#include "buffer.h"
+
+#define DOWN_SERVER_LIMIT_BUFFER	10240
+#define DOWN_SERVER_SEND_FILE_BUFFER	4096
+
+#define NET_STATUS_OK		0
+#define NET_STATUS_ZOMBIE	1
+
+static sock_tcp_t *sock_server_tcp;
+static list_t *listClient;
+
+typedef struct client_down_server_struct
+{
+	int status_connect;
+	sock_tcp_t *sock;
+	buffer_t *recvBuffer;
+	buffer_t *sendBuffer;
+
+	FILE *file;
+	int size;
+	int send;
+} client_ds_t;
+
+static int getFileSize(char *s)
+{
+	struct stat buf;
+
+	if( lstat(s, &buf) < 0 )
+	{
+		return -1;
+	}
+
+	return buf.st_size;
+}
+
+static void proto_getarena(client_ds_t *client, char *msg)
+{
+	arenaFile_t *arenaFile;
+	char msg_out[STR_PROTO_SIZE];
+	char *arenaName;
+
+	arenaName = msg+9;
+
+	//printf("arena = >>%s<<\n", arenaName);
+	arenaFile = getArenaFileFormNetName(arenaName);
+
+	if( arenaFile == NULL )
+	{
+		char *error_msg = _("ERR Arena not found !\n");
+		addBuffer(client->sendBuffer, error_msg, strlen(error_msg));
+		return;
+	}
+
+	client->file = fopen(arenaFile->path, "rb");
+
+	if( client->file == NULL )
+	{
+		char *error_msg = _("ERR Server has a problem !\n");
+		addBuffer(client->sendBuffer, error_msg, strlen(error_msg));
+		return;
+	}
+
+	client->size = getFileSize(arenaFile->path);
+	sprintf(msg_out, "OK %d\n", client->size);
+	addBuffer(client->sendBuffer, msg_out, strlen(msg_out));
+}
+
+static void do_proto(client_ds_t *client, char *msg)
+{
+	if( strncmp(msg, "GETARENA ", 9) == 0 && client->file == NULL )
+	{
+		proto_getarena(client, msg);
+	}
+}
+
+static client_ds_t* newClient(sock_tcp_t *sock)
+{
+	client_ds_t *new;
+
+	new = malloc( sizeof(client_ds_t) );
+	memset(new, 0, sizeof(client_ds_t));
+
+	new->status_connect = NET_STATUS_OK;
+	new->sock = sock;
+	new->recvBuffer = newBuffer(DOWN_SERVER_LIMIT_BUFFER);
+	new->sendBuffer = newBuffer(DOWN_SERVER_LIMIT_BUFFER);
+
+	return new;
+}
+
+static void destroyClient(client_ds_t *client)
+{
+	closeTcpSocket(client->sock);
+	destroyBuffer(client->recvBuffer);
+	destroyBuffer(client->sendBuffer);
+
+	if( client->file != NULL )
+	{
+		fclose(client->file);
+	}
+
+	free(client);
+}
+
+int initDownServer(char *ip4, int port4)
+{
+	sock_server_tcp = bindTcpSocket(ip4, port4, PROTO_TCPv4);
+
+	if( sock_server_tcp == NULL )
+	{
+		fprintf(stderr, _("down server do not inicialized !\n"));
+		return -1;
+	}
+
+	setTcpSockNonBlock(sock_server_tcp);
+
+	listClient = newList();
+
+	return 0;
+}
+
+int setDownServerSelect()
+{
+	int i;
+
+	addSockToSelectRead(sock_server_tcp->sock);
+
+	for( i = 0 ; i < listClient->count ; i++ )
+	{
+		client_ds_t *this;
+
+		this = (client_ds_t *)listClient->list[i];
+
+		addSockToSelectRead(this->sock->sock);
+
+		if( getBufferSize(this->sendBuffer) > 0 )
+		{
+			addSockToSelectWrite(this->sock->sock);
+		}
+	}
+
+	return 0;
+}
+
+static void eventNewClient(sock_tcp_t *sock_server)
+{
+	sock_tcp_t *sock_client;
+	client_ds_t *client;
+
+	sock_client = getTcpNewClient(sock_server);
+	setTcpSockNonBlock(sock_client);
+	client = newClient(sock_client);
+
+	addList(listClient, client);
+}
+
+static void eventReadClient(client_ds_t * client)
+{
+	char buffer[STR_PROTO_SIZE];
+	int ret;
+
+	memset(buffer, 0, STR_PROTO_SIZE);
+
+	ret = readTcpSocket(client->sock, buffer, STR_PROTO_SIZE - 1);
+	//printf("readTcpSocket = %d\n", ret);
+
+	if (ret <= 0)
+	{
+		client->status_connect = NET_STATUS_ZOMBIE;
+		return;
+	}
+
+	if( addBuffer(client->recvBuffer, buffer, ret) < 0 )
+	{
+		client->status_connect = NET_STATUS_ZOMBIE;
+		return;
+	}
+
+	while( getBufferLine(client->recvBuffer, buffer, STR_PROTO_SIZE) >= 0 )
+	{
+		int len;
+
+		len = strlen(buffer);
+
+		if( buffer[len-1] == '\n' )
+		{
+			buffer[len-1] = '\0';
+		}
+
+		do_proto(client, buffer);
+		//addBuffer(client->sendBuffer, buffer, strlen(buffer));
+	}
+}
+
+static void eventWriteClient(client_ds_t *client)
+{
+	void *data;
+	int len;
+	int res;
+
+	len = getBufferSize(client->sendBuffer);
+
+	if( len == 0 )
+	{
+		return;
+	}
+
+	data = getBufferData(client->sendBuffer);
+
+	res = writeTcpSocket(client->sock, data, len);
+	//printf("writeTcpSocket = %d\n", res);
+
+	if( res < 0 )
+	{
+		client->status_connect = NET_STATUS_ZOMBIE;
+		return;
+	}
+
+	cutBuffer(client->sendBuffer, res);
+}
+
+static void sendFile(client_ds_t *client)
+{
+	char buffer[DOWN_SERVER_SEND_FILE_BUFFER];
+	int count;
+
+	count = client->size - client->send;
+
+	if( count > DOWN_SERVER_SEND_FILE_BUFFER )
+	{
+		count = DOWN_SERVER_SEND_FILE_BUFFER;
+	}
+
+	if( fread(buffer, count, 1, client->file) != 1 )
+	{
+		client->status_connect = NET_STATUS_ZOMBIE;
+		return;
+	}
+
+	addBuffer(client->sendBuffer, buffer, count);
+	client->send += count;
+}
+
+int selectDownServerSocket()
+{
+	int i;
+
+	if( isChangeSockInSelectRead(sock_server_tcp->sock) )
+	{
+		eventNewClient(sock_server_tcp);
+	}
+
+	for( i = 0 ; i < listClient->count ; i++ )
+	{
+		client_ds_t *this;
+
+		this = (client_ds_t *)listClient->list[i];
+
+		if( isChangeSockInSelectRead(this->sock->sock) )
+		{
+			eventReadClient(this);
+		}
+
+		if( isChangeSockInSelectWrite(this->sock->sock) )
+		{
+			eventWriteClient(this);
+		}
+
+		if( this->file != NULL && getBufferSize(this->sendBuffer) == 0 )
+		{
+			sendFile(this);
+		}
+
+		if( this->status_connect == NET_STATUS_ZOMBIE )
+		{
+			delListItem(listClient, i, destroyClient);
+		}
+	}
+
+	return 0;
+}
+
+int quitDownServer()
+{
+	closeTcpSocket(sock_server_tcp);
+	destroyListItem(listClient, destroyClient);
+
+	return 0;
+}
diff --git a/src/base/downServer.h b/src/base/downServer.h
new file mode 100644
index 0000000..6ca8d93
--- /dev/null
+++ b/src/base/downServer.h
@@ -0,0 +1,15 @@
+
+#ifndef DOWN_SERVER_H
+
+#define DOWN_SERVER_H
+
+#include "list.h"
+#include "tcp.h"
+#include "buffer.h"
+
+extern int initDownServer(char *ip4, int port4);
+extern int setDownServerSelect();
+extern int selectDownServerSocket();
+extern int quitDownServer();
+
+#endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 51fedaa..f14a29a 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -94,6 +94,8 @@ void proto_send_hello_client(char *name)
 
 	snprintf(msg, STR_PROTO_SIZE, "hello %s %s\n",
 			 getParamElse("--version", TUXANCI_VERSION), name);
+
+	printf("-> %s", msg);
 	sendServer(msg);
 }
 
diff --git a/src/base/server.c b/src/base/server.c
index f98ae2f..282d135 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -30,6 +30,7 @@
 #include "index.h"
 #include "serverSelect.h"
 #include "serverSendMsg.h"
+#include "downServer.h"
 
 #ifndef PUBLIC_SERVER
 #    include "screen_world.h"
@@ -249,6 +250,8 @@ int initServer(char *ip4, int port4, char *ip6, int port6)
 		return -1;
 	}
 
+	initDownServer(ip4, port4);
+
 	return ret;
 }
 
@@ -340,13 +343,16 @@ void eventServer()
 #ifndef PUBLIC_SERVER
 	int count;
 
-
-
 	do {
 		restartSelect();
+
 		setServerUdpSelect();
+		setDownServerSelect();
+
 		actionSelect();
+
 		count = selectServerUdpSocket();
+		selectDownServerSocket();
 	} while (count > 0);
 #endif
 
@@ -356,11 +362,13 @@ void eventServer()
 	restartSelect();
 
 	setServerUdpSelect();
+	setDownServerSelect();
 
 	ret = actionSelect();
 
 	if (ret > 0) {
 		selectServerUdpSocket();
+		selectDownServerSocket();
 	}
 #endif
 
@@ -379,4 +387,6 @@ void quitServer()
 	destroyTimer(listServerTimer);
 
 	quitUdpServer();
+
+	quitDownServer();
 }