mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 11:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix crash

Browse source
This commit is contained in:
Simon Morlat 2014-02-19 11:49:57 +01:00
parent 7e436c7260
commit 7330cae8a2
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
coreapi/linphonecall.c
View file

@ -283,7 +283,7 @@ void linphone_call_make_local_media_description(LinphoneCore *lc, LinphoneCall *
strncpy(md->addr,local_ip,sizeof(md->addr));
strncpy(md->username,linphone_address_get_username(addr),sizeof(md->username));
strncpy(md->name,subject,sizeof(md->name));
if (subject) strncpy(md->name,subject,sizeof(md->name));
if (call->params.down_bw)
md->bandwidth=call->params.down_bw;
@ -1275,30 +1275,31 @@ const char *linphone_call_params_get_custom_header(const LinphoneCallParams *par
}
/**
* Returns the subject of the media session (ie in SDP). Subject from the SIP message can be retrieved using linphone_call_params_get_custom_header().
* Returns the session name of the media session (ie in SDP). Subject from the SIP message can be retrieved using linphone_call_params_get_custom_header() and is different.
* @param cp the call parameters.
**/
const char *linphone_call_params_get_session_name(const LinphoneCallParams *cp){
return cp->subject;
return cp->session_name;
}
/**
* Set the subject of the media session (ie in SDP). Subject from the SIP message can be set using linphone_call_params_set_custom_header().
* Set the session name of the media session (ie in SDP). Subject from the SIP message (which is different) can be set using linphone_call_params_set_custom_header().
* @param cp the call parameters.
* @param name the session name
**/
void linphone_call_params_set_session_name(LinphoneCallParams *cp, const char *subject){
if (cp->subject){
ms_free(cp->subject);
cp->subject=NULL;
void linphone_call_params_set_session_name(LinphoneCallParams *cp, const char *name){
if (cp->session_name){
ms_free(cp->session_name);
cp->session_name=NULL;
}
if (subject) cp->subject=ms_strdup(subject);
if (name) cp->session_name=ms_strdup(name);
}
void _linphone_call_params_copy(LinphoneCallParams *ncp, const LinphoneCallParams *cp){
if (ncp==cp) return;
memcpy(ncp,cp,sizeof(LinphoneCallParams));
if (cp->record_file) ncp->record_file=ms_strdup(cp->record_file);
if (cp->subject) ncp->subject=ms_strdup(cp->subject);
if (cp->session_name) ncp->session_name=ms_strdup(cp->session_name);
/*
* The management of the custom headers is not optimal. We copy everything while ref counting would be more efficient.
*/

2
coreapi/private.h
View file

@ -91,7 +91,7 @@ struct _LinphoneCallParams{
int down_ptime;
int up_ptime;
char *record_file;
char *subject;
char *session_name;
SalCustomHeader *custom_headers;
bool_t has_video;
bool_t real_early_media; /*send real media even during early media (for outgoing calls)*/