convert all name function from oldName to new_name

1 files changed, 57 insertions, 57 deletions

diff --git a/src/base/tcp_server.c b/src/base/tcp_server.c
index b781fb5..6910b10 100644
--- a/src/base/tcp_server.c
+++ b/src/base/tcp_server.c
@@ -46,90 +46,90 @@
 static sock_tcp_t *sock_server_tcp;
 static sock_tcp_t *sock_server_tcp_second;
 
-client_t *newTcpClient(sock_tcp_t * sock_tcp)
+client_t *serverTcp_new_client(sock_tcp_t * sock_tcp)
 {
 	client_t *new;
 
 	assert(sock_tcp != NULL);
 
-	new = newAnyClient();
+	new = server_new_any_client();
 	new->type = CLIENT_TYPE_TCP;
 	new->socket_tcp = sock_tcp;
-	new->recvBuffer = newBuffer(SERVER_TCP_BUFFER_LIMIT);
-	new->sendBuffer = newBuffer(SERVER_TCP_BUFFER_LIMIT);
+	new->recvBuffer = buffer_new(SERVER_TCP_BUFFER_LIMIT);
+	new->sendBuffer = buffer_new(SERVER_TCP_BUFFER_LIMIT);
 
 #ifdef PUBLIC_SERVER
 	char str_log[STR_LOG_SIZE];
 	char str_ip[STR_IP_SIZE];
 
-	getSockTcpIp(sock_tcp, str_ip, STR_IP_SIZE);
+	sock_tcp_get_ip(sock_tcp, str_ip, STR_IP_SIZE);
 	sprintf(str_log, _("New client \"%s\" on port \"%d\" connected"), str_ip,
-			getSockTcpPort(sock_tcp));
-	addToLog(LOG_INF, str_log);
+			sock_tcp_get_port(sock_tcp));
+	log_add(LOG_INF, str_log);
 #endif
 
 	return new;
 }
 
-void sendTcpClientBuffer(client_t * client)
+void serverTcp_send_client_buffer(client_t * client)
 {
 	void *data;
 	int len;
 	int res;
 
-	len = getBufferSize(client->sendBuffer);
+	len = buffer_get_size(client->sendBuffer);
 
 	if (len == 0) {
 		return;
 	}
 
-	data = getBufferData(client->sendBuffer);
+	data = buffer_get_data(client->sendBuffer);
 
-	res = writeTcpSocket(client->socket_tcp, data, len);
-	//printf("writeTcpSocket = %d\n", res);
+	res = sock_tcp_write(client->socket_tcp, data, len);
+	//printf("sock_tcp_write = %d\n", res);
 
 	if (res < 0) {
 		client->status = NET_STATUS_ZOMBIE;
 		return;
 	}
 
-	cutBuffer(client->sendBuffer, res);
+	buffer_cut(client->sendBuffer, res);
 }
 
-void destroyTcpClient(client_t * client)
+void serverTcp_destroy_client(client_t * client)
 {
-	eventMsgInCheckFront(client);
-	sendTcpClientBuffer(client);
+	checkFront_event(client);
+	serverTcp_send_client_buffer(client);
 
 #ifdef PUBLIC_SERVER
 	char str_log[STR_LOG_SIZE];
 	char str_ip[STR_IP_SIZE];
 
-	getSockTcpIp(client->socket_tcp, str_ip, STR_IP_SIZE);
+	sock_tcp_get_ip(client->socket_tcp, str_ip, STR_IP_SIZE);
 	sprintf(str_log, _("Client \"%s\" on port \"%d\" disconnected"), str_ip,
-			getSockTcpPort(client->socket_tcp));
-	addToLog(LOG_INF, str_log);
+			sock_tcp_get_port(client->socket_tcp));
+	log_add(LOG_INF, str_log);
 #endif
 
-	closeTcpSocket(client->socket_tcp);
-	destroyBuffer(client->recvBuffer);
-	destroyBuffer(client->sendBuffer);
+	sock_tcp_close(client->socket_tcp);
+	buffer_destroy(client->recvBuffer);
+	buffer_destroy(client->sendBuffer);
 
-	destroyAnyClient(client);
+	server_destroy_any_client(client);
 }
 
