Update ipproxy and db-android #1171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
atavism
commented
Sep 12, 2024
| @@ -112,8 +112,9 @@ class GoTun2SocksProvider( | |||
| val intf: ParcelFileDescriptor? = createBuilder(vpnService, builder) | |||
| Logger.debug(TAG, "Running tun2socks") | |||
| if (intf != null) { | |||
| val tunFd = intf!!.detachFd() | |||
There was a problem hiding this comment.
I'm calling detachFd here now to detach the native fd from the ParcelFileDescriptor and let ipproxy be responsible for closing it when it is shutdown. This addresses this "failed to exchange ownership of file descriptor" error:
09-12 07:17:30.537 6233 7652 D Database: BEGIN
09-12 07:17:30.539 6233 7652 D Database: SAVEPOINT 'f2df8955-d49f-4fa9-8400-04e0442f4370' created
09-12 07:17:30.541 6233 6371 D Database: RELEASE 'f2df8955-d49f-4fa9-8400-04e0442f4370'
09-12 07:17:30.542 6233 7652 D LanternVpnService: Done stopping
09-12 07:17:30.547 6233 6372 E GoLog : fdsan: failed to exchange ownership of file descriptor: fd 183 is owned by unique_fd 0x7a5708d05c, was expected to be unowned
|
Did some testing, and this is working really well for me on Android 14! Merging.. |
jigar-f
reviewed
Sep 13, 2024
| @@ -396,7 +396,7 @@ dependencies { | |||
| // from https://github.com/getlantern/opus_android | |||
| implementation files('libs/opuslib-release.aar') | |||
| implementation 'com.github.getlantern:secrets-android:f6a7a69f3d' | |||
| implementation 'com.github.getlantern:db-android:863128d1f8' | |||
| implementation 'com.github.getlantern:db-android:d92368c7f' | |||
There was a problem hiding this comment.
This will not work, you still need to update messaging-android.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.