Skip to content

Kobo: Overengineer the manual CLOEXEC logic in the Wi-Fi scripts#12045

Merged
NiLuJe merged 2 commits into
koreader:masterfrom
NiLuJe:master
Jun 18, 2024
Merged

Kobo: Overengineer the manual CLOEXEC logic in the Wi-Fi scripts#12045
NiLuJe merged 2 commits into
koreader:masterfrom
NiLuJe:master

Conversation

@NiLuJe

@NiLuJe NiLuJe commented Jun 17, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

So it catches non-CLOEXEC sockets properly...

Fix #12043

This change is Reviewable

@NiLuJe NiLuJe added this to the 2024.06 milestone Jun 17, 2024
@NiLuJe

NiLuJe commented Jun 17, 2024

Copy link
Copy Markdown
Member Author

I love dealing with old busybox quirks. -_-".

@NiLuJe

NiLuJe commented Jun 17, 2024

Copy link
Copy Markdown
Member Author

This properly handles #12043 without the LuaSocket-side fix from koreader/koreader-base#1827

06/17/24-21:37:00 INFO  Kobo Wi-Fi: enabling Wi-Fi 
[enable-wifi.sh] Left fd 10 -> /mnt/onboard/.adds/koreader/enable-wifi.sh open
[enable-wifi.sh] Left fd 3 -> /proc/8509/fd/3 => pipe:[87178] (temporary?) open
[enable-wifi.sh] Closed fd 9 -> socket:[71402]

@arpanghosh8453 arpanghosh8453 mentioned this pull request Jun 18, 2024
Closed
@arpanghosh8453

arpanghosh8453 commented Jun 18, 2024

Copy link
Copy Markdown
Contributor

@NiLuJe, I tested this ( replaced the 2 changed files in .adds/koreader directory ) and it seems to fix the problem with the port hijacking by wpa_supplicant on my kobo libra 2. The server resumes fine and works as expected. Hopefully this gets merged soon.

Thank you @NiLuJe for fixing this!

NiLuJe
NiLuJe commented Jun 18, 2024
View reviewed changes

@NiLuJe NiLuJe left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@NiLuJe NiLuJe merged commit 9fd6c82 into koreader:master Jun 18, 2024
Commodore64user pushed a commit to Commodore64user/KOReader_fork that referenced this pull request Aug 2, 2024
@NiLuJe @Commodore64user
Kobo: Overengineer the manual CLOEXEC logic in the Wi-Fi scripts (kor…
82b3176 
…eader#12045)

So it catches non-CLOEXEC sockets properly...

Fix koreader#12043
0xstillb pushed a commit to 0xstillb/koreader-thai that referenced this pull request May 9, 2026
@NiLuJe
Kobo: Overengineer the manual CLOEXEC logic in the Wi-Fi scripts (kor…
c2500d4 
…eader#12045)

So it catches non-CLOEXEC sockets properly...

Fix koreader#12043
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Frenzie Frenzie Frenzie approved these changes

Assignees

No one assigned

Labels

bug Kobo

Projects

None yet

Milestone

2024.07

Development

Successfully merging this pull request may close these issues.

KOReader crashes due to httpinspector when port is already in use

3 participants

@NiLuJe @arpanghosh8453 @Frenzie