Permalink
Browse files

Merge pull request #15 from switch-iot/pr2ntop

Bug fixes for Android support code
  • Loading branch information...
lucaderi committed Jun 26, 2018
2 parents 35815e5 + 8c608ec commit 1caa630568ac56e1f8b696479863c509fb2c72ac
Showing with 3 additions and 1 deletion.
  1. +2 −1 android/edge_android.c
  2. +1 −0 edge_utils.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__ */
@@ -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 */

0 comments on commit 1caa630

Please sign in to comment.