Commit dd6195ec authored by Simon Morlat's avatar Simon Morlat
Browse files

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

parents 08875d20 0fb206da
......@@ -1043,7 +1043,11 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta
linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_24,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_32,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_aal2_g726_40,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_silk_nb,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_silk_mb,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_silk_wb,-1,NULL);
linphone_core_assign_payload_type(lc,&payload_type_silk_swb,-1,NULL);
ms_init();
/* create a mediastreamer2 event queue and set it as global */
/* This allows to run event's callback in linphone_core_iterate() */
......
......@@ -541,13 +541,16 @@ int sal_call_set_local_media_description(SalOp *h, SalMediaDescription *desc){
int sal_call(SalOp *h, const char *from, const char *to){
int err;
const char *route;
osip_message_t *invite=NULL;
sal_op_set_from(h,from);
sal_op_set_to(h,to);
sal_exosip_fix_route(h);
err=eXosip_call_build_initial_invite(&invite,to,from,sal_op_get_route(h),"Phone call");
route = sal_op_get_route(h);
err=eXosip_call_build_initial_invite(&invite,to,from,route,"Phone call");
if (err!=0){
ms_error("Could not create call.");
ms_error("Could not create call. Error %d (from=%s to=%s route=%s)",
err, from, to, route);
return -1;
}
osip_message_set_allow(invite, "INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
......@@ -574,7 +577,7 @@ int sal_call(SalOp *h, const char *from, const char *to){
eXosip_unlock();
h->cid=err;
if (err<0){
ms_error("Fail to send invite !");
ms_error("Fail to send invite ! Error code %d", err);
return -1;
}else{
sal_add_call(h->base.root,h);
......
mediastreamer2 @ 061bf62c
Subproject commit 084ac9a21334d3f91d51666a36bf9f717741f23d
Subproject commit 061bf62cc0d3112b1003c5567230ae2b35e8910b
oRTP @ 76062079
Subproject commit d1ca9b6c5fbcaafa59299dc1a5f790bb92dc4e6e
Subproject commit 7606207905bd3dc661e68576097adce471916697
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment