Device: Handle network info data gathering ourselves #10139

NiLuJe · 2023-02-19T02:04:09Z

i.e., we now query routes, interfaces, wireless extensions & ping ourselves, dropping the dependency on specific CLI tools altogether.

Depends on koreader/koreader-base#1584

This change is

NiLuJe

Reviewed 4 of 4 files at r1, 1 of 1 files at r2, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @NiLuJe)

NiLuJe · 2023-02-20T01:27:51Z

I figured why stop there, and added ping support ;D.

On the upside, I went the extra mile with unprivileged ICMP socket support (like iputils' ping). That may help on unrooted platforms, assuming the sysctl knob doesn't block its use ;p.
(Otherwise, we, like busybox's ping, use a raw socket, and creating one is a privileged operation).

NiLuJe

Reviewed 1 of 1 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @NiLuJe)

NiLuJe · 2023-02-20T02:35:19Z

Also, because I asked myself this yesterday:

This is in Device instead of NetworkMgr mainly because it predates NetworkMgr ^^, and this may be platform-specific (e.g., overloaded by specific Device implementation; while Generic does not setup custom NetworkMgr methods by default, which would make this slightly less straightforward).

NiLuJe · 2023-02-20T19:18:21Z

Here's the money shot

NiLuJe

Reviewed 1 of 1 files at r7, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @NiLuJe)

Parse /proc/net/route ourselves to avoid dependency on specific networking tools

It's a single byte stored in an uint32_t, and apparently the high bytes like to be set to 0xFF instead of zero ;).

(Same variable name as in iwconfig)

Unions are fun.

Also went and dug up the actual kernel commit to pinpoint the minimum version required

Like iputils

It *is* enabled in some distros, though (e.g., Ubuntu Touch).

Should prevent mismatched typography rules, at least (e.g., hair space before colons in French).

Also, fix my T( usage ;p

Might have blown the layout on high pings

koreader/koreader-base#1578 koreader/koreader-base#1585 koreader/koreader-base#1586 koreader/koreader-base#1584

koreader/koreader-base#1587

NiLuJe

Reviewed 1 of 1 files at r8, all commit messages.
Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @NiLuJe)

poire-z · 2023-02-20T23:58:03Z

Not that I bother, but on the emulator (not running as root), it crashes:

02/21/23-00:56:11 ERROR Device:retrieveNetworkInfo: SIOCGIWESSID ioctl: Operation not supported
02/21/23-00:56:11 DEBUG Device:ping4: unprivileged ICMP socket: Permission denied
02/21/23-00:56:11 DEBUG Device:ping4: Opening a RAW ICMP socket requires CAP_NET_RAW capabilities!
./luajit: frontend/device/generic/device.lua:844: attempt to perform arithmetic on local 'rtt' (a nil value)
stack traceback:
        frontend/device/generic/device.lua:844: in function 'retrieveNetworkInfo'
        frontend/ui/network/networklistener.lua:243: in function 'handleEvent'

NiLuJe · 2023-02-21T00:01:36Z

Oh, duh'; the usual "did my testing before implementing the final stupid idea" ;p.

Fix is trivial, will do so later tonight ;).

Don't blow up if we fall back to exec'ing ping Fix koreader#10139 (comment)

Don't blow up if we fall back to exec'ing ping Fix #10139 (comment)

Frenzie · 2023-02-25T07:47:01Z

frontend/device/generic/device.lua

+                                        table.insert(results, T(_("SSID: \"%1\""), ffi.string(essid)))
+                                    end
+                                else
+                                    table.insert(results, _("SSID: off/any"))


What exactly does any mean here?

That's a fair question, I'm assuming that means a hidden SSID (that's the same string as iwconfig, FWIW).

Ah, I didn't realize it was just copying the logic more or less verbatim. (first search result with the source, probably a bit outdated)

https://github.com/HewlettPackard/wireless-tools/blob/c1074342112d8a4cdc44275b1bc15701aaf7f30b/wireless_tools/iwconfig.c#L159-L185

NiLuJe commented Feb 19, 2023

View reviewed changes

Frenzie added this to the 2023.02 milestone Feb 19, 2023

NiLuJe commented Feb 20, 2023

View reviewed changes

NiLuJe added 23 commits February 20, 2023 20:46

Device: Implement getDefaultRoute

e90f0c8

Parse /proc/net/route ourselves to avoid dependency on specific networking tools

Oops, that wasn't the final revision of the code ;o)

3c8ff81

SDL: Use getDefaultRoute in isConnected

7c2fcf9

Start revamping retrieveNetworkInfos to use getifaddrs

fbeb1e7

Don't translate those

b9003be

Check the flags to skip over loopback interfaces

0d17b17

Wrap it up w/o wireless ext handling

7ccc809

Unbreak union accesses

2ae0895

Drop the commented out example here, as we're using those in device, now

5c68a52

Fix MAC parsing

bca491e

It's a single byte stored in an uint32_t, and apparently the high bytes like to be set to 0xFF instead of zero ;).

Unbreak

30db238

Don't insert gateway twice ;)

aa5ed09

Get the ESSID ourselves

4bfbae7

Oops, forgot the ffi.string call ;o)

