mirror of
https://github.com/ntop/n2n.git
synced 2024-09-20 00:51:10 +02:00
Merge pull request #15 from switch-iot/pr2ntop
Bug fixes for Android support code
This commit is contained in:
commit
1caa630568
|
@ -354,12 +354,13 @@ int stop_edge(void)
|
||||||
peer_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
peer_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
|
||||||
peer_addr.sin_port = htons(N2N_EDGE_MGMT_PORT);
|
peer_addr.sin_port = htons(N2N_EDGE_MGMT_PORT);
|
||||||
sendto(fd, "stop", 4, 0, (struct sockaddr *)&peer_addr, sizeof(struct sockaddr_in));
|
sendto(fd, "stop", 4, 0, (struct sockaddr *)&peer_addr, sizeof(struct sockaddr_in));
|
||||||
|
close(fd);
|
||||||
|
|
||||||
pthread_mutex_lock(&status.mutex);
|
pthread_mutex_lock(&status.mutex);
|
||||||
status.is_running = 0;
|
status.is_running = 0;
|
||||||
pthread_mutex_unlock(&status.mutex);
|
pthread_mutex_unlock(&status.mutex);
|
||||||
report_edge_status();
|
report_edge_status();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* #ifdef __ANDROID_NDK__ */
|
#endif /* #ifdef __ANDROID_NDK__ */
|
||||||
|
|
|
@ -1521,6 +1521,7 @@ int run_edge_loop(n2n_edge_t * eee, int *keep_running) {
|
||||||
#ifdef __ANDROID_NDK__
|
#ifdef __ANDROID_NDK__
|
||||||
if ((nowTime - lastArpPeriod) > ARP_PERIOD_INTERVAL) {
|
if ((nowTime - lastArpPeriod) > ARP_PERIOD_INTERVAL) {
|
||||||
uip_arp_timer();
|
uip_arp_timer();
|
||||||
|
lastArpPeriod = nowTime;
|
||||||
}
|
}
|
||||||
#endif /* #ifdef __ANDROID_NDK__ */
|
#endif /* #ifdef __ANDROID_NDK__ */
|
||||||
} /* while */
|
} /* while */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user