Merge branch 'master' of git://git.linphone.org/linphone

diff --combined coreapi/linphonecore.c
index dd89175f7f621d6a5b2ac2584bb3a6575eb80333,0db4090ca1cbafe612860b24eccd730fa455da65..8930f3a8912ff6295c4c9e1909f043eafaefcff9
--- 1/coreapi/linphonecore.c
--- 2/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@@ -270,10 -270,6 +270,10 @@@ const rtp_stats_t *linphone_call_log_ge
        return &cl->remote_stats;
  }
  
 +const char *linphone_call_log_get_call_id(const LinphoneCallLog *cl){
 +      return cl->call_id;
 +}
 +
  /**
   * Assign a user pointer to the call log.
  **/
@@@ -330,13 -326,6 +330,13 @@@ LinphoneAddress *linphone_call_log_get_
        return cl->to;
  }
  
 +/**
 + * Returns remote address (that is from or to depending on call direction).
 +**/
 +LinphoneAddress *linphone_call_log_get_remote_address(LinphoneCallLog *cl){
 +      return (cl->dir == LinphoneCallIncoming) ? cl->from : cl->to;
 +}
 +
  /**
   * Returns the direction of the call.
  **/
@@@ -2093,7 -2082,7 +2093,7 @@@ void linphone_core_iterate(LinphoneCor
                 linphone_core_start_invite() */
                calls=calls->next;
                linphone_call_background_tasks(call,one_second_elapsed);
-               if (call->state==LinphoneCallOutgoingInit && (curtime-call->start_time>=2)){
+               if (call->state==LinphoneCallOutgoingInit && (elapsed>=4)){
                        /*start the call even if the OPTIONS reply did not arrive*/
                        if (call->ice_session != NULL) {
                                ms_warning("ICE candidates gathering from [%s] has not finished yet, proceed with the call without ICE anyway."
@@@ -2376,6 -2365,8 +2376,8 @@@ int linphone_core_proceed_with_invite_i
        } else {
                upnp_ready = TRUE;
        }
+ #else
+       upnp_ready=TRUE;
  #endif //BUILD_UPNP
        if (call->ping_op != NULL) {
                if (call->ping_replied == TRUE) ping_ready = TRUE;