From 954fa4ea73b1ecd016944568a38ddfa6b3d89305 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Tue, 30 Oct 2018 20:02:37 +0700
Subject: [PATCH] [*] Renames
---
http_server/dap_http.c | 2 +-
http_server/dap_http.h | 2 +-
http_server/dap_http_folder.c | 8 ++---
http_server/dap_http_simple.c | 6 ++--
http_server/http_client/dap_http_client.c | 44 +++++++++++------------
http_server/http_client/dap_http_client.h | 14 ++++----
http_server/http_client/dap_http_header.c | 2 +-
udp_server/dap_udp_client.c | 22 ++++++------
udp_server/dap_udp_client.h | 20 +++++------
udp_server/dap_udp_server.c | 14 ++++----
udp_server/dap_udp_server.h | 2 +-
11 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/http_server/dap_http.c b/http_server/dap_http.c
index c23f7f4..e66df78 100644
--- a/http_server/dap_http.c
+++ b/http_server/dap_http.c
@@ -39,7 +39,7 @@
#include "dap_common.h"
#include "dap_server.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include "dap_http.h"
#include "dap_http_header.h"
diff --git a/http_server/dap_http.h b/http_server/dap_http.h
index c132c1a..115c88c 100644
--- a/http_server/dap_http.h
+++ b/http_server/dap_http.h
@@ -21,7 +21,7 @@
#ifndef _SERVER_HTTP_H_
#define _SERVER_HTTP_H_
#include "dap_server.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include "http_client/dap_http_header.h"
#include "http_client/dap_http_client.h"
#include "uthash.h"
diff --git a/http_server/dap_http_folder.c b/http_server/dap_http_folder.c
index dcdd16d..b4b6838 100644
--- a/http_server/dap_http_folder.c
+++ b/http_server/dap_http_folder.c
@@ -27,7 +27,7 @@
#include <errno.h>
#include "dap_common.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include "dap_http.h"
#include "dap_http_client.h"
#include "dap_http_folder.h"
@@ -123,8 +123,8 @@ void dap_http_folder_headers_read(dap_http_client_t * cl_ht, void * arg)
(void) arg;
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_START;
cl_ht->state_read=cl_ht->keep_alive?DAP_HTTP_CLIENT_STATE_START:DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_write(cl_ht->client,true);
- dap_client_ready_to_read(cl_ht->client, cl_ht->keep_alive);
+ dap_client_remote_ready_to_write(cl_ht->client,true);
+ dap_client_remote_ready_to_read(cl_ht->client, cl_ht->keep_alive);
}
/**
@@ -204,7 +204,7 @@ void dap_http_folder_data_write(dap_http_client_t * cl_ht, void * arg)
log_it(L_INFO, "All the file %s is sent out",cl_ht_file->local_path);
//strncat(cl_ht->client->buf_out+cl_ht->client->buf_out_size,"\r\n",sizeof(cl_ht->client->buf_out));
fclose(cl_ht_file->fd);
- dap_client_ready_to_write(cl_ht->client,false);
+ dap_client_remote_ready_to_write(cl_ht->client,false);
cl_ht->client->signal_close=!cl_ht->keep_alive;
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_NONE;
}
diff --git a/http_server/dap_http_simple.c b/http_server/dap_http_simple.c
index 33c7e1b..0b9f392 100644
--- a/http_server/dap_http_simple.c
+++ b/http_server/dap_http_simple.c
@@ -180,10 +180,10 @@ void* dap_http_simple_proc(dap_http_simple_t * cl_sh)
//cl_sh->http->client->ready_to_read=false;
//cl_sh->http->client->ready_to_write=false;
}
- dap_client_ready_to_read(cl_sh->http->client,false);
+ dap_client_remote_ready_to_read(cl_sh->http->client,false);
cl_sh->http->state_write=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_write(cl_sh->http->client,true);
+ dap_client_remote_ready_to_write(cl_sh->http->client,true);
cl_sh->http->state_write=DAP_HTTP_CLIENT_STATE_START;
}
@@ -247,7 +247,7 @@ void dap_http_simple_data_write(dap_http_client_t * a_http_client,void * a_arg)
(void) a_arg;
dap_http_simple_t * cl_st = DAP_HTTP_SIMPLE(a_http_client);
- cl_st->reply_sent += dap_client_write(a_http_client->client,
+ cl_st->reply_sent += dap_client_remote_write(a_http_client->client,
cl_st->reply + cl_st->reply_sent,
a_http_client->out_content_length - cl_st->reply_sent);
diff --git a/http_server/http_client/dap_http_client.c b/http_server/http_client/dap_http_client.c
index bd1a82b..f020bb9 100644
--- a/http_server/http_client/dap_http_client.c
+++ b/http_server/http_client/dap_http_client.c
@@ -24,7 +24,7 @@
#include <ctype.h>
#include <libgen.h>
#include "dap_common.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include "../dap_http.h"
@@ -60,7 +60,7 @@ void dap_http_client_deinit()
* @param cl HTTP Client instance
* @param arg Additional argument (usualy not used)
*/
-void dap_http_client_new(dap_server_client_t * cl,void * arg)
+void dap_http_client_new(dap_client_remote_t * cl,void * arg)
{
(void) arg;
cl->_inheritor = DAP_NEW_Z(dap_http_client_t);
@@ -77,7 +77,7 @@ void dap_http_client_new(dap_server_client_t * cl,void * arg)
* @param cl HTTP Client instance
* @param arg Additional argument (usualy not used)
*/
-void dap_http_client_delete(dap_server_client_t * cl,void * arg)
+void dap_http_client_delete(dap_client_remote_t * cl,void * arg)
{
dap_http_client_t * cl_ht = DAP_HTTP_CLIENT(cl);
while(cl_ht->in_headers)
@@ -164,7 +164,7 @@ bool dap_http_request_line_parse(dap_http_client_t * cl_ht, char * buf, size_t b
* @param cl HTTP Client instance
* @param arg Additional argument (usualy not used)
*/
-void dap_http_client_read(dap_server_client_t * cl,void * arg)
+void dap_http_client_read(dap_client_remote_t * cl,void * arg)
{
(void) arg;
@@ -178,7 +178,7 @@ cnt:switch(cl_ht->state_read){
return;
}else if((eol+3)<sizeof(buf_line) ){
memcpy(buf_line,cl->buf_in,eol+1);
- dap_client_shrink_buf_in(cl,eol+1);
+ dap_client_remote_shrink_buf_in(cl,eol+1);
buf_line[eol+2]='\0';
if( dap_http_request_line_parse(cl_ht,buf_line,eol+1) ){
char * query_string;
@@ -223,8 +223,8 @@ cnt:switch(cl_ht->state_read){
else{
log_it(L_WARNING, "Input: unprocessed URL request %s is rejected", d_name);
cl_ht->state_read=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_read(cl_ht->client,true);
- dap_client_ready_to_write(cl_ht->client,true);
+ dap_client_remote_ready_to_read(cl_ht->client,true);
+ dap_client_remote_ready_to_write(cl_ht->client,true);
cl_ht->reply_status_code=505;
strcpy(cl_ht->reply_reason_phrase,"Error");
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_START;
@@ -244,8 +244,8 @@ cnt:switch(cl_ht->state_read){
log_it(L_WARNING, "Input: Wrong request line '%s'",buf_line);
cl->buf_in_size=0;
cl_ht->state_read=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_read(cl_ht->client,false);
- dap_client_ready_to_write(cl_ht->client,true);
+ dap_client_remote_ready_to_read(cl_ht->client,false);
+ dap_client_remote_ready_to_write(cl_ht->client,true);
cl_ht->reply_status_code=505;
strcpy(cl_ht->reply_reason_phrase,"Error");
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_START;
@@ -254,8 +254,8 @@ cnt:switch(cl_ht->state_read){
log_it(L_WARNING,"Too big line in request, more than %llu symbols - thats very strange",sizeof(buf_line)-3);
cl->buf_in_size=0;
cl_ht->state_read=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_read(cl_ht->client,false);
- dap_client_ready_to_write(cl_ht->client,true);
+ dap_client_remote_ready_to_read(cl_ht->client,false);
+ dap_client_remote_ready_to_write(cl_ht->client,true);
cl_ht->reply_status_code=505;
strcpy(cl_ht->reply_reason_phrase,"Error");
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_START;
@@ -282,8 +282,8 @@ cnt:switch(cl_ht->state_read){
if(!isOk){
log_it(L_NOTICE,"Access restricted");
cl_ht->state_read=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_read(cl_ht->client,false);
- dap_client_ready_to_write(cl_ht->client,true);
+ dap_client_remote_ready_to_read(cl_ht->client,false);
+ dap_client_remote_ready_to_write(cl_ht->client,true);
cl_ht->reply_status_code=505;
strcpy(cl_ht->reply_reason_phrase,"Error");
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_START;
@@ -303,7 +303,7 @@ cnt:switch(cl_ht->state_read){
}
}
- dap_client_shrink_buf_in(cl,eol+1);
+ dap_client_remote_shrink_buf_in(cl,eol+1);
}
}break;
case DAP_HTTP_CLIENT_STATE_DATA:{//Read the data
@@ -313,7 +313,7 @@ cnt:switch(cl_ht->state_read){
if(cl_ht->proc->data_read_callback){
//while(cl_ht->client->buf_in_size){
cl_ht->proc->data_read_callback(cl_ht,&read_bytes);
- dap_client_shrink_buf_in(cl,read_bytes);
+ dap_client_remote_shrink_buf_in(cl,read_bytes);
//}
}else
cl->buf_in_size=0;
@@ -334,7 +334,7 @@ cnt:switch(cl_ht->state_read){
* @param cl HTTP Client instance
* @param arg Additional argument (usualy not used)
*/
-void dap_http_client_write(dap_server_client_t * cl,void * arg)
+void dap_http_client_write(dap_client_remote_t * cl,void * arg)
{
(void) arg;
@@ -347,7 +347,7 @@ void dap_http_client_write(dap_server_client_t * cl,void * arg)
if(cl_ht->proc->headers_write_callback)
cl_ht->proc->headers_write_callback(cl_ht,NULL);
log_it(L_DEBUG,"Output: HTTP response with %u status code",cl_ht->reply_status_code);
- dap_client_write_f(cl,"HTTP/1.1 %u %s\r\n",cl_ht->reply_status_code, cl_ht->reply_reason_phrase[0]?cl_ht->reply_reason_phrase:"UNDEFINED");
+ dap_client_remote_write_f(cl,"HTTP/1.1 %u %s\r\n",cl_ht->reply_status_code, cl_ht->reply_reason_phrase[0]?cl_ht->reply_reason_phrase:"UNDEFINED");
dap_http_client_out_header_generate(cl_ht);
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_HEADERS;
@@ -356,20 +356,20 @@ void dap_http_client_write(dap_server_client_t * cl,void * arg)
dap_http_header_t * hdr=cl_ht->out_headers;
if(hdr==NULL){
log_it(L_DEBUG, "Output: headers are over (reply status code %u)",cl_ht->reply_status_code);
- dap_client_write_f(cl,"\r\n");
+ dap_client_remote_write_f(cl,"\r\n");
if(cl_ht->out_content_length || cl_ht->out_content_ready){
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_DATA;
}else{
log_it(L_DEBUG,"Nothing to output");
cl_ht->state_write=DAP_HTTP_CLIENT_STATE_NONE;
- dap_client_ready_to_write(cl,false);
+ dap_client_remote_ready_to_write(cl,false);
cl->signal_close=true;
}
- dap_client_ready_to_read(cl,true);
+ dap_client_remote_ready_to_read(cl,true);
}else{
//log_it(L_DEBUGUG,"Output: header %s: %s",hdr->name,hdr->value);
- dap_client_write_f(cl,"%s: %s\r\n",hdr->name,hdr->value);
+ dap_client_remote_write_f(cl,"%s: %s\r\n",hdr->name,hdr->value);
dap_http_header_remove(&cl_ht->out_headers, hdr);
}
}break;
@@ -417,7 +417,7 @@ void dap_http_client_out_header_generate(dap_http_client_t *cl_ht)
* @param cl HTTP Client instance
* @param arg Additional argument (usualy not used)
*/
-void dap_http_client_error(struct dap_server_client * cl,void * arg)
+void dap_http_client_error(struct dap_client_remote * cl,void * arg)
{
(void) arg;
dap_http_client_t * cl_ht=DAP_HTTP_CLIENT(cl);
diff --git a/http_server/http_client/dap_http_client.h b/http_server/http_client/dap_http_client.h
index 33a5a1d..374fbe9 100644
--- a/http_server/http_client/dap_http_client.h
+++ b/http_server/http_client/dap_http_client.h
@@ -25,7 +25,7 @@
#include <stdint.h>
#include <time.h>
#include <stdbool.h>
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
struct dap_http_client;
struct dap_http;
@@ -65,7 +65,7 @@ typedef struct dap_http_client
bool out_connection_close;
- dap_server_client_t * client;
+ dap_client_remote_t * client;
struct dap_http * http;
uint32_t reply_status_code;
@@ -89,12 +89,12 @@ int dap_http_client_init();
void dap_http_client_deinit();
-void dap_http_client_new(dap_server_client_t * cl,void * arg); // Creates HTTP client's internal structure
-void dap_http_client_delete(dap_server_client_t * cl,void * arg); // Free memory for HTTP client's internal structure
+void dap_http_client_new(dap_client_remote_t * cl,void * arg); // Creates HTTP client's internal structure
+void dap_http_client_delete(dap_client_remote_t * cl,void * arg); // Free memory for HTTP client's internal structure
-void dap_http_client_read( dap_server_client_t * cl,void * arg); // Process read event
-void dap_http_client_write( dap_server_client_t * cl,void * arg); // Process write event
-void dap_http_client_error( dap_server_client_t * cl,void * arg); // Process error event
+void dap_http_client_read( dap_client_remote_t * cl,void * arg); // Process read event
+void dap_http_client_write( dap_client_remote_t * cl,void * arg); // Process write event
+void dap_http_client_error( dap_client_remote_t * cl,void * arg); // Process error event
#ifdef __cplusplus
}
diff --git a/http_server/http_client/dap_http_header.c b/http_server/http_client/dap_http_header.c
index 35cf156..e3ef9a3 100644
--- a/http_server/http_client/dap_http_header.c
+++ b/http_server/http_client/dap_http_header.c
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdlib.h>
#include "dap_common.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include "dap_http_client.h"
#include "dap_http_header.h"
diff --git a/udp_server/dap_udp_client.c b/udp_server/dap_udp_client.c
index 056f1d5..dfdc939 100644
--- a/udp_server/dap_udp_client.c
+++ b/udp_server/dap_udp_client.c
@@ -53,7 +53,7 @@ uint64_t get_key(unsigned long host,unsigned short port){
* @param port Client port
* @return Pointer to the new list's node
*/
-dap_server_client_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client, unsigned long host, unsigned short port)
+dap_client_remote_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client, unsigned long host, unsigned short port)
{
dap_udp_server_t* udp_server = DAP_UDP_SERVER(sh);
log_it(L_DEBUG,"Client structure create");
@@ -61,7 +61,7 @@ dap_server_client_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client,
dap_udp_client_t * inh=DAP_NEW_Z(dap_udp_client_t);
inh->host_key = get_key(host,port);
- dap_server_client_t * ret=DAP_NEW_Z(dap_server_client_t);
+ dap_client_remote_t * ret=DAP_NEW_Z(dap_client_remote_t);
inh->client = ret;
ret->server = sh;
ret->watcher_client = w_client;
@@ -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 int* host,unsigned short* port){
+void dap_udp_client_get_address(dap_client_remote_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);
@@ -100,7 +100,7 @@ void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,
* @param port Source port
* @return Pointer to client or NULL if not found
*/
-dap_server_client_t * dap_udp_client_find(dap_server_t * sh, unsigned long host,unsigned short port)
+dap_client_remote_t * dap_udp_client_find(dap_server_t * sh, unsigned long host,unsigned short port)
{
dap_udp_server_t* udp_server = DAP_UDP_SERVER(sh);
pthread_mutex_lock(&udp_server->mutex_on_list);
@@ -121,7 +121,7 @@ dap_server_client_t * dap_udp_client_find(dap_server_t * sh, unsigned long host,
* @param sc Client structure
* @param is_ready Flag value
*/
-void dap_udp_client_ready_to_read(dap_server_client_t * sc,bool is_ready)
+void dap_udp_client_ready_to_read(dap_client_remote_t * sc,bool is_ready)
{
if(is_ready != sc->_ready_to_read) {
@@ -145,7 +145,7 @@ void dap_udp_client_ready_to_read(dap_server_client_t * sc,bool is_ready)
* @param sc Client structure
* @param is_ready Flag value
*/
-void dap_udp_client_ready_to_write(dap_server_client_t * sc,bool is_ready)
+void dap_udp_client_ready_to_write(dap_client_remote_t * sc,bool is_ready)
{
// if(is_ready)
// add_waiting_client(sc); // Add client to writing queue
@@ -169,7 +169,7 @@ void dap_udp_client_ready_to_write(dap_server_client_t * sc,bool is_ready)
* @brief add_waiting_client Add Client to write queue
* @param client Client instance
*/
-void add_waiting_client(dap_server_client_t* client){
+void add_waiting_client(dap_client_remote_t* client){
dap_server_t* sh = client->server;
dap_udp_server_t* udp_server = DAP_UDP_SERVER(sh);
dap_udp_client_t* udp_client = DAP_UDP_CLIENT(client);
@@ -187,17 +187,17 @@ void add_waiting_client(dap_server_client_t* client){
}
-size_t dap_udp_client_write(dap_server_client_t *sc, const void * data, size_t data_size){
- size_t size = dap_client_write(sc,data,data_size);
+size_t dap_udp_client_write(dap_client_remote_t *sc, const void * data, size_t data_size){
+ size_t size = dap_client_remote_write(sc,data,data_size);
add_waiting_client(sc);
return size;
}
-size_t dap_udp_client_write_f(dap_server_client_t *a_client, const char * a_format,...){
+size_t dap_udp_client_write_f(dap_client_remote_t *a_client, const char * a_format,...){
size_t size = 0;
va_list ap;
va_start(ap,a_format);
- size =dap_client_write_f(a_client,a_format,ap);
+ size =dap_client_remote_write_f(a_client,a_format,ap);
va_end(ap);
add_waiting_client(a_client);
return size;
diff --git a/udp_server/dap_udp_client.h b/udp_server/dap_udp_client.h
index 4304c5c..a59113e 100644
--- a/udp_server/dap_udp_client.h
+++ b/udp_server/dap_udp_client.h
@@ -27,7 +27,7 @@
#include <stdbool.h>
#include <sys/queue.h>
#include "uthash.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
#include <ev.h>
@@ -37,7 +37,7 @@ struct dap_udp_client;
#define UDP_CLIENT_BUF 100000
typedef struct dap_udp_client{
- dap_server_client_t* client;
+ dap_client_remote_t* client;
uint64_t host_key; //key contains host address in first 4 bytes and port in last 4 bytes
UT_hash_handle hh;
@@ -50,17 +50,17 @@ typedef struct dap_udp_client{
#define DAP_UDP_CLIENT(a) ((dap_udp_client_t *) (a)->_inheritor)
-dap_server_client_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client, unsigned long host, unsigned short port); // Create new client and add it to the list
-dap_server_client_t * dap_udp_client_find(dap_server_t * sh, unsigned long host, unsigned short port); // Find client by host and port
+dap_client_remote_t * dap_udp_client_create(dap_server_t * sh, ev_io* w_client, unsigned long host, unsigned short port); // Create new client and add it to the list
+dap_client_remote_t * dap_udp_client_find(dap_server_t * sh, unsigned long host, unsigned short port); // Find client by host and port
-void dap_udp_client_ready_to_read(dap_server_client_t * sc,bool is_ready);
-void dap_udp_client_ready_to_write(dap_server_client_t * sc,bool is_ready);
+void dap_udp_client_ready_to_read(dap_client_remote_t * sc,bool is_ready);
+void dap_udp_client_ready_to_write(dap_client_remote_t * sc,bool is_ready);
-size_t dap_udp_client_write(dap_server_client_t *sc, const void * data, size_t data_size);
-size_t dap_udp_client_write_f(dap_server_client_t *a_client, const char * a_format,...);
+size_t dap_udp_client_write(dap_client_remote_t *sc, const void * data, size_t data_size);
+size_t dap_udp_client_write_f(dap_client_remote_t *a_client, const char * a_format,...);
-void add_waiting_client(dap_server_client_t* client); // Add client to writing queue
+void add_waiting_client(dap_client_remote_t* client); // Add client to writing queue
-void dap_udp_client_get_address(dap_server_client_t *client, unsigned int* host,unsigned short* port);
+void dap_udp_client_get_address(dap_client_remote_t *client, unsigned int* host,unsigned short* port);
#endif
diff --git a/udp_server/dap_udp_server.c b/udp_server/dap_udp_server.c
index e7942db..e0cdc18 100644
--- a/udp_server/dap_udp_server.c
+++ b/udp_server/dap_udp_server.c
@@ -17,7 +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);
+int check_close(dap_client_remote_t* client);
/**
*/
@@ -64,9 +64,9 @@ void dap_udp_server_delete(dap_server_t * sh)
if(sh->address)
free(sh->address);
- dap_server_client_t * client, * tmp;
+ dap_client_remote_t * client, * tmp;
HASH_ITER(hh,sh->clients,client,tmp)
- dap_client_remove(client, sh);
+ dap_client_remote_remove(client, sh);
if(sh->server_delete_callback)
sh->server_delete_callback(sh,NULL);
@@ -123,7 +123,7 @@ static void write_cb(struct ev_loop* loop, struct ev_io* watcher, int revents)
{
//log_it(L_INFO,"write_cb");
//pthread_mutex_lock(&udp_client->mutex_on_client);
- dap_server_client_t* client = udp_client->client;
+ dap_client_remote_t* client = udp_client->client;
if(client != NULL && check_close(client) == 0 && client->_ready_to_write)
{
if(sh->client_write_callback)
@@ -161,7 +161,7 @@ static void write_cb(struct ev_loop* loop, struct ev_io* watcher, int revents)
* @param client Client structure
* @return 1 if client deleted, 0 if client is no need to delete
*/
-int check_close(dap_server_client_t* client){
+int check_close(dap_client_remote_t* client){
if(client->signal_close)
{
dap_udp_client_t* udp_client = DAP_UDP_CLIENT(client);
@@ -171,7 +171,7 @@ int check_close(dap_server_client_t* client){
LL_FOREACH_SAFE(udp_server->waiting_clients,client_check,tmp)
if(client_check->host_key == udp_client->host_key)
LL_DELETE(udp_server->waiting_clients,client_check);
- dap_client_remove(client, sh);
+ dap_client_remote_remove(client, sh);
return 1;
}
return 0;
@@ -190,7 +190,7 @@ static void read_cb(struct ev_loop* loop, struct ev_io* watcher, int revents)
dap_server_t* sh = watcher->data;
bzero(buf, BUFSIZE);
socklen_t bytes = recvfrom(sh->socket_listener, buf, BUFSIZE, 0,(struct sockaddr *) &clientaddr, &clientlen);
- dap_server_client_t *client = dap_udp_client_find(sh,clientaddr.sin_addr.s_addr,clientaddr.sin_port);
+ dap_client_remote_t *client = dap_udp_client_find(sh,clientaddr.sin_addr.s_addr,clientaddr.sin_port);
if(client != NULL && check_close(client) != 0)
return;
if(bytes > 0){
diff --git a/udp_server/dap_udp_server.h b/udp_server/dap_udp_server.h
index d0deb3d..9aa180b 100644
--- a/udp_server/dap_udp_server.h
+++ b/udp_server/dap_udp_server.h
@@ -32,7 +32,7 @@
#include <sys/queue.h>
#include "dap_udp_client.h"
#include "dap_server.h"
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
struct dap_udp_server;
--
GitLab