d649ed1

Add a linebreak between interfaces & the ping result

4b47f85

Use a smaller font, to avoid IPv6 breaking the layout too much...

4e8376e

Review pass

d4ab9b9

Store that in a variable to clarify the content

eff5228

(Same variable name as in iwconfig)

Again, temporary variable with a sane name

af09429

Unions are fun.

Cosmetic tweak

b8ce3e1

Initial implementation of a DIY ping ;p

e95a90b

Do without a continue

e6d64df

Fix SOCK_DGRAM reply parsing, with the help of iputils

21af610

NiLuJe added 16 commits February 20, 2023 20:46

Tweak some comments

eb294a5

Switch to ping4 in retrieveNetworkInfo

e0454d5

Replace the standalone prints with logger

9f9ec2d

Spelling check ;p

5d45a18

Luachecked

7475bdb

Also went and dug up the actual kernel commit to pinpoint the minimum version required

Yeah, it's definitely disabled by default :D

57d4b18

More comment tweaks

a221f3e

Use a less convoluted struct

b18dc5b

Like iputils

Minor cosmetic tweaks

329635b

Oh, hey, it's actually disabled by default, period :D.

686b09f

It *is* enabled in some distros, though (e.g., Ubuntu Touch).

Translate all networkinfo strings

1401da5

Should prevent mismatched typography rules, at least (e.g., hair space before colons in French).

Display the ping's RTT in networkinfo

30fa051

Also, fix my T( usage ;p

Fix ping formatting

4587cda

Move RTT to a new line

fc72e93

Might have blown the layout on high pings

Oops, brainfart

aebafa6

Bump base

e824b12

koreader/koreader-base#1578 koreader/koreader-base#1585 koreader/koreader-base#1586 koreader/koreader-base#1584

NiLuJe force-pushed the master branch from 1c1cff1 to e824b12 Compare February 20, 2023 19:48

Bump base

1960596

koreader/koreader-base#1587

NiLuJe commented Feb 20, 2023

View reviewed changes

NiLuJe merged commit 5330c24 into koreader:master Feb 20, 2023

NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Feb 21, 2023

Hotfix followup to koreader#10139

4c597a7

Don't blow up if we fall back to exec'ing ping Fix koreader#10139 (comment)

NiLuJe mentioned this pull request Feb 21, 2023

Hotfix followup to #10139 #10151

Merged

NiLuJe added a commit that referenced this pull request Feb 21, 2023

Hotfix followup to #10139 (#10151)

d0b78c0

Don't blow up if we fall back to exec'ing ping Fix #10139 (comment)

Frenzie reviewed Feb 25, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Device: Handle network info data gathering ourselves #10139

Device: Handle network info data gathering ourselves #10139

NiLuJe commented Feb 19, 2023 •

edited

NiLuJe left a comment

NiLuJe commented Feb 20, 2023 •

edited

NiLuJe left a comment

NiLuJe commented Feb 20, 2023 •

edited

NiLuJe commented Feb 20, 2023

NiLuJe left a comment

NiLuJe left a comment

poire-z commented Feb 20, 2023

NiLuJe commented Feb 21, 2023 •

edited

Frenzie Feb 25, 2023

NiLuJe Feb 25, 2023

Frenzie Feb 25, 2023

Device: Handle network info data gathering ourselves #10139

Device: Handle network info data gathering ourselves #10139

Conversation

NiLuJe commented Feb 19, 2023 • edited

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe commented Feb 20, 2023 • edited

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe commented Feb 20, 2023 • edited

NiLuJe commented Feb 20, 2023

NiLuJe left a comment

Choose a reason for hiding this comment

NiLuJe left a comment

Choose a reason for hiding this comment

poire-z commented Feb 20, 2023

NiLuJe commented Feb 21, 2023 • edited

Frenzie Feb 25, 2023

Choose a reason for hiding this comment

NiLuJe Feb 25, 2023

Choose a reason for hiding this comment

Frenzie Feb 25, 2023

Choose a reason for hiding this comment

NiLuJe commented Feb 19, 2023 •

edited

NiLuJe commented Feb 20, 2023 •

edited

NiLuJe commented Feb 20, 2023 •

edited

NiLuJe commented Feb 21, 2023 •

edited