mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-02-07 14:18:25 +00:00
Not setting dns automatically in core if an app has set it
This commit is contained in:
Erwan Croze
parent
bd08e5940c
commit
8b1498247a
5 changed files with 58 additions and 30 deletions
|
|
@ -52,7 +52,7 @@ private:
|
|||
jmethodID mCpuLockReleaseId;
|
||||
jmethodID mGetDnsServersId;
|
||||
jmethodID mGetPowerManagerId;
|
||||
|
||||
|
||||
};
|
||||
|
||||
jmethodID AndroidPlatformHelpers::getMethodId(JNIEnv *env, jclass klass, const char *method, const char *signature){
|
||||
|
|
@ -77,7 +77,7 @@ AndroidPlatformHelpers::AndroidPlatformHelpers(LinphoneCore *lc, void *system_co
|
|||
return;
|
||||
}
|
||||
mJavaHelper = (jobject) env->NewGlobalRef(mJavaHelper);
|
||||
|
||||
|
||||
mWifiLockAcquireId = getMethodId(env, klass, "acquireWifiLock", "()V");
|
||||
mWifiLockReleaseId = getMethodId(env, klass, "releaseWifiLock", "()V");
|
||||
mMcastLockAcquireId = getMethodId(env, klass, "acquireMcastLock", "()V");
|
||||
|
|
@ -86,10 +86,10 @@ AndroidPlatformHelpers::AndroidPlatformHelpers(LinphoneCore *lc, void *system_co
|
|||
mCpuLockReleaseId = getMethodId(env, klass, "releaseCpuLock", "()V");
|
||||
mGetDnsServersId = getMethodId(env, klass, "getDnsServers", "()[Ljava/lang/String;");
|
||||
mGetPowerManagerId = getMethodId(env, klass, "getPowerManager", "()Ljava/lang/Object;");
|
||||
|
||||
|
||||
jobject pm = env->CallObjectMethod(mJavaHelper,mGetPowerManagerId);
|
||||
belle_sip_wake_lock_init(env, pm);
|
||||
|
||||
|
||||
ms_message("AndroidPlatformHelpers is fully initialised");
|
||||
}
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ AndroidPlatformHelpers::~AndroidPlatformHelpers(){
|
|||
|
||||
|
||||
void AndroidPlatformHelpers::setDnsServers(){
|
||||
if (!mJavaHelper) return;
|
||||
if (!mJavaHelper || linphone_core_get_dns_set_by_app(mCore)) return;
|
||||
JNIEnv *env=ms_get_jni_env();
|
||||
if (env && mJavaHelper) {
|
||||
jobjectArray jservers = (jobjectArray)env->CallObjectMethod(mJavaHelper,mGetDnsServersId);
|
||||
|
|
@ -179,4 +179,3 @@ PlatformHelpers *createAndroidPlatformHelpers(LinphoneCore *lc, void *system_con
|
|||
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1831,6 +1831,15 @@ int linphone_core_get_sip_transport_timeout(LinphoneCore *lc) {
|
|||
return sal_get_transport_timeout(lc->sal);
|
||||
}
|
||||
|
||||
bool_t linphone_core_get_dns_set_by_app(LinphoneCore *lc) {
|
||||
return lc->dns_set_by_app;
|
||||
}
|
||||
|
||||
void linphone_core_set_dns_servers_app(LinphoneCore *lc, const bctbx_list_t *servers){
|
||||
lc->dns_set_by_app = (servers != NULL);
|
||||
linphone_core_set_dns_servers(lc, servers);
|
||||
}
|
||||
|
||||
void linphone_core_set_dns_servers(LinphoneCore *lc, const bctbx_list_t *servers){
|
||||
sal_set_dns_servers(lc->sal, servers);
|
||||
}
|
||||
|
|
@ -2151,7 +2160,7 @@ static void linphone_core_init(LinphoneCore * lc, LinphoneCoreCbs *cbs, LpConfig
|
|||
lc->config=lp_config_ref(config);
|
||||
lc->data=userdata;
|
||||
lc->ringstream_autorelease=TRUE;
|
||||
|
||||
|
||||
#ifdef __ANDROID__
|
||||
if (system_context)
|
||||
lc->platform_helper = LinphonePrivate::createAndroidPlatformHelpers(lc, system_context);
|
||||
|
|
@ -2159,7 +2168,7 @@ static void linphone_core_init(LinphoneCore * lc, LinphoneCoreCbs *cbs, LpConfig
|
|||
if (lc->platform_helper == NULL)
|
||||
lc->platform_helper = new LinphonePrivate::StubbedPlatformHelpers(lc);
|
||||
|
||||
|
||||
|
||||
linphone_task_list_init(&lc->hooks);
|
||||
|
||||
_linphone_core_init_account_creator_service(lc);
|
||||
|
|
@ -2226,7 +2235,7 @@ static void linphone_core_init(LinphoneCore * lc, LinphoneCoreCbs *cbs, LpConfig
|
|||
|
||||
lc->vcard_context = linphone_vcard_context_new();
|
||||
linphone_core_initialize_supported_content_types(lc);
|
||||
|
||||
|
||||
getPlatformHelpers(lc)->setDnsServers();
|
||||
|
||||
remote_provisioning_uri = linphone_core_get_provisioning_uri(lc);
|
||||
|
|
@ -6185,11 +6194,11 @@ static void set_sip_network_reachable(LinphoneCore* lc,bool_t is_sip_reachable,
|
|||
|
||||
if (lc->sip_network_reachable==is_sip_reachable) return; // no change, ignore.
|
||||
lc->network_reachable_to_be_notified=TRUE;
|
||||
|
||||
|
||||
if (is_sip_reachable){
|
||||
getPlatformHelpers(lc)->setDnsServers();
|
||||
}
|
||||
|
||||
|
||||
ms_message("SIP network reachability state is now [%s]",is_sip_reachable?"UP":"DOWN");
|
||||
for(elem=linphone_core_get_proxy_config_list(lc);elem!=NULL;elem=elem->next){
|
||||
LinphoneProxyConfig *cfg=(LinphoneProxyConfig*)elem->data;
|
||||
|
|
|
|||
|
|
@ -4747,7 +4747,7 @@ static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageS
|
|||
env->CallVoidMethod(listener, method, jmessage, env->CallStaticObjectMethod(ljb->chatMessageStateClass, ljb->chatMessageStateFromIntId, (jint)state));
|
||||
env->DeleteLocalRef(listener);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
static void file_transfer_progress_indication(LinphoneChatMessage *msg, const LinphoneContent* content, size_t offset, size_t total) {
|
||||
|
|
@ -4913,7 +4913,7 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendChatMessage(JNIE
|
|||
,jlong chatroom_ptr
|
||||
,jobject message
|
||||
,jlong messagePtr) {
|
||||
|
||||
|
||||
linphone_chat_room_send_chat_message_2((LinphoneChatRoom*)chatroom_ptr, (LinphoneChatMessage*)messagePtr);
|
||||
}
|
||||
|
||||
|
|
@ -7697,7 +7697,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCoreImpl_setDnsServers(JNI
|
|||
}
|
||||
}
|
||||
}
|
||||
linphone_core_set_dns_servers((LinphoneCore*)lc, l);
|
||||
linphone_core_set_dns_servers_app((LinphoneCore*)lc, l);
|
||||
bctbx_list_free_with_data(l, ms_free);
|
||||
}
|
||||
|
||||
|
|
@ -7796,7 +7796,7 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneCallImpl_setListener(JNIEn
|
|||
linphone_call_cbs_set_user_data(cbs, env->NewWeakGlobalRef(jlistener));
|
||||
linphone_call_cbs_set_tmmbr_received(cbs, _on_tmmbr_received);
|
||||
linphone_call_add_callbacks(call, cbs);
|
||||
|
||||
|
||||
linphone_call_set_next_video_frame_decoded_callback(call, _next_video_frame_decoded_callback, env->NewWeakGlobalRef(jlistener));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1150,6 +1150,7 @@ struct _LinphoneCore
|
|||
LinphoneImEncryptionEngine *im_encryption_engine;
|
||||
struct _LinphoneAccountCreatorService *default_ac_service;
|
||||
MSBandwidthController *bw_controller;
|
||||
bool_t dns_set_by_app;
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -206,10 +206,10 @@ typedef struct _LinphoneCoreVTable{
|
|||
@deprecated Deprecated since 2015-11-19. */
|
||||
LINPHONE_DEPRECATED DisplayMessageCb display_message;/**< @brief Callback to display a message to the user.
|
||||
@deprecated Deprecated since 2015-11-19. */
|
||||
LINPHONE_DEPRECATED DisplayMessageCb display_warning;/**< @brief Callback to display a warning to the user.
|
||||
LINPHONE_DEPRECATED DisplayMessageCb display_warning;/**< @brief Callback to display a warning to the user.
|
||||
@deprecated Deprecated since 2015-11-19. */
|
||||
LINPHONE_DEPRECATED DisplayUrlCb display_url; /**< @deprecated Deprecated since 2015-11-19. */
|
||||
LINPHONE_DEPRECATED ShowInterfaceCb show; /**< @brief Notifies the application that it should show up.
|
||||
LINPHONE_DEPRECATED ShowInterfaceCb show; /**< @brief Notifies the application that it should show up.
|
||||
@deprecated Deprecated since 2015-11-19. */
|
||||
LINPHONE_DEPRECATED LinphoneCoreTextMessageReceivedCb text_received; /**< @brief A text message has been received.
|
||||
@deprecated Use #message_received instead. Deprecated since 2015-11-19. */
|
||||
|
|
@ -1028,10 +1028,10 @@ LINPHONE_PUBLIC LinphoneAddress * linphone_core_interpret_url(LinphoneCore *lc,
|
|||
|
||||
/**
|
||||
* @brief Initiates an outgoing call.
|
||||
*
|
||||
*
|
||||
* The application doesn't own a reference to the returned LinphoneCall object.
|
||||
* Use linphone_call_ref() to safely keep the LinphoneCall pointer valid within your application.
|
||||
*
|
||||
*
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @param[in] url The destination of the call (sip address, or phone number).
|
||||
* @return A LinphoneCall object or NULL in case of failure
|
||||
|
|
@ -1080,7 +1080,7 @@ LINPHONE_PUBLIC LinphoneCall * linphone_core_invite_address_with_params(Linphone
|
|||
|
||||
/**
|
||||
* @brief Performs a simple call transfer to the specified destination.
|
||||
*
|
||||
*
|
||||
* The remote endpoint is expected to issue a new call to the specified destination.
|
||||
* The current call remains active and thus can be later paused or terminated.
|
||||
* It is possible to follow the progress of the transfer provided that transferee sends notification about it.
|
||||
|
|
@ -1097,7 +1097,7 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_transfer_call(L
|
|||
|
||||
/**
|
||||
* @brief Transfers a call to destination of another running call. This is used for "attended transfer" scenarios.
|
||||
*
|
||||
*
|
||||
* The transfered call is supposed to be in paused state, so that it is able to accept the transfer immediately.
|
||||
* The destination call is a call previously established to introduce the transfered person.
|
||||
* This method will send a transfer request to the transfered person. The phone of the transfered is then
|
||||
|
|
@ -1117,7 +1117,7 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_transfer_call_t
|
|||
|
||||
/**
|
||||
* @brief Start a new call as a consequence of a transfer request received from a call.
|
||||
*
|
||||
*
|
||||
* This function is for advanced usage: the execution of transfers is automatically managed by the LinphoneCore. However if an application
|
||||
* wants to have control over the call parameters for the new call, it should call this function immediately during the LinphoneCallRefered notification.
|
||||
* @see LinphoneCoreVTable::call_state_changed
|
||||
|
|
@ -1133,7 +1133,7 @@ LINPHONE_PUBLIC LinphoneCall * linphone_core_start_refered_call(LinphoneCore *lc
|
|||
|
||||
/**
|
||||
* @brief Tells whether there is an incoming invite pending.
|
||||
*
|
||||
*
|
||||
* @ingroup call_control
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @return A boolean telling whether an incoming invite is pending or not.
|
||||
|
|
@ -1189,7 +1189,7 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_accept_call_wit
|
|||
|
||||
/**
|
||||
* @brief When receiving an incoming, accept to start a media session as early-media.
|
||||
*
|
||||
*
|
||||
* This means the call is not accepted but audio & video streams can be established if the remote party supports early media.
|
||||
* However, unlike after call acceptance, mic and camera input are not sent during early-media, though received audio & video are played normally.
|
||||
* The call can then later be fully accepted using linphone_core_accept_call() or linphone_core_accept_call_with_params().
|
||||
|
|
@ -1198,13 +1198,13 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_accept_call_wit
|
|||
* @param[in] params The call parameters to use (can be NULL)
|
||||
* @return 0 if successful, -1 otherwise
|
||||
* @ingroup call_control
|
||||
* @deprecated Use linphone_call_accept_early_media_with_params() instead.
|
||||
* @deprecated Use linphone_call_accept_early_media_with_params() instead.
|
||||
**/
|
||||
LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_accept_early_media_with_params(LinphoneCore* lc, LinphoneCall* call, const LinphoneCallParams* params);
|
||||
|
||||
/**
|
||||
* @brief Accept an early media session for an incoming call.
|
||||
*
|
||||
*
|
||||
* This is identical as calling linphone_core_accept_early_media_with_params() with NULL call parameters.
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @param[in] call The incoming call to accept
|
||||
|
|
@ -1217,7 +1217,7 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_accept_early_me
|
|||
|
||||
/**
|
||||
* @brief Terminates a call.
|
||||
*
|
||||
*
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @param[in] call The LinphoneCall object representing the call to be terminated
|
||||
* @return 0 on success, -1 on failure
|
||||
|
|
@ -1259,7 +1259,7 @@ LINPHONE_PUBLIC LinphoneStatus linphone_core_terminate_all_calls(LinphoneCore *l
|
|||
/**
|
||||
* @biref Pauses the call. If a music file has been setup using linphone_core_set_play_file(),
|
||||
* this file will be played to the remote user.
|
||||
*
|
||||
*
|
||||
* The only way to resume a paused call is to call linphone_core_resume_call().
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @param[in] call The call to pause
|
||||
|
|
@ -1280,7 +1280,7 @@ LINPHONE_PUBLIC LinphoneStatus linphone_core_pause_all_calls(LinphoneCore *lc);
|
|||
|
||||
/**
|
||||
* @brief Resumes a call.
|
||||
*
|
||||
*
|
||||
* The call needs to have been paused previously with linphone_core_pause_call().
|
||||
* @param[in] lc LinphoneCore object
|
||||
* @param[in] call The call to resume
|
||||
|
|
@ -1293,7 +1293,7 @@ LINPHONE_PUBLIC LINPHONE_DEPRECATED LinphoneStatus linphone_core_resume_call(Lin
|
|||
|
||||
/**
|
||||
* @brief Updates a running call according to supplied call parameters or parameters changed in the LinphoneCore.
|
||||
*
|
||||
*
|
||||
* In this version this is limited to the following use cases:
|
||||
* - setting up/down the video stream according to the video parameter of the LinphoneCallParams (see linphone_call_params_enable_video() ).
|
||||
* - changing the size of the transmitted video after calling linphone_core_set_preferred_video_size()
|
||||
|
|
@ -1656,6 +1656,25 @@ LINPHONE_PUBLIC void linphone_core_enable_dns_search(LinphoneCore *lc, bool_t en
|
|||
*/
|
||||
LINPHONE_PUBLIC bool_t linphone_core_dns_search_enabled(const LinphoneCore *lc);
|
||||
|
||||
/**
|
||||
* Tells if the DNS was set by an application
|
||||
* @param[in] lc #LinphoneCore object.
|
||||
* @return TRUE if DNS was set by app, FALSE otherwise.
|
||||
*@ingroup media_parameters
|
||||
*/
|
||||
LINPHONE_PUBLIC bool_t linphone_core_get_dns_set_by_app(LinphoneCore *lc);
|
||||
|
||||
/**
|
||||
* Forces liblinphone to use the supplied list of dns servers, instead of system's ones
|
||||
* and set dns_set_by_app at true or false according to value of servers list.
|
||||
* @param[in] lc #LinphoneCore object.
|
||||
* @param[in] servers \bctbx_list{const char *} A list of strings containing the IP addresses of DNS servers to be used.
|
||||
* Setting to NULL restores default behaviour, which is to use the DNS server list provided by the system.
|
||||
* The list is copied internally.
|
||||
* @ingroup media_parameters
|
||||
*/
|
||||
LINPHONE_PUBLIC void linphone_core_set_dns_servers_app(LinphoneCore *lc, const bctbx_list_t *servers);
|
||||
|
||||
/**
|
||||
* Forces liblinphone to use the supplied list of dns servers, instead of system's ones.
|
||||
* @param[in] lc #LinphoneCore object.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue