Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-11-02 07:53:43 +00:00
Code Releases Activity

fix the timer of udprelay

Browse Source
This commit is contained in:
Max Lv
2015-06-15 09:13:48 +08:00
parent 00e7ea205c
commit 9a5468d313
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udprelay.c
+9 -3
View File
@@ -565,6 +565,7 @@ static void query_resolve_cb(struct sockaddr *addr, void *data)
(void *)remote_ctx);
ev_io_start(EV_A_ & remote_ctx->io);
ev_timer_start(EV_A_ & remote_ctx->watcher);
}
} else {
@@ -593,9 +594,6 @@ static void remote_recv_cb(EV_P_ ev_io *w, int revents)
LOGI("[udp] remote receive a packet");
}
// triger the timer
ev_timer_again(EV_A_ & remote_ctx->watcher);
struct sockaddr src_addr;
socklen_t src_addr_len = sizeof(src_addr);
char *buf = malloc(BUF_SIZE);
@@ -690,15 +688,21 @@ static void remote_recv_cb(EV_P_ ev_io *w, int revents)
(struct sockaddr *)&remote_ctx->src_addr, remote_src_addr_len);
if (s == -1) {
ERROR("[udp] remote_recv_sendto");
goto CLEAN_UP;
}
#else
int s = sendto(server_ctx->fd, buf, buf_len, 0,
(struct sockaddr *)&remote_ctx->src_addr, remote_src_addr_len);
if (s == -1) {
ERROR("[udp] remote_recv_sendto");
goto CLEAN_UP;
}
#endif
// handle the UDP packet sucessfully,
// triger the timer
ev_timer_again(EV_A_ & remote_ctx->watcher);
CLEAN_UP:
free(buf);
@@ -1004,6 +1008,7 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
// Start remote io
ev_io_start(EV_A_ & remote_ctx->io);
ev_timer_start(EV_A_ & remote_ctx->watcher);
}
if (offset > 0) {
@@ -1062,6 +1067,7 @@ static void server_recv_cb(EV_P_ ev_io *w, int revents)
(void *)remote_ctx);
ev_io_start(EV_A_ & remote_ctx->io);
ev_timer_start(EV_A_ & remote_ctx->watcher);
}
} else {
ERROR("[udp] bind() error");