X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=coreapi%2Fsal_eXosip2.h;h=e00dd64d99722fb21851b77f8ac9dd60b04e0da1;hb=bf492b4278d1c68b2da55c65da173a33aec32ea1;hp=c0d32fe0e0f922e837d7de8a86f9eae5a8dec376;hpb=92f082ab044a8b39c11b23fb03c5829b49d45010;p=linphone

diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h
index c0d32fe0..e00dd64d 100644
--- a/coreapi/sal_eXosip2.h
+++ b/coreapi/sal_eXosip2.h
@@ -30,12 +30,29 @@ int sdp_to_media_description(sdp_message_t *sdp, SalMediaDescription *desc);
 
 struct Sal{
 	SalCallbacks callbacks;
+	SalTransport transport;
+	MSList *calls; /*MSList of SalOp */
 	MSList *registers;/*MSList of SalOp */
 	MSList *out_subscribes;/*MSList of SalOp */
 	MSList *in_subscribes;/*MSList of SalOp */
+	MSList *pending_auths;/*MSList of SalOp */
+	MSList *other_transactions; /*MSList of SalOp */
 	int running;
 	int session_expires;
-	int automatic_action;
+	int keepalive_period;
+	void *up; /*user pointer*/
+	char* rootCa; /* File _or_ folder containing root CA */
+	int dscp;
+	bool_t one_matching_codec;
+	bool_t double_reg;
+	bool_t use_rports;
+	bool_t use_101;
+	bool_t reuse_authorization;
+	bool_t verify_server_certs;
+	bool_t verify_server_cn;
+	bool_t expire_old_contact;
+	bool_t add_dates;
+	bool_t tcp_tls_keepalive;
 };
 
 struct SalOp{
@@ -50,15 +67,38 @@ struct SalOp{
 	SalMediaDescription *result;
 	sdp_message_t *sdp_answer;
 	eXosip_event_t *pending_auth;
+	osip_call_id_t *call_id; /*used for out of calls transaction in order
+	 			to retrieve the operation when receiving a response*/
+	char *replaces;
+	char *referred_by;
+	const SalAuthInfo *auth_info;
+	const char *sipfrag_pending;
 	bool_t supports_session_timers;
 	bool_t sdp_offering;
 	bool_t reinvite;
+	bool_t masquerade_via;
+	bool_t auto_answer_asked;
+	bool_t terminated;
 };
 
+void sal_remove_out_subscribe(Sal *sal, SalOp *op);
+void sal_remove_in_subscribe(Sal *sal, SalOp *op);
+void sal_add_other(Sal *sal, SalOp *op,  osip_message_t *request);
+
 void sal_exosip_subscription_recv(Sal *sal, eXosip_event_t *ev);
 void sal_exosip_subscription_answered(Sal *sal,eXosip_event_t *ev);
 void sal_exosip_notify_recv(Sal *sal,eXosip_event_t *ev);
 void sal_exosip_subscription_closed(Sal *sal,eXosip_event_t *ev);
 
+void sal_exosip_in_subscription_closed(Sal *sal, eXosip_event_t *ev);
+SalOp * sal_find_out_subscribe(Sal *sal, int sid);
+SalOp * sal_find_in_subscribe(Sal *sal, int nid);
+void sal_exosip_fix_route(SalOp *op);
+void sal_exosip_add_custom_headers(osip_message_t *msg, SalCustomHeader *ch);
+SalCustomHeader * sal_exosip_get_custom_headers(osip_message_t *msg);
+
+void _osip_list_set_empty(osip_list_t *l, void (*freefunc)(void*));
+
+void sal_message_add_route(osip_message_t *msg, const char *proxy);
 
 #endif