dany/antd-tunnel-plugin
1
0
Fork 0
mirror of https://github.com/lxsang/antd-tunnel-plugin synced 2024-11-16 01:38:22 +01:00
Code Issues Projects Releases Wiki Activity

use blocking select

Browse Source
This commit is contained in:
lxsang 2020-09-13 01:51:28 +02:00
parent 9d012cf49f
commit 67ba24d298
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/tunnel-0.1.0b.tar.gz vendored
View File

Binary file not shown.

11
tunnel.c
View File

@ -24,7 +24,6 @@
#define MSG_MAGIC_BEGIN 0x414e5444 //ANTD #define MSG_MAGIC_BEGIN 0x414e5444 //ANTD
#define MSG_MAGIC_END 0x44544e41 //DTNA #define MSG_MAGIC_END 0x44544e41 //DTNA
#define SELECT_TIMEOUT 300 // ms
#define CHANNEL_OK (uint8_t)0x0 #define CHANNEL_OK (uint8_t)0x0
#define CHANNEL_ERROR (uint8_t)0x1 #define CHANNEL_ERROR (uint8_t)0x1
@ -598,7 +597,6 @@ static void* multiplex(void* data_p)
int max_fdm; int max_fdm;
fd_set fd_in; fd_set fd_in;
int status = 0; int status = 0;
struct timeval timeout;
int rc; int rc;
void *args[2]; void *args[2];
list_t closed_channels; list_t closed_channels;
@ -606,8 +604,6 @@ static void* multiplex(void* data_p)
antd_tunnel_t* tunnel_p = (antd_tunnel_t*) data_p; antd_tunnel_t* tunnel_p = (antd_tunnel_t*) data_p;
while(status == 0) while(status == 0)
{ {
timeout.tv_sec = 0;
timeout.tv_usec = SELECT_TIMEOUT;
FD_ZERO(&fd_in); FD_ZERO(&fd_in);
FD_SET(tunnel_p->hotline, &fd_in); FD_SET(tunnel_p->hotline, &fd_in);
max_fdm = tunnel_p->hotline; max_fdm = tunnel_p->hotline;
@ -616,7 +612,7 @@ static void* multiplex(void* data_p)
args[1] = (void*) &max_fdm; args[1] = (void*) &max_fdm;
bst_for_each(tunnel_p->channels, set_sock_fd, args, 2); bst_for_each(tunnel_p->channels, set_sock_fd, args, 2);
pthread_mutex_unlock(&tunnel_p->lock); pthread_mutex_unlock(&tunnel_p->lock);
rc = select(max_fdm + 1, &fd_in, NULL, NULL, &timeout); rc = select(max_fdm + 1, &fd_in, NULL, NULL, NULL);
switch (rc) switch (rc)
{ {
case -1: case -1:
@ -624,15 +620,12 @@ static void* multiplex(void* data_p)
status = 1; status = 1;
break; break;
case 0: case 0:
timeout.tv_sec = 0;
timeout.tv_usec = 10000; // 10 ms
select(0, NULL, NULL, NULL, &timeout);
break; break;
// we have data // we have data
default: default:
if(FD_ISSET(tunnel_p->hotline, &fd_in)) if(FD_ISSET(tunnel_p->hotline, &fd_in))
{ {
LOG("Got new data on hotline"); // LOG("Got new data on hotline");
monitor_hotline(tunnel_p->hotline); monitor_hotline(tunnel_p->hotline);
} }
pthread_mutex_lock(&tunnel_p->lock); pthread_mutex_lock(&tunnel_p->lock);