mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-29 04:03:45 +00:00
Refine the timer of traffic stat
This commit is contained in:
+3
-3
@@ -729,9 +729,9 @@ server_send_cb(EV_P_ ev_io *w, int revents)
|
||||
|
||||
#ifdef ANDROID
|
||||
static void
|
||||
stat_update_cb(struct ev_loop *loop)
|
||||
stat_update_cb()
|
||||
{
|
||||
ev_tstamp now = ev_now(loop);
|
||||
ev_tstamp now = ev_time();
|
||||
if (now - last > 1.0) {
|
||||
send_traffic_stat(tx, rx);
|
||||
last = now;
|
||||
@@ -765,7 +765,7 @@ remote_recv_cb(EV_P_ ev_io *w, int revents)
|
||||
ev_timer_again(EV_A_ & remote->recv_ctx->watcher);
|
||||
|
||||
#ifdef ANDROID
|
||||
stat_update_cb(loop);
|
||||
stat_update_cb();
|
||||
#endif
|
||||
|
||||
ssize_t r = recv(remote->fd, server->buf->array, BUF_SIZE, 0);
|
||||
|
||||
+4
-4
@@ -717,21 +717,21 @@ remote_recv_cb(EV_P_ ev_io *w, int revents)
|
||||
|
||||
// server may return using a different address type other than the type we
|
||||
// have used during sending
|
||||
|
||||
#if defined(MODULE_TUNNEL) || defined(MODULE_REDIR)
|
||||
// Construct packet
|
||||
buf->len -= len;
|
||||
memmove(buf->array, buf->array + len, buf->len);
|
||||
#else
|
||||
#ifdef ANDROID
|
||||
rx += buf->len;
|
||||
#endif
|
||||
// Construct packet
|
||||
brealloc(buf, buf->len + 3, buf_size);
|
||||
memmove(buf->array + 3, buf->array, buf->len);
|
||||
memset(buf->array, 0, 3);
|
||||
buf->len += 3;
|
||||
#ifdef ANDROID
|
||||
rx += buf->len;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef MODULE_REMOTE
|
||||
|
||||
Reference in New Issue
Block a user