From c9ada30c5a7b0d59665476dcb6e354863f19db58 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 12 May 2017 14:31:38 +0200 Subject: [PATCH] Add getNatPolicy JNI to LinphoneProxyConfig --- coreapi/linphonecore_jni.cc | 4 ++++ java/common/org/linphone/core/LinphoneProxyConfig.java | 5 +++++ java/impl/org/linphone/core/LinphoneProxyConfigImpl.java | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 241e8fd79..008a18993 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2867,6 +2867,10 @@ extern "C" jstring Java_org_linphone_core_LinphoneProxyConfigImpl_getContactUriP return params ? env->NewStringUTF(params) : NULL; } +JNIEXPORT jobject JNICALL Java_org_linphone_core_LinphoneProxyConfigImpl_getNatPolicy(JNIEnv* env,jobject thiz,jlong proxyCfg) { + LinphoneNatPolicy *nat_policy = linphone_proxy_config_get_nat_policy((LinphoneProxyConfig *)proxyCfg); + return (nat_policy != NULL) ? getNatPolicy(env, nat_policy) : NULL; +} extern "C" jint Java_org_linphone_core_LinphoneProxyConfigImpl_setRoute(JNIEnv* env,jobject thiz,jlong proxyCfg,jstring jroute) { if (jroute != NULL) { diff --git a/java/common/org/linphone/core/LinphoneProxyConfig.java b/java/common/org/linphone/core/LinphoneProxyConfig.java index edca8af15..b8552d3dc 100644 --- a/java/common/org/linphone/core/LinphoneProxyConfig.java +++ b/java/common/org/linphone/core/LinphoneProxyConfig.java @@ -85,6 +85,11 @@ public interface LinphoneProxyConfig { */ public boolean registerEnabled(); + /** + * @return nat policy from proxy config + */ + public LinphoneNatPolicy getNatPolicy(); + /** * normalize a human readable phone number into a basic string. 888-444-222 becomes 888444222 * @param number diff --git a/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java b/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java index 53d8aad5f..47766aa85 100644 --- a/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java +++ b/java/impl/org/linphone/core/LinphoneProxyConfigImpl.java @@ -100,6 +100,8 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig { private native int lookupCCCFromIso(long nativePtr, String iso); private native int lookupCCCFromE164(long nativePtr, String e164); + private native Object getNatPolicy(long nativePtr); + public LinphoneProxyConfig enableRegister(boolean value) { isValid(); @@ -124,6 +126,10 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig { return this; } + public LinphoneNatPolicy getNatPolicy() { + return (LinphoneNatPolicy)getNatPolicy(nativePtr); + } + public void setIdentity(String identity) throws LinphoneCoreException { isValid(); setIdentity(nativePtr,identity);