From 6d12a7a712cfafb93a58107e6ce612d1a21d6408 Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 26 Apr 2021 06:08:02 -0400 Subject: [PATCH] fixes for android jni --- llarp/ev/ev_libuv.cpp | 4 +++- llarp/net/route.cpp | 4 +++- llarp/router/route_poker.cpp | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/llarp/ev/ev_libuv.cpp b/llarp/ev/ev_libuv.cpp index 13e63c180..a1d7b330b 100644 --- a/llarp/ev/ev_libuv.cpp +++ b/llarp/ev/ev_libuv.cpp @@ -368,7 +368,9 @@ namespace llarp::uv bool Loop::inEventLoop() const { - return m_EventLoopThreadID and *m_EventLoopThreadID == std::this_thread::get_id(); + if (m_EventLoopThreadID) + return *m_EventLoopThreadID == std::this_thread::get_id(); + return true; } } // namespace llarp::uv diff --git a/llarp/net/route.cpp b/llarp/net/route.cpp index 840f15dda..051d86fae 100644 --- a/llarp/net/route.cpp +++ b/llarp/net/route.cpp @@ -498,6 +498,8 @@ namespace llarp::net { std::vector gateways; #ifdef __linux__ +#ifdef ANDROID +#else std::ifstream inf("/proc/net/route"); for (std::string line; std::getline(inf, line);) { @@ -513,7 +515,7 @@ namespace llarp::net } } } - +#endif return gateways; #elif _WIN32 ForEachWIN32Interface([&](auto w32interface) { diff --git a/llarp/router/route_poker.cpp b/llarp/router/route_poker.cpp index 6ad13d147..02db6bbd8 100644 --- a/llarp/router/route_poker.cpp +++ b/llarp/router/route_poker.cpp @@ -119,7 +119,9 @@ namespace llarp const auto maybe = GetDefaultGateway(); if (not maybe.has_value()) { +#ifndef ANDROID LogError("Network is down"); +#endif // mark network lost m_HasNetwork = false; return;