Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal

[linphone] / coreapi / private.h

diff --git a/coreapi/private.h b/coreapi/private.h
index d2b206b6e9ef35bf75ce038804417b80eecaf832..25341d94d7bfdb227ca5eb43384b6f177f8f1812 100644 (file)
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -56,6 +56,7 @@
 
 typedef enum _LCState{
        LCStateInit,
+       LCStatePreEstablishing,
        LCStateRinging,
        LCStateAVRunning
 }LCState;
@@ -71,6 +72,7 @@ typedef struct _LinphoneCall
        struct _RtpProfile *video_profile;
        struct _LinphoneCallLog *log;
        SalOp *op;
+       SalOp *ping_op;
        char localip[LINPHONE_IPADDR_SIZE]; /* our best guess for local ipaddress for this call */
        time_t start_time; /*time at which the call was initiated*/
        time_t media_start_time; /*time at which it was accepted, media streams established*/
@@ -180,6 +182,7 @@ void linphone_core_start_waiting(LinphoneCore *lc, const char *purpose);
 void linphone_core_update_progress(LinphoneCore *lc, const char *purpose, float progresses);
 void linphone_core_stop_waiting(LinphoneCore *lc);
 
+int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, LinphoneProxyConfig *dest_proxy);
 
 extern SalCallbacks linphone_sal_callbacks;
 
@@ -253,6 +256,7 @@ typedef struct sip_config
        bool_t sdp_200_ack;
        bool_t only_one_codec; /*in SDP answers*/
        bool_t register_only_when_network_is_up;
+       bool_t ping_with_options;
 } sip_config_t;
 
 typedef struct rtp_config