fix bug when choosing SDP connection address

restore logs

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index ab917920cd10dbc9487b35e58b76bdba3654033d..db3190bbb3e851709690144472689ea3cc3e6ad5 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -469,7 +469,7 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr
        call->op=sal_op_new(lc->sal);
        sal_op_set_user_pointer(call->op,call);
        call->core=lc;
        call->op=sal_op_new(lc->sal);
        sal_op_set_user_pointer(call->op,call);
        call->core=lc;

-       linphone_core_get_local_ip(lc,linphone_address_get_domain(to),call->localip);
+       linphone_core_get_local_ip(lc,NULL,call->localip);

        linphone_call_init_common(call,from,to);
        _linphone_call_params_copy(&call->params,params);
        sal_op_set_custom_header(call->op,call->params.custom_headers);
        linphone_call_init_common(call,from,to);
        _linphone_call_params_copy(&call->params,params);
        sal_op_set_custom_header(call->op,call->params.custom_headers);


@@ -528,7 +528,7 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
        }
 
        linphone_address_clean(from);
        }
 
        linphone_address_clean(from);

-       linphone_core_get_local_ip(lc,linphone_address_get_domain(from),call->localip);
+       linphone_core_get_local_ip(lc,NULL,call->localip);

        linphone_call_init_common(call, from, to);
        call->log->call_id=ms_strdup(sal_op_get_call_id(op)); /*must be known at that time*/
        linphone_core_init_default_params(lc, &call->params);
        linphone_call_init_common(call, from, to);
        call->log->call_id=ms_strdup(sal_op_get_call_id(op)); /*must be known at that time*/
        linphone_core_init_default_params(lc, &call->params);

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index e1d88b292e04015c1c2b064336b1ffff5a7088c4..729df1fc6e7118c6edba9621aa6e1a6fe7e87de2 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1211,9 +1211,8 @@ void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const
 }
 static void misc_config_read (LinphoneCore *lc) {
        LpConfig *config=lc->config;
 }
 static void misc_config_read (LinphoneCore *lc) {
        LpConfig *config=lc->config;

-    lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",15);
-    lc->max_calls=lp_config_get_int(config,"misc","max_calls",NB_MAX_CALLS);
-       linphone_core_set_log_level((OrtpLogLevel)lp_config_get_int(config,"misc","log_level",0));
+       lc->max_call_logs=lp_config_get_int(config,"misc","history_max_size",15);
+       lc->max_calls=lp_config_get_int(config,"misc","max_calls",NB_MAX_CALLS);

 }
 
 
 }
 
 


@@ -2170,9 +2169,6 @@ void linphone_core_iterate(LinphoneCore *lc){
        }
 
        if (one_second_elapsed) {
        }
 
        if (one_second_elapsed) {

-               if (ortp_get_log_level_mask() != lp_config_get_int(lc->config, "misc", "log_level", 0)) {
-                       lp_config_set_int(lc->config, "misc", "log_level", ortp_get_log_level_mask());
-               }

                if (lp_config_needs_commit(lc->config)) {
                        lp_config_sync(lc->config);
                }
                if (lp_config_needs_commit(lc->config)) {
                        lp_config_sync(lc->config);
                }