X

1 files changed, 159 insertions, 165 deletions

diff --git a/src/base/udp_server.c b/src/base/udp_server.c
index afe0cba..9149cb4 100644
--- a/src/base/udp_server.c
+++ b/src/base/udp_server.c
@@ -46,236 +46,230 @@
 static sock_udp_t *sock_server_udp;
 static sock_udp_t *sock_server_udp_second;
 
-client_t* newUdpClient(sock_udp_t *sock_udp)
+client_t *
+newUdpClient(sock_udp_t * sock_udp)
 {
-	client_t *new;
+   client_t *new;
 
-	assert( sock_udp != NULL );
+   assert(sock_udp != NULL);
 
-		new = newAnyClient();
-	new->type = CLIENT_TYPE_UDP;
-	new->socket_udp = sock_udp;
+   new = newAnyClient();
+   new->type = CLIENT_TYPE_UDP;
+   new->socket_udp = sock_udp;
 
 #ifdef PUBLIC_SERVER
-	char str_log[STR_LOG_SIZE];
-	char str_ip[STR_IP_SIZE];
+   char str_log[STR_LOG_SIZE];
+   char str_ip[STR_IP_SIZE];
 
-	getSockUdpIp(sock_udp, str_ip, STR_IP_SIZE);
-	sprintf(str_log, _("New client \"%s\" on port \"%d\" connected"), str_ip, getSockUdpPort(sock_udp));
-	addToLog(LOG_INF, str_log);
+   getSockUdpIp(sock_udp, str_ip, STR_IP_SIZE);
+   sprintf(str_log, _("New client \"%s\" on port \"%d\" connected"), str_ip,
+           getSockUdpPort(sock_udp));
+   addToLog(LOG_INF, str_log);
 #endif
 
-	return new;
+   return new;
 }
 
-void destroyUdpClient(client_t *p)
+void
+destroyUdpClient(client_t * p)
 {
-	eventMsgInCheckFront(p);
+   eventMsgInCheckFront(p);
 
 #ifdef PUBLIC_SERVER
-	char str_log[STR_LOG_SIZE];
-	char str_ip[STR_IP_SIZE];
+   char str_log[STR_LOG_SIZE];
+   char str_ip[STR_IP_SIZE];
 
-	getSockUdpIp(p->socket_udp, str_ip, STR_IP_SIZE);
-	sprintf(str_log, _("Client \"%s\" on port \"%d\" disconnected"), str_ip, getSockUdpPort(p->socket_udp));
-	addToLog(LOG_INF, str_log);
+   getSockUdpIp(p->socket_udp, str_ip, STR_IP_SIZE);
+   sprintf(str_log, _("Client \"%s\" on port \"%d\" disconnected"), str_ip,
+           getSockUdpPort(p->socket_udp));
+   addToLog(LOG_INF, str_log);
 #endif
 
-	destroySockUdp(p->socket_udp);
+   destroySockUdp(p->socket_udp);
 
-	destroyAnyClient(p);
+   destroyAnyClient(p);
 }
 
-int initUdpServer(char *ip4, int port4, char *ip6, int port6)
+int
+initUdpServer(char *ip4, int port4, char *ip6, int port6)
 {
-	int ret;
+   int ret;
 
-	ret = 0;
+   ret = 0;
 
-	if( ip4 != NULL )
-	{
-		sock_server_udp = bindUdpSocket(ip4, port4, PROTO_UDPv4);
+   if (ip4 != NULL) {
+      sock_server_udp = bindUdpSocket(ip4, port4, PROTO_UDPv4);
 
-		if( sock_server_udp != NULL )
-		{
-			ret++;
+      if (sock_server_udp != NULL) {
+         ret++;
 #ifdef DEBUG
-			printf(_("Starting server: \"%s\" on port: \"%d\"\n"), ip4, port4);
+         printf(_("Starting server: \"%s\" on port: \"%d\"\n"), ip4, port4);
 #endif
-		}
-		else
-		{
+      }
+      else {
 #ifdef DEBUG
-			printf(_("Starting server: \"%s\" on port: \"%d\" FAILED!\n"), ip4, port4);
+         printf(_("Starting server: \"%s\" on port: \"%d\" FAILED!\n"), ip4,
+                port4);
 #endif
-		}
-	}
+      }
+   }
 
-	if( ip6 != NULL )
-	{
-		sock_server_udp_second = bindUdpSocket(ip6, port6, PROTO_UDPv6);
+   if (ip6 != NULL) {
+      sock_server_udp_second = bindUdpSocket(ip6, port6, PROTO_UDPv6);
 
-		if( sock_server_udp_second != NULL )
-		{
-			ret++;
+      if (sock_server_udp_second != NULL) {
+         ret++;
 #ifdef DEBUG
-			printf(_("Starting server: \"%s\" on port: \"%d\"\n"), ip6, port6);
+         printf(_("Starting server: \"%s\" on port: \"%d\"\n"), ip6, port6);
 #endif
-		}
-		else
-		{
+      }
+      else {
 #ifdef DEBUG
-			printf(_("Starting server: \"%s\" on port: \"%d\" FAILED!\n"), ip6, port6);
+         printf(_("Starting server: \"%s\" on port: \"%d\" FAILED!\n"), ip6,
+                port6);
 #endif
-		}
-	}
+      }
+   }
 
-	return ret;
+   return ret;
 }
 
