moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 19:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to ENet API to support IPv6

Browse Source
This commit is contained in:
Cameron Gutman 2016-03-07 14:37:01 -08:00
parent 5a3897f22a
commit 96d9e4977b
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/libs/limelight-common.jar
View File

Binary file not shown.

2
app/src/main/jni/jnienet/enet

@ -1 +1 @@
Subproject commit 4f7ef11c2352dc53539d1ff93887ef637a6c2e2f Subproject commit 8b24595dbd9ad0a026edf2047b4d1eaceaf09123

22
app/src/main/jni/jnienet/jnienet.c
View File

@ -15,9 +15,21 @@ Java_com_limelight_nvstream_enet_EnetConnection_initializeEnet(JNIEnv *env, jobj
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
Java_com_limelight_nvstream_enet_EnetConnection_createClient(JNIEnv *env, jobject class) { Java_com_limelight_nvstream_enet_EnetConnection_createClient(JNIEnv *env, jobject class, jstring address) {
ENetAddress enetAddress;
const char *addrStr;
int err;
// Perform a lookup on the address to determine the address family
addrStr = (*env)->GetStringUTFChars(env, address, 0);
err = enet_address_set_host(&enetAddress, addrStr);
(*env)->ReleaseStringUTFChars(env, address, addrStr);
if (err < 0) {
return CLIENT_TO_LONG(NULL);
}
// Create a client that can use 1 outgoing connection and 1 channel // Create a client that can use 1 outgoing connection and 1 channel
return CLIENT_TO_LONG(enet_host_create(NULL, 1, 1, 0, 0)); return CLIENT_TO_LONG(enet_host_create(enetAddress.address.ss_family, NULL, 1, 1, 0, 0));
} }
JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL
@ -26,12 +38,16 @@ Java_com_limelight_nvstream_enet_EnetConnection_connectToPeer(JNIEnv *env, jobje
ENetAddress enetAddress; ENetAddress enetAddress;
ENetEvent event; ENetEvent event;
const char *addrStr; const char *addrStr;
int err;
// Initialize the ENet address // Initialize the ENet address
addrStr = (*env)->GetStringUTFChars(env, address, 0); addrStr = (*env)->GetStringUTFChars(env, address, 0);
enet_address_set_host(&enetAddress, addrStr); err = enet_address_set_host(&enetAddress, addrStr);
enet_address_set_port(&enetAddress, port); enet_address_set_port(&enetAddress, port);
(*env)->ReleaseStringUTFChars(env, address, addrStr); (*env)->ReleaseStringUTFChars(env, address, addrStr);
if (err < 0) {
return PEER_TO_LONG(NULL);
}
// Start the connection // Start the connection
peer = enet_host_connect(LONG_TO_CLIENT(client), &enetAddress, 1, 0); peer = enet_host_connect(LONG_TO_CLIENT(client), &enetAddress, 1, 0);