From 81b23397f469a5bed9adaf2bc7276098013b12b0 Mon Sep 17 00:00:00 2001
From: switchwang <switchwang@tencent.com>
Date: Wed, 20 Jun 2018 13:53:50 +0800
Subject: [PATCH 1/2] bug fix

---
 android/edge_android.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/edge_android.c b/android/edge_android.c
index cf256e6..5b078cf 100644
--- a/android/edge_android.c
+++ b/android/edge_android.c
@@ -354,12 +354,13 @@ int stop_edge(void)
     peer_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     peer_addr.sin_port = htons(N2N_EDGE_MGMT_PORT);
     sendto(fd, "stop", 4, 0, (struct sockaddr *)&peer_addr, sizeof(struct sockaddr_in));
-
+	close(fd);
 
     pthread_mutex_lock(&status.mutex);
     status.is_running = 0;
     pthread_mutex_unlock(&status.mutex);
     report_edge_status();
+
     return 0;
 }
 #endif /* #ifdef __ANDROID_NDK__ */

From 8c608ec3c4309c7eb72ccc3a4f7df2a699ad01b9 Mon Sep 17 00:00:00 2001
From: switch_st <switch.st@gmail.com>
Date: Tue, 26 Jun 2018 15:25:32 +0800
Subject: [PATCH 2/2] bug fix

---
 edge_utils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/edge_utils.c b/edge_utils.c
index 7c97dda..6b8b6e1 100644
--- a/edge_utils.c
+++ b/edge_utils.c
@@ -1521,6 +1521,7 @@ int run_edge_loop(n2n_edge_t * eee, int *keep_running) {
 #ifdef __ANDROID_NDK__
       if ((nowTime - lastArpPeriod) > ARP_PERIOD_INTERVAL) {
           uip_arp_timer();
+		  lastArpPeriod = nowTime;
       }
 #endif /* #ifdef __ANDROID_NDK__ */
   } /* while */