-int initTcpServer(char *ip4, int port4, char *ip6, int port6)
+int serverTcp_init(char *ip4, int port4, char *ip6, int port6)
 {
 	int ret;
 
 	ret = 0;
 
 	if (ip4 != NULL) {
-		sock_server_tcp = bindTcpSocket(ip4, port4, PROTO_UDPv4);
+		sock_server_tcp = sock_tcp_bind(ip4, port4, PROTO_UDPv4);
 
 		if (sock_server_tcp != NULL) {
 			ret++;
-			disableNagle(sock_server_tcp);
+			sock_tcp_diable_nagle(sock_server_tcp);
 
 			DEBUG_MSG(_("Starting server: \"%s\" on port: \"%d\"\n"), ip4, port4);
 		} else {
@@ -139,11 +139,11 @@ int initTcpServer(char *ip4, int port4, char *ip6, int port6)
 	}
 
 	if (ip6 != NULL) {
-		sock_server_tcp_second = bindTcpSocket(ip6, port6, PROTO_UDPv6);
+		sock_server_tcp_second = sock_tcp_bind(ip6, port6, PROTO_UDPv6);
 
 		if (sock_server_tcp_second != NULL) {
 			ret++;
-			disableNagle(sock_server_tcp_second);
+			sock_tcp_diable_nagle(sock_server_tcp_second);
 
 			DEBUG_MSG(_("Starting server: \"%s\" on port: \"%d\"\n"), ip6, port6);
 		} else {
@@ -161,14 +161,14 @@ static void eventNewClient(sock_tcp_t * server_sock)
 	sock_tcp_t *sock;
 	client_t *client;
 
-	listClient = getListServerClient();
+	listClient = server_get_list_clients();
 
-	sock = getTcpNewClient(server_sock);
-	disableNagle(sock);
-	setTcpSockNonBlock(sock);
+	sock = sock_tcp_accept(server_sock);
+	sock_tcp_diable_nagle(sock);
+	sock_tcp_set_non_block(sock);
 
-	client = newTcpClient(sock);
-	addList(listClient, client);
+	client = serverTcp_new_client(sock);
+	list_add(listClient, client);
 }
 
 static void eventTcpClient(client_t * client)
@@ -178,37 +178,37 @@ static void eventTcpClient(client_t * client)
 
 	memset(buffer, 0, STR_PROTO_SIZE);
 
-	ret = readTcpSocket(client->socket_tcp, buffer, STR_PROTO_SIZE - 1);
-	//printf("readTcpSocket = %d\n", ret);
+	ret = sock_tcp_read(client->socket_tcp, buffer, STR_PROTO_SIZE - 1);
+	//printf("sock_tcp_read = %d\n", ret);
 
 	if (ret <= 0) {
 		client->status = NET_STATUS_ZOMBIE;
 		return;
 	}
 
-	if (addBuffer(client->recvBuffer, buffer, ret) < 0) {
+	if (buffer_append(client->recvBuffer, buffer, ret) < 0) {
 		client->status = NET_STATUS_ZOMBIE;
 		return;
 	}
 
-	while (getBufferLine(client->recvBuffer, buffer, STR_PROTO_SIZE) >= 0) {
-		addList(client->listRecvMsg, strdup(buffer));
+	while (buffer_get_line(client->recvBuffer, buffer, STR_PROTO_SIZE) >= 0) {
+		list_add(client->listRecvMsg, strdup(buffer));
 	}
 }
 
-void setServerTcpSelect()
+void serverTcp_set_select()
 {
 	list_t *listClient;
 	int i;
 
-	listClient = getListServerClient();
+	listClient = server_get_list_clients();
 
 	if (sock_server_tcp != NULL) {
-		addSockToSelectRead(sock_server_tcp->sock);
+		select_add_sock_for_read(sock_server_tcp->sock);
 	}
 
 	if (sock_server_tcp_second != NULL) {
-		addSockToSelectRead(sock_server_tcp_second->sock);
+		select_add_sock_for_read(sock_server_tcp_second->sock);
 	}
 
 	for (i = 0; i < listClient->count; i++) {
@@ -220,11 +220,11 @@ void setServerTcpSelect()
 			continue;
 		}
 
-		addSockToSelectRead(client->socket_tcp->sock);
+		select_add_sock_for_read(client->socket_tcp->sock);
 	}
 }
 
-int selectServerTcpSocket()
+int serverTcp_select_sock()
 {
 	list_t *listClient;
 	int count;
@@ -233,20 +233,20 @@ int selectServerTcpSocket()
 	count = 0;
 
 	if (sock_server_tcp != NULL) {
-		if (isChangeSockInSelectRead(sock_server_tcp->sock)) {
+		if (select_is_change_sock_for_read(sock_server_tcp->sock)) {
 			eventNewClient(sock_server_tcp);
 			count++;
 		}
 	}
 
 	if (sock_server_tcp_second != NULL) {
-		if (isChangeSockInSelectRead(sock_server_tcp_second->sock)) {
+		if (select_is_change_sock_for_read(sock_server_tcp_second->sock)) {
 			eventNewClient(sock_server_tcp_second);
 			count++;
 		}
 	}
 
-	listClient = getListServerClient();
+	listClient = server_get_list_clients();
 
 	for (i = 0; i < listClient->count; i++) {
 		client_t *client;
@@ -257,16 +257,16 @@ int selectServerTcpSocket()
 			continue;
 		}
 
-		if (isChangeSockInSelectRead(client->socket_tcp->sock)) {
+		if (select_is_change_sock_for_read(client->socket_tcp->sock)) {
 			//printf("sChangeSockInSelectRead\n");
 			eventTcpClient(client);
 			count++;
 		}
 /*
-		if( isChangeSockInSelectWrite(client->socket_tcp->sock) )
+		if( select_is_change_sock_for_write(client->socket_tcp->sock) )
 		{
-			//printf("isChangeSockInSelectWrite\n");
-			sendTcpClientBuffer(client);
+			//printf("select_is_change_sock_for_write\n");
+			serverTcp_send_client_buffer(client);
 			count++;
 		}
 */
@@ -275,16 +275,16 @@ int selectServerTcpSocket()
 	return count;
 }
 
-void quitTcpServer()
+void serverTcp_quit()
 {
 	if (sock_server_tcp != NULL) {
-		DEBUG_MSG(_("Closing port: \"%d\"\n"), getSockTcpPort(sock_server_tcp));
-		closeTcpSocket(sock_server_tcp);
+		DEBUG_MSG(_("Closing port: \"%d\"\n"), sock_tcp_get_port(sock_server_tcp));
+		sock_tcp_close(sock_server_tcp);
 	}
 
 	if (sock_server_tcp_second != NULL) {
-		DEBUG_MSG(_("Closing port: \"%d\"\n"), getSockTcpPort(sock_server_tcp_second));
-		closeTcpSocket(sock_server_tcp_second);
+		DEBUG_MSG(_("Closing port: \"%d\"\n"), sock_tcp_get_port(sock_server_tcp_second));
+		sock_tcp_close(sock_server_tcp_second);
 	}
 
 	DEBUG_MSG("Quitting TCP\n");