Fix android (Android 6 or before) compilation issue around getifaddr

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index b9f441a0d0b9b774d3ab7fb914395dca3b9ba9d5..95790ac1d287c84ed4f11e8cd19019288b2549b3 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -118,6 +118,10 @@ static void timeout_handler(event_loop_t *loop, void *data) {
                int pingtimeout = c->node ? mesh->dev_class_traits[c->node->devclass].pingtimeout : default_timeout;
                int pinginterval = c->node ? mesh->dev_class_traits[c->node->devclass].pinginterval : default_interval;
 
+               if(c->outgoing && c->outgoing->timeout < 5) {
+                       pingtimeout = 1;
+               }
+
                // Also make sure that if outstanding key requests for the UDP counterpart of a connection has timed out, we restart it.
                if(c->node) {
                        if(c->node->status.waitingforkey && c->node->last_req_key + pingtimeout <= mesh->loop.now.tv_sec) {
@@ -148,7 +152,7 @@ static void timeout_handler(event_loop_t *loop, void *data) {
        }
 
        timeout_set(&mesh->loop, data, &(struct timeval) {
-               default_timeout, prng(mesh, TIMER_FUDGE)
+               1, prng(mesh, TIMER_FUDGE)
        });
 }
 
@@ -635,7 +639,7 @@ void retry(meshlink_handle_t *mesh) {
                });
        }
 
-#ifdef HAVE_IFADDRS_H
+#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) && defined(HAVE_FREEIFADDRS)
        struct ifaddrs *ifa = NULL;
        getifaddrs(&ifa);
 #endif
@@ -651,7 +655,7 @@ void retry(meshlink_handle_t *mesh) {
                        c->last_ping_time = 0;
                }
 
-#ifdef HAVE_IFADDRS_H
+#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) && defined(HAVE_FREEIFADDRS)
 
                if(!ifa) {
                        continue;
@@ -682,7 +686,7 @@ void retry(meshlink_handle_t *mesh) {
 #endif
        }
 
-#ifdef HAVE_IFADDRS_H
+#if defined(HAVE_IFADDRS_H) && defined(HAVE_GETIFADDRS) && defined(HAVE_FREEIFADDRS)
 
        if(ifa) {
                freeifaddrs(ifa);
@@ -701,7 +705,7 @@ void retry(meshlink_handle_t *mesh) {
 */
 void main_loop(meshlink_handle_t *mesh) {
        timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval) {
-               default_timeout, prng(mesh, TIMER_FUDGE)
+               1, prng(mesh, TIMER_FUDGE)
        });
        timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval) {
                0, 0