From 9a5468d3133e7159f068b056f1d43c43aab950ca Mon Sep 17 00:00:00 2001
From: Max Lv <mlv@nvidia.com>
Date: Mon, 15 Jun 2015 09:13:48 +0800
Subject: [PATCH] fix the timer of udprelay

---
 src/udprelay.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/udprelay.c b/src/udprelay.c
index 2f6175e4..aaad030b 100644
--- a/src/udprelay.c
+++ b/src/udprelay.c
@@ -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");