[*] Mass fixes of old shit, renames from dap_client and dap_client_remote to dap_server_client

http_server/CMakeLists.txt

@@ -13,8 +13,9 @@ set(HTTP_SERVER_SRCS
     http_client/dap_http_header.c)
 
 add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
+include_directories("${INCLUDE_DIRECTORIES} ${dap_core_server_INCLUDE_DIRS}")
 
-target_include_directories(dap_http_server INTERFACE . http_client)
+target_include_directories(dap_http_server INTERFACE . http_client )
 
-target_link_libraries(dap_http_server dap_core dap_crypto dap_core_server dap_client)
+target_link_libraries( dap_http_server dap_core dap_crypto dap_core_server)
 

http_server/dap_http.c

@@ -38,8 +38,8 @@
 
 #include "dap_common.h"
 
-#include "dap_server_client.h"
 #include "dap_server.h"
+#include "dap_server_client.h"
 
 #include "dap_http.h"
 #include "dap_http_header.h"

http_server/dap_http.h

@@ -21,7 +21,7 @@
 #ifndef _SERVER_HTTP_H_
 #define _SERVER_HTTP_H_
 #include "dap_server.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "http_client/dap_http_header.h"
 #include "http_client/dap_http_client.h"
 #include "uthash.h"

http_server/dap_http_folder.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include "dap_common.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "dap_http.h"
 #include "dap_http_client.h"
 #include "dap_http_folder.h"

http_server/http_client/dap_http_header.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "dap_common.h"
-#include "dap_client.h"
+#include "dap_server_client.h"
 #include "dap_http_client.h"
 #include "dap_http_header.h"
 

udp_server/dap_udp_client.c

@@ -87,7 +87,7 @@ dap_server_client_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client,
  * @param host Variable for host address
  * @param host Variable for port
  */
-void dap_udp_client_get_address(dap_server_client_t *client, unsigned long* host,unsigned short* port){
+void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,unsigned short* port){
     dap_udp_client_t* udp_client = DAP_UDP_CLIENT(client);    
     *host = udp_client->host_key >> 32;
     *port = udp_client->host_key - (*host<<32);

udp_server/dap_udp_client.h

@@ -61,5 +61,6 @@ size_t dap_udp_client_write_f(dap_server_client_t *a_client, const char * a_form
 
 void add_waiting_client(dap_server_client_t* client); // Add client to writing queue
 
+void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,unsigned short* port);
 
 #endif

udp_server/dap_udp_server.c

@@ -17,6 +17,7 @@ struct ev_io w_read;
 struct ev_io w_write;
 
 static void write_cb(struct ev_loop* _loop, struct ev_io* watcher, int revents);
+int check_close(dap_server_client_t* client);
 
 /**
  */