diff --git a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
index 6a9fe82e..da92271c 100644
--- a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
+++ b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
@@ -293,13 +293,11 @@ public class MoonBridge {
 
     public static native int testClientConnectivity(String testServerHostName, int referencePort, int testFlags);
 
-    public static native int getPortFromPortFlagIndex(int portFlagIndex);
-
-    public static native String getProtocolFromPortFlagIndex(int portFlagIndex);
-
     public static native int getPortFlagsFromStage(int stage);
 
     public static native int getPortFlagsFromTerminationErrorCode(int errorCode);
 
+    public static native String stringifyPortFlags(int portFlags, String separator);
+
     public static native void init();
 }
diff --git a/app/src/main/java/com/limelight/utils/ServerHelper.java b/app/src/main/java/com/limelight/utils/ServerHelper.java
index 4b0c60a7..7bb3350c 100644
--- a/app/src/main/java/com/limelight/utils/ServerHelper.java
+++ b/app/src/main/java/com/limelight/utils/ServerHelper.java
@@ -101,11 +101,7 @@ public class ServerHelper {
                 }
                 else {
                     dialogSummary = parent.getResources().getString(R.string.nettest_text_failure);
-                    for (int i = 0; i < 32; i++) {
-                        if ((ret & (1 << i)) != 0) {
-                            dialogSummary += MoonBridge.getProtocolFromPortFlagIndex(i) + " " + MoonBridge.getPortFromPortFlagIndex(i) + "\n";
-                        }
-                    }
+                    dialogSummary += MoonBridge.stringifyPortFlags(ret, "\n");
                 }
 
                 Dialog.displayDialog(parent,
diff --git a/app/src/main/jni/moonlight-core/moonlight-common-c b/app/src/main/jni/moonlight-core/moonlight-common-c
index ce546b12..cca2ba9a 160000
--- a/app/src/main/jni/moonlight-core/moonlight-common-c
+++ b/app/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit ce546b12b0135c6267edff4a04f0d83925a8a25d
+Subproject commit cca2ba9aabfc0e9ae18b980e7ecc08abb3888ec1
diff --git a/app/src/main/jni/moonlight-core/simplejni.c b/app/src/main/jni/moonlight-core/simplejni.c
index 53d7cfc5..f09c628b 100644
--- a/app/src/main/jni/moonlight-core/simplejni.c
+++ b/app/src/main/jni/moonlight-core/simplejni.c
@@ -115,17 +115,6 @@ Java_com_limelight_nvstream_jni_MoonBridge_testClientConnectivity(JNIEnv *env, j
     return ret;
 }
 
-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getPortFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    return LiGetPortFromPortFlagIndex(portFlagIndex);
-}
-
-JNIEXPORT jstring JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getProtocolFromPortFlagIndex(JNIEnv *env, jclass clazz, jint portFlagIndex) {
-    int protocol = LiGetProtocolFromPortFlagIndex(portFlagIndex);
-    return (*env)->NewStringUTF(env, protocol == IPPROTO_TCP ? "TCP" : "UDP");
-}
-
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jclass clazz, jint stage) {
     return LiGetPortFlagsFromStage(stage);
@@ -134,4 +123,15 @@ Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jc
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromTerminationErrorCode(JNIEnv *env, jclass clazz, jint errorCode) {
     return LiGetPortFlagsFromTerminationErrorCode(errorCode);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_stringifyPortFlags(JNIEnv *env, jclass clazz, jint portFlags, jstring separator) {
+    const char* separatorStr = (*env)->GetStringUTFChars(env, separator, NULL);
+    char outputBuffer[512];
+
+    LiStringifyPortFlags(portFlags, separatorStr, outputBuffer, sizeof(outputBuffer));
+
+    (*env)->ReleaseStringUTFChars(env, separator, separatorStr);
+    return (*env)->NewStringUTF(env, outputBuffer);
 }
\ No newline at end of file