renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetworkMgr: Use cheaper/simpler hasDefaultRoute in isOnline

Browse Source 
Device:getDefaultRoute parses /proc/net/route and converts the hex
addresses to textual IP addresses, but in `isOnline` we don't care what
address the gateway actually has, we only care about whether we have a
default route into the Internet.

This provides a simpler alternative that does the equivalent of
"ip route get 203.0.113.1 || ip route get 2001:db8::1" (note that it
does support IPv6-only connectivity as opposed to
Device:getDefaultRoute) and returns true if we have a route.

Inspired by https://github.com/pavel-odintsov/get_default_outgoing_ip_linux
This commit is contained in:
Tomas Janousek
2024-03-28 15:01:50 +00:00
committed by Frans de Jonge
parent b3e125a7ce
commit 4fa6783dbb
1 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend/ui/network/manager.lua
View File

@@ -274,6 +274,39 @@ function NetworkMgr:ifHasAnAddress()
return ok
end
-- The socket API equivalent of "ip route get 203.0.113.1 || ip route get 2001:db8::1".
--
-- These addresses are from special ranges reserved for documentation
-- (RFC 5737, RFC 3849) and therefore likely to just use the default route.
function NetworkMgr:hasDefaultRoute()
local socket = require("socket")
local s, ret, err
s, err = socket.udp()
if s == nil then
logger.err("NetworkMgr: socket.udp:", err)
return nil
end
ret, err = s:setpeername("203.0.113.1", "53")
if ret == nil then
-- Most likely "Network is unreachable", meaning there's no route to that address.
logger.dbg("NetworkMgr: socket.udp.setpeername:", err)
-- Try IPv6, may still succeed if this is an IPv6-only network.
ret, err = s:setpeername("2001:db8::1", "53")
if ret == nil then
-- Most likely "Network is unreachable", meaning there's no route to that address.
logger.dbg("NetworkMgr: socket.udp.setpeername:", err)
end
end
s:close()
-- If setpeername succeeded, we have a default route.
return ret ~= nil
end
-- Wrappers around turnOnWifi & turnOffWifi with proper Event signaling
function NetworkMgr:enableWifi(wifi_cb, connectivity_cb, connectivity_widget, interactive)
local status = self:requestToTurnOnWifi(wifi_cb, interactive)
@@ -534,7 +567,7 @@ function NetworkMgr:isOnline()
-- Fail early if we don't even have a default route.
-- On PocketBook devices, if the first call to socket.dns.toip(…) fails, it never succeeds again.
if not Device:getDefaultRoute() then
if not self:hasDefaultRoute() then
return false
end