From 7ceaebade5b59e6a97e3d364386bffed12d3d3ff Mon Sep 17 00:00:00 2001 From: switch_st Date: Tue, 7 Jul 2020 10:51:21 +0800 Subject: [PATCH] move android arp code to tuntap_android.c --- src/edge_utils.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/edge_utils.c b/src/edge_utils.c index b9e5098..e6cd84f 100644 --- a/src/edge_utils.c +++ b/src/edge_utils.c @@ -1498,18 +1498,7 @@ void edge_read_from_tap(n2n_edge_t * eee) { macstr_t mac_buf; ssize_t len; -#ifdef __ANDROID_NDK__ - if(uip_arp_len != 0) { - len = uip_arp_len; - memcpy(eth_pkt, uip_arp_buf, MIN(uip_arp_len, N2N_PKT_BUF_SIZE)); - traceEvent(TRACE_DEBUG, "ARP reply packet to send"); - } else { -#endif /* #ifdef __ANDROID_NDK__ */ - len = tuntap_read( &(eee->device), eth_pkt, N2N_PKT_BUF_SIZE ); -#ifdef __ANDROID_NDK__ - } -#endif /* #ifdef __ANDROID_NDK__ */ - + len = tuntap_read( &(eee->device), eth_pkt, N2N_PKT_BUF_SIZE ); if((len <= 0) || (len > N2N_PKT_BUF_SIZE)) { traceEvent(TRACE_WARNING, "read()=%d [%d/%s]", @@ -1909,13 +1898,6 @@ int run_edge_loop(n2n_edge_t * eee, int *keep_running) { } #endif -#ifdef __ANDROID_NDK__ - if(uip_arp_len != 0) { - edge_read_from_tap(eee); - uip_arp_len = 0; - } -#endif /* #ifdef __ANDROID_NDK__ */ - if(FD_ISSET(eee->udp_mgmt_sock, &socket_mask)) { /* Read a cooked socket from the internet socket. Writes on the TAP * socket. */