feat: implement network type detection using JNI #729
Merged
Conversation
This file contains hidden or 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
sdsantos
requested changes
May 26, 2025
composeApp/src/desktopMain/kotlin/org/ooni/engine/MacOsNetworkTypeFinder.kt
Outdated
Show resolved
Hide resolved
composeApp/src/desktopMain/kotlin/org/ooni/probe/BuildDependencies.kt
Outdated
Show resolved
Hide resolved
…nd update platform detection in Makefile
aanorbel
changed the title
sdsantos
reviewed
May 28, 2025
| System.loadLibrary("networktypefinder") | ||
| libraryLoaded = true | ||
| } catch (e: UnsatisfiedLinkError) { | ||
| Logger.d("Failed to load native library: ${e.message}") |
There was a problem hiding this comment.
Should be a warning log and not debug log.
| "unknown" | ||
| } | ||
| } catch (e: Throwable) { | ||
| Logger.d("Error in native method call: ${e.message}") |
There was a problem hiding this comment.
Should be a warning log and not debug log.
| extern "C" { | ||
| #endif | ||
|
|
||
| JNIEXPORT jstring JNICALL Java_org_ooni_engine_MacOsNetworkTypeFinder_getNetworkType(JNIEnv *env, jobject obj); |
Comment on lines
89
to
91
| #endif | ||
|
|
||
| #if defined(__APPLE__) |
There was a problem hiding this comment.
Why close the #if defined(__APPLE__) to then open it again straight after?
conveyor.conf
Outdated
| } | ||
|
|
||
| app.inputs += { | ||
| from = "composeApp/src/desktopMain/build/libnetworktypefinder.dylib" |
| } else if (nw_path_uses_interface_type(currentPath, nw_interface_type_wired)) { | ||
| result = @"wired_ethernet"; | ||
| } else { | ||
| result = @""; |
There was a problem hiding this comment.
Maybe this should be unknown too?
| } | ||
|
|
||
| // Helper to check if interface is up and has an IP address | ||
| static int iface_is_up_and_has_ip(const char *iface) { |
| int n = sscanf(line, "%63s %lx %lx %X %u %u %u %x %u %u %u", iface, &dest, &gw, &flags, &refcnt, &use, &metric, &mask, &mtu, &win, &irtt); | ||
| if (n >= 11 && dest == 0) { // default route | ||
| if (is_vpn_iface(iface) && iface_is_up_and_has_ip(iface)) { | ||
| strcpy(vpn_iface, iface); |
There was a problem hiding this comment.
Why copy it, if we don't need it? Maybe just have a is_vpn bool flag?
Or match the code below and fclose and return straight away?
sdsantos
approved these changes
May 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Closes #660
Check proper embedding of lib with conveyor