Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b949d4dd authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Add NDK API for getprocnetwork" am: 37bc6b57 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1722615

Change-Id: Id34d884a2c68f2c9df16f6cfc235cac9cb02ba6c
parents c34ef6d2 37bc6b57

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ cc_library_shared { 
            shared_libs: [

                "android.hardware.memtrack-V1-ndk_platform",

                "libandroidicu",

                "libandroid_net",

                "libbpf_android",

                "libnetdbpf",

                "libnetdutils",

native/android/libandroid.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ LIBANDROID { 
    ATrace_endAsyncSection; # introduced=29

    ATrace_setCounter; # introduced=29

    android_getaddrinfofornetwork; # introduced=23

    android_getprocnetwork; # introduced=31

    android_setprocnetwork; # introduced=23

    android_setsocknetwork; # introduced=23

    android_res_cancel; # introduced=29

native/android/libandroid_net.map.txt

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ LIBANDROID_NET { 
    android_res_nquery; # llndk

    android_res_nresult; # llndk

    android_res_nsend; # llndk

    # These functions have been part of the NDK since API 31.

    android_getprocnetwork; # llndk

  local:

    *;

};

native/android/net.c

+21 −3
Original line number Diff line number Diff line
@@ -22,12 +22,13 @@ 
#include <stdlib.h>

#include <sys/limits.h>





static int getnetidfromhandle(net_handle_t handle, unsigned *netid) {

    static const uint32_t k32BitMask = 0xffffffff;

// This value MUST be kept in sync with the corresponding value in

// the android.net.Network#getNetworkHandle() implementation.

static const uint32_t kHandleMagic = 0xcafed00d;

static const uint32_t kHandleMagicSize = 32;



static int getnetidfromhandle(net_handle_t handle, unsigned *netid) {

    static const uint32_t k32BitMask = 0xffffffff;



    // Check for minimum acceptable version of the API in the low bits.

    if (handle != NETWORK_UNSPECIFIED &&
@@ -41,6 +42,12 @@ static int getnetidfromhandle(net_handle_t handle, unsigned *netid) { 
    return 1;

}



static net_handle_t gethandlefromnetid(unsigned netid) {

    if (netid == NETID_UNSET) {

        return NETWORK_UNSPECIFIED;

    }

    return (((net_handle_t) netid) << kHandleMagicSize) | kHandleMagic;

}



int android_setsocknetwork(net_handle_t network, int fd) {

    unsigned netid;
@@ -72,6 +79,17 @@ int android_setprocnetwork(net_handle_t network) { 
    return rval;

}



int android_getprocnetwork(net_handle_t *network) {

    if (network == NULL) {

        errno = EINVAL;

        return -1;

    }



    unsigned netid = getNetworkForProcess();

    *network = gethandlefromnetid(netid);

    return 0;

}



int android_getaddrinfofornetwork(net_handle_t network,

        const char *node, const char *service,

        const struct addrinfo *hints, struct addrinfo **res) {