AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for android and wg

Browse source
This commit is contained in:
pokamest 2021-10-01 12:18:48 -07:00
parent b8e35ed66c
commit edbfcda197
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/android/build.gradle
View file

@ -119,11 +119,11 @@ android {
} }
} }
debug { debug {
applicationIdSuffix ".debug" //applicationIdSuffix ".debug"
versionNameSuffix "-debug" //versionNameSuffix "-debug"
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}" arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
} }
} }
} }

4
client/android/src/org/amnezia/vpn/VPNLogger.kt
View file

@ -66,7 +66,7 @@ class Log {
} }
} }
private fun write(message: String) { private fun write(message: String) {
LocalDateTime.now() //LocalDateTime.now()
file.appendText("[${LocalDateTime.now()}] $message \n") //file.appendText("[${LocalDateTime.now()}] $message \n")
} }
} }

4
client/android/wireguard/CMakeLists.txt
View file

@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.4.1)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
message("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}") message("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
set( CMAKE_WG_TOOLS_DIR ../../../desktop-client/client/3rd/wireguard-tools ) set( CMAKE_WG_TOOLS_DIR ../../../../desktop-client/client/3rd/wireguard-tools )
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)
@ -27,7 +27,7 @@ add_executable(libwg.so ${WG_SOURCES})
target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/") target_include_directories(libwg.so PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/uapi/linux/" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_WG_TOOLS_DIR}/src/")
target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\") target_compile_options(libwg.so PUBLIC -O3 -std=gnu11 -D_GNU_SOURCE -include ${CMAKE_CURRENT_SOURCE_DIR}/ndk-compat/compat.h -DHAVE_VISIBILITY_HIDDEN -DRUNSTATEDIR=\"/data/data/${ANDROID_PACKAGE_NAME}/cache\")
add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" add_custom_target(libwg-go.so WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libwg-go" COMMENT "Building wireguard-go" VERBATIM COMMAND make
ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME} ANDROID_ARCH_NAME=${ANDROID_ARCH_NAME}
ANDROID_C_COMPILER=${ANDROID_C_COMPILER} ANDROID_C_COMPILER=${ANDROID_C_COMPILER}
ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT} ANDROID_TOOLCHAIN_ROOT=${ANDROID_TOOLCHAIN_ROOT}

12
client/android/wireguard/libwg-go/jni.c
View file

@ -20,7 +20,7 @@ extern int wgGetSocketV6(int handle);
extern char* wgGetConfig(int handle); extern char* wgGetConfig(int handle);
extern char* wgVersion(); extern char* wgVersion();
JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOn( JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOn(
JNIEnv* env, jclass c, jstring ifname, jint tun_fd, jstring settings) { JNIEnv* env, jclass c, jstring ifname, jint tun_fd, jstring settings) {
const char* ifname_str = (*env)->GetStringUTFChars(env, ifname, 0); const char* ifname_str = (*env)->GetStringUTFChars(env, ifname, 0);
size_t ifname_len = (*env)->GetStringUTFLength(env, ifname); size_t ifname_len = (*env)->GetStringUTFLength(env, ifname);
@ -34,22 +34,22 @@ JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOn(
return ret; return ret;
} }
JNIEXPORT void JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgTurnOff( JNIEXPORT void JNICALL Java_org_amnezia_vpn_VPNService_wgTurnOff(
JNIEnv* env, jclass c, jint handle) { JNIEnv* env, jclass c, jint handle) {
wgTurnOff(handle); wgTurnOff(handle);
} }
JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetSocketV4( JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV4(
JNIEnv* env, jclass c, jint handle) { JNIEnv* env, jclass c, jint handle) {
return wgGetSocketV4(handle); return wgGetSocketV4(handle);
} }
JNIEXPORT jint JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetSocketV6( JNIEXPORT jint JNICALL Java_org_amnezia_vpn_VPNService_wgGetSocketV6(
JNIEnv* env, jclass c, jint handle) { JNIEnv* env, jclass c, jint handle) {
return wgGetSocketV6(handle); return wgGetSocketV6(handle);
} }
JNIEXPORT jstring JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetConfig( JNIEXPORT jstring JNICALL Java_org_amnezia_vpn_VPNService_wgGetConfig(
JNIEnv* env, jclass c, jint handle) { JNIEnv* env, jclass c, jint handle) {
jstring ret; jstring ret;
char* config = wgGetConfig(handle); char* config = wgGetConfig(handle);
@ -60,7 +60,7 @@ JNIEXPORT jstring JNICALL Java_org_mozilla_firefox_vpn_VPNService_wgGetConfig(
} }
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_org_mozilla_firefox_vpn_VPNService_wgVersion(JNIEnv* env, jclass c) { Java_org_amnezia_vpn_VPNService_wgVersion(JNIEnv* env, jclass c) {
jstring ret; jstring ret;
char* version = wgVersion(); char* version = wgVersion();
if (!version) return NULL; if (!version) return NULL;