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

merge multicall patch from Aurelien

parent ace54d21
......@@ -78,6 +78,8 @@ static int lpc_cmd_ports(LinphoneCore *lc, char *args);
static int lpc_cmd_speak(LinphoneCore *lc, char *args);
static int lpc_cmd_codec(LinphoneCore *lc, char *args);
static int lpc_cmd_echocancellation(LinphoneCore *lc, char *args);
static int lpc_cmd_pause(LinphoneCore *lc, char *args);
static int lpc_cmd_resume(LinphoneCore *lc, char *args);
/* Command handler helpers */
static void linphonec_proxy_add(LinphoneCore *lc);
......@@ -120,17 +122,21 @@ void linphonec_out(const char *fmt,...);
LPC_COMMAND commands[] = {
{ "help", lpc_cmd_help, "Print commands help", NULL },
{ "call", lpc_cmd_call, "Call a SIP uri",
"'call <sip-url>' "
": initiate a call to the specified destination."
"'call <sip-url>' \t: initiate a call to the specified destination.\n"
"'call show' \t: show all the current calls status.\n"
},
{ "chat", lpc_cmd_chat, "Chat with a SIP uri",
"'chat <sip-url> \"message\"' "
": send a chat message \"message\" to the specified destination."
},
{ "terminate", lpc_cmd_terminate, "Terminate the current call",
NULL },
{ "terminate", lpc_cmd_terminate, "Terminate a call",
"'terminate' : Terminate the current call\n"
"'terminate <sip:XXX@XXX.XXX.XXX.XXX>' : Terminate the call with remote address\n"
"'terminate <all>' : Terminate all the current calls\n"
},
{ "answer", lpc_cmd_answer, "Answer a call",
"Accept an incoming call."
"'answer' : Answer the current incoming call\n"
"'answer <sip:XXX@XXX.XXX.XXX.XXX>' : Answer the call with remote address\n"
},
{ "autoanswer", lpc_cmd_autoanswer, "Show/set auto-answer mode",
"'autoanswer' \t: show current autoanswer mode\n"
......@@ -223,7 +229,12 @@ LPC_COMMAND commands[] = {
"'ec on [<delay>] [<tail>] [<framesize>]' : turn EC on with given delay, tail length and framesize\n"
"'ec off' : turn echo cancellation (EC) off\n"
"'ec show' : show EC status" },
{ (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL }
{ "pause", lpc_cmd_pause, "pause a call",
"'pause' : pause the current call\n"},
{ "resume", lpc_cmd_resume, "resume a call",
"'resume' : resume the unique call\n"
"'resume <sip:XXX@XXX.XXX.XXX.XXX>' : hold off the call with cid <cid>\n"},
{ (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL }
};
/***************************************************************************
......@@ -374,13 +385,34 @@ lpc_cmd_call(LinphoneCore *lc, char *args)
{
return 0;
}
if ( lc->call != NULL )
if(!strcmp(args,"show"))
{
linphonec_out("Terminate current call first.\n");
MSList *calls = linphone_core_get_calls(lc);
if(calls)
{
MSList *p_calls = calls;
linphonec_out("<remote>\t\t\t\t<status>\r\n");
while(p_calls != NULL)
{
linphonec_out("%s\t\t\t%s\r\n",
linphone_call_get_remote_address_as_string(p_calls->data),
(((LinphoneCall *)p_calls->data)==linphone_core_get_current_call(lc))?"yes":"no");
p_calls = p_calls->next;
}
ms_list_free(calls);
}
else
{
linphonec_out("No active call.\n");
}
}
else
{
if ( linphone_core_in_call(lc) )
{
linphonec_out("Terminate or hold on the current call first.\n");
return 1;
}
if ( NULL == linphone_core_invite(lc, args) )
{
linphonec_out("Error from linphone_core_invite.\n");
......@@ -448,21 +480,98 @@ lpc_cmd_refer(LinphoneCore *lc, char *args)
static int
lpc_cmd_terminate(LinphoneCore *lc, char *args)
{
if ( -1 == linphone_core_terminate_call(lc, NULL) )
char *arg1 = args;
char *arg2 = NULL;
char *ptr = args;
if (!args)
{
linphonec_out("No active call.\n");
if(linphone_core_in_call(lc))
{
if ( -1 == linphone_core_terminate_call(lc, linphone_core_get_current_call(lc)) )
{
linphonec_out("Could not stop the active call.\n");
}
}
else
{
linphonec_out("No active call.\n");
}
return 1;
}
return 1;
/* Isolate first and second arg */
while(*ptr && !isspace(*ptr)) ++ptr;
if ( *ptr )
{
*ptr='\0';
arg2=ptr+1;
while(*arg2 && isspace(*arg2)) ++arg2;
}
if (arg1 != 0)
{
if(strcmp(arg1,"all")==0)
{
linphonec_out("We are going to stop all the calls.\n");
return (linphone_core_terminate_all_calls(lc)==0)?1:0;
}
else
{
char the_remote_address[255];
int n = sscanf(arg1, "%s", the_remote_address);
if (n == 1)
{
if ( -1 == linphone_core_terminate_call(lc,linphone_core_get_call_by_remote_address(lc,the_remote_address)))
{
linphonec_out("Cannot stop the call with %s.\n",the_remote_address);
}
return 1;
}
}
}
return 0;
}
static int
lpc_cmd_answer(LinphoneCore *lc, char *args)
{
if ( -1 == linphone_core_accept_call(lc, NULL) )
char *arg1 = args;
char *arg2 = NULL;
char *ptr = args;
if (!args)
{
linphonec_out("No incoming call.\n");
//TODO if just one call is present answer the only one ...
if ( -1 == linphone_core_accept_call(lc, linphone_core_get_current_call(lc)) )//TODO is there any current call here=> nope
{
linphonec_out("No incoming call.\n");
}
return 1;
}
return 1;
// Isolate first and second arg
while(*ptr && !isspace(*ptr)) ++ptr;
if ( *ptr )
{
*ptr='\0';
arg2=ptr+1;
while(*arg2 && isspace(*arg2)) ++arg2;
}
if (arg1 != 0)
{
char the_remote_address[256];
int n = sscanf(arg1, "%s", the_remote_address);
if (n == 1)
{
if ( -1 == linphone_core_accept_call(lc, linphone_core_get_call_by_remote_address(lc,the_remote_address)) )
{
linphonec_out("Cannot answer the call from %s.\n",the_remote_address);
}
return 1;
}
}
return 0;
}
static int
......@@ -1063,7 +1172,62 @@ lpc_cmd_staticpic(LinphoneCore *lc, char *args)
return 0; /* Syntax error */
}
static int lpc_cmd_pause(LinphoneCore *lc, char *args){
if(linphone_core_in_call(lc))
{
linphone_core_pause_call(lc,linphone_core_get_current_call(lc));
return 1;
}
linphonec_out("you can only pause when a call is in process\n");
return 0;
}
static int lpc_cmd_resume(LinphoneCore *lc, char *args){
if(linphone_core_in_call(lc))
{
linphonec_out("There is already a call in process pause or stop it first");
}
if (args)
{
char the_remote_address[255];
int n = sscanf(args, "%s", the_remote_address);
if (n == 1)
{
if(linphone_core_resume_call(lc,linphone_core_get_call_by_remote_address(lc,the_remote_address)) < 0)
{
linphonec_out("There was a problem to resume the call check the remote address you gave %s\n",args);
return 0;
}
else
{
return 1;
}
}
}
else
{
int returned = 0;
MSList *calls = linphone_core_get_calls(lc);
if(ms_list_size(calls) == 1)
{
if(linphone_core_resume_call(lc,calls->data) < 0)
{
linphonec_out("There was a problem to resume the unique call \n");
returned = 0;
}
else
{
returned = 1;
}
ms_list_free(calls);
return returned;
}
}
return 0;
}
/***************************************************************************
*
......
......@@ -344,7 +344,9 @@ linphonec_bye_received(LinphoneCore *lc, LinphoneCall *call)
// printing this is unneeded as we'd get a "Communication ended"
// message trough display_status callback anyway
//printf("Bye received from %s\n", from);
char *from=linphone_call_get_remote_address_as_string(call);
printf("Bye received from %s\n", from);
ms_free(from);
}
/*
......
......@@ -35,7 +35,8 @@ static void linphone_connect_incoming(LinphoneCore *lc, LinphoneCall *call){
ring_stop(lc->ringstream);
lc->ringstream=NULL;
}
linphone_core_start_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
linphone_core_start_media_streams(lc,call);
}
static void call_received(SalOp *h){
......@@ -66,7 +67,7 @@ static void call_received(SalOp *h){
sal_op_release(h);
return;
}
if (lc->call!=NULL){/*busy*/
if (!linphone_core_can_we_add_call(lc)){/*busy*/
sal_call_decline(h,SalReasonBusy,NULL);
sal_op_release(h);
return;
......@@ -75,7 +76,19 @@ static void call_received(SalOp *h){
to=sal_op_get_to(h);
call=linphone_call_new_incoming(lc,linphone_address_new(from),linphone_address_new(to),h);
lc->call=call;
if(linphone_core_add_call(lc,call)!= 0)
{
ms_warning("we cannot have more calls\n");
sal_call_decline(h,SalReasonMedia,NULL);
linphone_call_unref(call);
return;
}
if(linphone_core_get_current_call(lc)!=NULL) //we are already in call just inform that an incoming call is going on
{
char temp[256];
snprintf(temp,sizeof(temp),"A new incoming call from %s during call",from);
lc->vtable.display_status(lc,temp);
}
sal_call_set_local_media_description(h,call->localdesc);
call->resultdesc=sal_call_get_final_media_description(h);
if (call->resultdesc)
......@@ -83,7 +96,6 @@ static void call_received(SalOp *h){
if (call->resultdesc && sal_media_description_empty(call->resultdesc)){
sal_call_decline(h,SalReasonMedia,NULL);
linphone_call_unref(call);
lc->call=NULL;
return;
}
......@@ -99,13 +111,13 @@ static void call_received(SalOp *h){
lc->vtable.display_status(lc,barmesg);
/* play the ring */
if (lc->sound_conf.ring_sndcard!=NULL){
if (lc->sound_conf.ring_sndcard!=NULL && !linphone_core_in_call(lc)){
ms_message("Starting local ring...");
lc->ringstream=ring_start(lc->sound_conf.local_ring,2000,lc->sound_conf.ring_sndcard);
}
call->state=LinphoneCallRinging;
sal_call_notify_ringing(h);
linphone_core_init_media_streams(lc,lc->call);
linphone_core_init_media_streams(lc,call);
if (lc->vtable.inv_recv) lc->vtable.inv_recv(lc,call);
ms_free(barmesg);
ms_free(tmp);
......@@ -113,7 +125,7 @@ static void call_received(SalOp *h){
static void call_ringing(SalOp *h){
LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(h));
LinphoneCall *call=lc->call;
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(h);
SalMediaDescription *md;
if (call==NULL) return;
if (lc->vtable.display_status)
......@@ -143,7 +155,8 @@ static void call_ringing(SalOp *h){
lc->ringstream=NULL;
}
ms_message("Doing early media...");
linphone_core_start_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
linphone_core_start_media_streams(lc,call);
call->media_pending=TRUE;
}
call->state=LinphoneCallRinging;
......@@ -151,22 +164,21 @@ static void call_ringing(SalOp *h){
static void call_accepted(SalOp *op){
LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
LinphoneCall *call=lc->call;
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
if (call==NULL){
ms_warning("No call to accept.");
return ;
}
if (sal_op_get_user_pointer(op)!=lc->call){
ms_warning("call_accepted: ignoring.");
return;
}
if (call->state==LinphoneCallAVRunning){
return ; /*already accepted*/
}
if (lc->audiostream->ticker!=NULL){
if ((lc->audiostream!=NULL) && (lc->audiostream->ticker!=NULL)){
/*case where we accepted early media */
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
{
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
}
}
if (call->resultdesc)
sal_media_description_unref(call->resultdesc);
......@@ -187,20 +199,19 @@ static void call_accepted(SalOp *op){
static void call_ack(SalOp *op){
LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
LinphoneCall *call=lc->call;
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
if (call==NULL){
ms_warning("No call to be ACK'd");
return ;
}
if (sal_op_get_user_pointer(op)!=lc->call){
ms_warning("call_ack: ignoring.");
return;
}
if (call->media_pending){
if (lc->audiostream->ticker!=NULL){
/*case where we accepted early media */
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
{
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
}
}
if (call->resultdesc)
sal_media_description_unref(call->resultdesc);
......@@ -222,8 +233,11 @@ static void call_ack(SalOp *op){
static void call_updated(SalOp *op){
LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op));
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
{
linphone_core_stop_media_streams(lc,call);
linphone_core_init_media_streams(lc,call);
}
if (call->resultdesc)
sal_media_description_unref(call->resultdesc);
call->resultdesc=sal_call_get_final_media_description(op);
......@@ -244,7 +258,8 @@ static void call_terminated(SalOp *op, const char *from){
ring_stop(lc->ringstream);
lc->ringstream=NULL;
}
linphone_core_stop_media_streams(lc,lc->call);
if(call == linphone_core_get_current_call(lc))
linphone_core_stop_media_streams(lc,call);
lc->vtable.show(lc);
lc->vtable.display_status(lc,_("Call terminated."));
linphone_call_set_terminated(call);
......@@ -259,7 +274,6 @@ static void call_terminated(SalOp *op, const char *from){
linphone_address_destroy(addr);
}
linphone_call_unref(call);
lc->call=NULL;
}
static void call_failure(SalOp *op, SalError error, SalReason sr, const char *details){
......@@ -270,12 +284,8 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
char *msg600=_("User does not want to be disturbed.");
char *msg603=_("Call declined.");
char *msg=NULL;
LinphoneCall *call=lc->call;
LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
if (sal_op_get_user_pointer(op)!=lc->call){
ms_warning("call_failure: ignoring.");
return;
}
if (lc->vtable.show) lc->vtable.show(lc);
if (error==SalErrorNoResponse){
......@@ -330,12 +340,13 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
ring_stop(lc->ringstream);
lc->ringstream=NULL;
}
linphone_core_stop_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
linphone_core_stop_media_streams(lc,call);
if (call!=NULL) {
linphone_call_set_terminated(call);
linphone_call_unref(call);//TODO not an unref here ???//AUREL
if (sr!=SalReasonDeclined) gstate_new_state(lc, GSTATE_CALL_ERROR, msg);
else gstate_new_state(lc, GSTATE_CALL_END, NULL);
lc->call=NULL;
}
}
......
......@@ -55,7 +55,7 @@ void linphone_chat_room_send_message(LinphoneChatRoom *cr, const char *msg){
if(linphone_core_is_in_communication_with(cr->lc,cr->peer))
{
ms_message("send SIP message into the call\n");
op = cr->lc->call->op;
op = (linphone_core_get_current_call(cr->lc))->op;
}
else
{
......
......@@ -177,6 +177,15 @@ static void linphone_call_destroy(LinphoneCall *obj)
if (obj->ping_op) {
sal_op_release(obj->ping_op);
}
if(linphone_core_del_call(obj->core,obj) != 0)
{
ms_error("could not remove the call from the list !!!");
}
if(obj == linphone_core_get_current_call(obj->core))
{
ms_message("destroying the current call\n");
linphone_core_unset_the_current_call(obj->core);
}
ms_free(obj);
}
......
......@@ -280,15 +280,19 @@ bool_t linphone_call_asked_to_autoanswer(LinphoneCall *call){
return FALSE;
}
int linphone_core_get_current_call_duration(const LinphoneCore *lc){
LinphoneCall *call=lc->call;
int linphone_core_get_call_duration(LinphoneCall *call){
if (call==NULL) return 0;
if (call->media_start_time==0) return 0;
return time(NULL)-call->media_start_time;
}
const LinphoneAddress *linphone_core_get_remote_address(LinphoneCore *lc){
LinphoneCall *call=lc->call;
int linphone_core_get_current_call_duration(const LinphoneCore *lc){
LinphoneCall *call=linphone_core_get_current_call((LinphoneCore *)lc);
return linphone_core_get_call_duration(call);
}
const LinphoneAddress *linphone_core_get_current_call_remote_address(struct _LinphoneCore *lc){
LinphoneCall *call=linphone_core_get_current_call(lc);
if (call==NULL) return 0;
return linphone_call_get_remote_address(call);
}
......@@ -1493,9 +1497,8 @@ void linphone_core_iterate(LinphoneCore *lc){
if (lc->auto_net_state_mon) monitor_network_state(lc,curtime);
proxy_update(lc);
if (lc->call!=NULL){
LinphoneCall *call=lc->call;
LinphoneCall *call = linphone_core_get_current_call(lc);
if(call){
if (call->state==LinphoneCallPreEstablishing && (curtime-call->start_time>=2)){
/*start the call even if the OPTIONS reply did not arrive*/
linphone_core_start_invite(lc,call,NULL);
......@@ -1652,7 +1655,7 @@ bool_t linphone_core_is_in_communication_with(LinphoneCore *lc, const char *to)
{
char *tmp;
bool_t returned;
const LinphoneAddress *la=linphone_core_get_remote_address(lc);
const LinphoneAddress *la=linphone_core_get_current_call_remote_address(lc);
if(la == NULL)
{
return FALSE;
......@@ -1696,7 +1699,6 @@ static char *get_fixed_contact(LinphoneCore *lc, LinphoneCall *call , LinphonePr
if (call->op && sal_op_get_contact(call->op)!=NULL){
return NULL;
}
/* if the ping OPTIONS request succeeded use the contact guessed from the
received, rport*/
if (call->ping_op){
......@@ -1743,7 +1745,7 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, LinphonePro
ms_free(contact);
}
call->state=LinphoneCallInit;
linphone_core_init_media_streams(lc,lc->call);
linphone_core_init_media_streams(lc,call);
if (!lc->sip_conf.sdp_200_ack){
call->media_pending=TRUE;
sal_call_set_local_media_description(call->op,call->localdesc);
......@@ -1763,9 +1765,9 @@ int linphone_core_start_invite(LinphoneCore *lc, LinphoneCall *call, LinphonePro
if (err<0){
ms_warning("Could not initiate call.");
lc->vtable.display_status(lc,_("could not call"));
linphone_core_stop_media_streams(lc,call);
if(call == linphone_core_get_current_call(lc))
linphone_core_stop_media_streams(lc,call);
linphone_call_unref(call);
lc->call=NULL;
}else gstate_new_state(lc, GSTATE_CALL_OUT_INVITE, real_url);
ms_free(real_url);
ms_free(from);
......@@ -1808,11 +1810,14 @@ LinphoneCall * linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddr
LinphoneProxyConfig *dest_proxy=NULL;
LinphoneCall *call;
if (lc->call!=NULL){
lc->vtable.display_warning(lc,_("Sorry, having multiple simultaneous calls is not supported yet !"));
if (linphone_core_in_call(lc)){
lc->vtable.display_warning(lc,_("Sorry, you have to pause or stop the current call first !"));
return NULL;
}
if(!linphone_core_can_we_add_call(lc)){
lc->vtable.display_warning(lc,_("Sorry, we have reached the maximum number of simultaneous calls"));
return NULL;
}
linphone_core_get_default_proxy(lc,&proxy);
route=linphone_core_get_route(lc);
......@@ -1837,7 +1842,13 @@ LinphoneCall * linphone_core_invite_address(LinphoneCore *lc, const LinphoneAddr
call=linphone_call_new_outgoing(lc,parsed_url2,linphone_address_clone(real_parsed_url));
sal_op_set_route(call->op,route);
lc->call=call;
if(linphone_core_add_call(lc,call)!= 0)
{
ms_warning("we had a problem in adding the call into the invite ... weird\n");
linphone_call_unref(call);
return NULL;
}
linphone_core_set_as_current_call(lc,call);
if (dest_proxy!=NULL || lc->sip_conf.ping_with_options==FALSE){
err=linphone_core_start_invite(lc,call,dest_proxy);
}else{
......@@ -1873,13 +1884,16 @@ int linphone_core_refer(LinphoneCore *lc, LinphoneCall *call, const char *url)
}
/**
* Returns true if in incoming call is pending, ie waiting for being answered or declined.
* Returns true if an incoming call is pending, ie waiting for being answered or declined.
*
* @ingroup call_control
**/
bool_t linphone_core_inc_invite_pending(LinphoneCore*lc){
if (lc->call!=NULL && lc->call->dir==LinphoneCallIncoming){
return TRUE;
LinphoneCall *call = linphone_core_get_current_call(lc);
if(call != NULL)
{
if(call->dir==LinphoneCallIncoming)
return TRUE;
}
return FALSE;
}
......@@ -2134,7 +2148,7 @@ void linphone_core_start_media_streams(LinphoneCore *lc, LinphoneCall *call){
end:
ms_free(cname);
linphone_address_destroy(me);
lc->call->state=LinphoneCallAVRunning;
call->state=LinphoneCallAVRunning;
}