-static void eventCreateNewUdpClient(sock_udp_t *socket_udp)
+static void
+eventCreateNewUdpClient(sock_udp_t * socket_udp)
 {
-	list_t *listClient;
-	client_t *client;
+   list_t *listClient;
+   client_t *client;
 
-	assert( socket_udp != NULL );
+   assert(socket_udp != NULL);
 
-	listClient = getListServerClient();
+   listClient = getListServerClient();
 
-	client = newUdpClient(socket_udp);
-	addList(listClient, client);
+   client = newUdpClient(socket_udp);
+   addList(listClient, client);
 }
 
-static client_t* findUdpClient(sock_udp_t *sock_udp)
+static client_t *
+findUdpClient(sock_udp_t * sock_udp)
 {
-	list_t *listClient;
-	int port;
-	int i;
+   list_t *listClient;
+   int port;
+   int i;
 
-	port  = getSockUdpPort(sock_udp);
-	listClient = getListServerClient();
+   port = getSockUdpPort(sock_udp);
+   listClient = getListServerClient();
 
-	for( i  = 0 ; i < listClient->count ; i++ )
-	{
-		client_t *client;
+   for (i = 0; i < listClient->count; i++) {
+      client_t *client;
 
-		client = (client_t *)listClient->list[i];
+      client = (client_t *) listClient->list[i];
 
-		if( client->type == CLIENT_TYPE_UDP &&
-		    getSockUdpPort(client->socket_udp) == port )
-		{
-			return client;
-		}
-	}
+      if (client->type == CLIENT_TYPE_UDP &&
+          getSockUdpPort(client->socket_udp) == port) {
+         return client;
+      }
+   }
 
-	return NULL;
+   return NULL;
 }
 
-static void eventClientUdpSelect(sock_udp_t *sock_server)
+static void
+eventClientUdpSelect(sock_udp_t * sock_server)
 {
-	sock_udp_t *sock_client;
-	client_t *client;
-	char listRecvMsg[STR_SIZE];
-	bool_t isCreateNewClient;
-	int ret;
-
-	assert( sock_server != NULL );
-
-	sock_client = newSockUdp(sock_server->proto);
-	isCreateNewClient = FALSE;
-
-	memset(listRecvMsg, 0, STR_SIZE);
-
-	ret = readUdpSocket(sock_server, sock_client, listRecvMsg, STR_SIZE-1);
-
-	client = findUdpClient(sock_client);
-
-	if( client == NULL )
-	{
-		eventCreateNewUdpClient(sock_client);
-		client = findUdpClient(sock_client);
-		isCreateNewClient = TRUE;
-	}
-
-	if( client == NULL )
-	{
-		fprintf(stderr, _("Client was not FOUND!\n"));
-		return;
-	}
-	
-	if( isCreateNewClient == FALSE )
-	{
-		destroySockUdp(sock_client);
-	}
-
-	if( ret <= 0 )
-	{
-		client->status = NET_STATUS_ZOMBIE;
-		return;
-	}
-
-	//printf("add packet >>%s<<\n", listRecvMsg);
-	addList(client->listRecvMsg, strdup(listRecvMsg) );
+   sock_udp_t *sock_client;
+   client_t *client;
+   char listRecvMsg[STR_SIZE];
+   bool_t isCreateNewClient;
+   int ret;
+
+   assert(sock_server != NULL);
+
+   sock_client = newSockUdp(sock_server->proto);
+   isCreateNewClient = FALSE;
+
+   memset(listRecvMsg, 0, STR_SIZE);
+
+   ret = readUdpSocket(sock_server, sock_client, listRecvMsg, STR_SIZE - 1);
+
+   client = findUdpClient(sock_client);
+
+   if (client == NULL) {
+      eventCreateNewUdpClient(sock_client);
+      client = findUdpClient(sock_client);
+      isCreateNewClient = TRUE;
+   }
+
+   if (client == NULL) {
+      fprintf(stderr, _("Client was not FOUND!\n"));
+      return;
+   }
+
+   if (isCreateNewClient == FALSE) {
+      destroySockUdp(sock_client);
+   }
+
+   if (ret <= 0) {
+      client->status = NET_STATUS_ZOMBIE;
+      return;
+   }
+
+   //printf("add packet >>%s<<\n", listRecvMsg);
+   addList(client->listRecvMsg, strdup(listRecvMsg));
 }
 
-void setServerUdpSelect()
+void
+setServerUdpSelect()
 {
-	if( sock_server_udp != NULL )
-	{
-		addSockToSelectRead(sock_server_udp->sock);
-	}
-
-	if( sock_server_udp_second != NULL )
-	{
-		addSockToSelectRead(sock_server_udp_second->sock);
-	}
+   if (sock_server_udp != NULL) {
+      addSockToSelectRead(sock_server_udp->sock);
+   }
+
+   if (sock_server_udp_second != NULL) {
+      addSockToSelectRead(sock_server_udp_second->sock);
+   }
 }
 
-int selectServerUdpSocket()
+int
+selectServerUdpSocket()
 {
-	int count;
-
-	count = 0;
-
-	if( sock_server_udp != NULL )
-	{
-		if( isChangeSockInSelectRead(sock_server_udp->sock) )
-		{
-			eventClientUdpSelect(sock_server_udp);
-			count++;
-		}
-	}
-
-	if( sock_server_udp_second != NULL )
-	{
-		if( isChangeSockInSelectRead(sock_server_udp_second->sock) )
-		{
-			eventClientUdpSelect(sock_server_udp_second);
-			count++;
-		}
-	}
-
-	return count;
+   int count;
+
+   count = 0;
+
+   if (sock_server_udp != NULL) {
+      if (isChangeSockInSelectRead(sock_server_udp->sock)) {
+         eventClientUdpSelect(sock_server_udp);
+         count++;
+      }
+   }
+
+   if (sock_server_udp_second != NULL) {
+      if (isChangeSockInSelectRead(sock_server_udp_second->sock)) {
+         eventClientUdpSelect(sock_server_udp_second);
+         count++;
+      }
+   }
+
+   return count;
 }
 
-void quitUdpServer()
+void
+quitUdpServer()
 {
-	if( sock_server_udp != NULL )
-	{
+   if (sock_server_udp != NULL) {
 #ifdef DEBUG
-		printf(_("Closing port: \"%d\"\n"), getSockUdpPort(sock_server_udp));
+      printf(_("Closing port: \"%d\"\n"), getSockUdpPort(sock_server_udp));
 #endif
-		closeUdpSocket(sock_server_udp);
-	}
+      closeUdpSocket(sock_server_udp);
+   }
 
-	if( sock_server_udp_second != NULL )
-	{
+   if (sock_server_udp_second != NULL) {
 #ifdef DEBUG
-		printf(_("Closing port: \"%d\"\n"), getSockUdpPort(sock_server_udp_second));
+      printf(_("Closing port: \"%d\"\n"),
+             getSockUdpPort(sock_server_udp_second));
 #endif
-		closeUdpSocket(sock_server_udp_second);
-	}
+      closeUdpSocket(sock_server_udp_second);
+   }
 #ifdef DEBUG
-	printf(_("Quitting UDP\n"));
+   printf(_("Quitting UDP\n"));
 #endif
 }