Browse Source

Refine the timer of traffic stat

pull/946/head
Max Lv 8 years ago
parent
commit
f64cb0b0ca
2 changed files with 7 additions and 7 deletions
  1. 6
      src/local.c
  2. 8
      src/udprelay.c

6
src/local.c

@ -729,9 +729,9 @@ server_send_cb(EV_P_ ev_io *w, int revents)
#ifdef ANDROID #ifdef ANDROID
static void 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) { if (now - last > 1.0) {
send_traffic_stat(tx, rx); send_traffic_stat(tx, rx);
last = now; 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); ev_timer_again(EV_A_ & remote->recv_ctx->watcher);
#ifdef ANDROID #ifdef ANDROID
stat_update_cb(loop);
stat_update_cb();
#endif #endif
ssize_t r = recv(remote->fd, server->buf->array, BUF_SIZE, 0); ssize_t r = recv(remote->fd, server->buf->array, BUF_SIZE, 0);

8
src/udprelay.c

@ -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 // server may return using a different address type other than the type we
// have used during sending // have used during sending
#if defined(MODULE_TUNNEL) || defined(MODULE_REDIR) #if defined(MODULE_TUNNEL) || defined(MODULE_REDIR)
// Construct packet // Construct packet
buf->len -= len; buf->len -= len;
memmove(buf->array, buf->array + len, buf->len); memmove(buf->array, buf->array + len, buf->len);
#else #else
#ifdef ANDROID
rx += buf->len;
#endif
// Construct packet // Construct packet
brealloc(buf, buf->len + 3, buf_size); brealloc(buf, buf->len + 3, buf_size);
memmove(buf->array + 3, buf->array, buf->len); memmove(buf->array + 3, buf->array, buf->len);
memset(buf->array, 0, 3); memset(buf->array, 0, 3);
buf->len += 3; buf->len += 3;
#ifdef ANDROID
rx += buf->len;
#endif
#endif #endif
#endif #endif
#ifdef MODULE_REMOTE #ifdef MODULE_REMOTE

Loading…
Cancel
Save