From f9c30db4919ba4924ecba49ced7a7f4530f4c803 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 7 Jun 2013 15:41:59 +0200 Subject: [PATCH 1/2] Add missing exports. --- coreapi/linphonecore.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index b148e1f3e..8d0c3deb8 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1386,8 +1386,8 @@ LINPHONE_PUBLIC void linphone_core_set_preferred_video_size_by_name(LinphoneCore void linphone_core_enable_video_preview(LinphoneCore *lc, bool_t val); bool_t linphone_core_video_preview_enabled(const LinphoneCore *lc); -void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val); -bool_t linphone_core_self_view_enabled(const LinphoneCore *lc); +LINPHONE_PUBLIC void linphone_core_enable_self_view(LinphoneCore *lc, bool_t val); +LINPHONE_PUBLIC bool_t linphone_core_self_view_enabled(const LinphoneCore *lc); /* returns a null terminated static array of string describing the webcams */ From a9cf6dc87e1b2642b645976f66e25ccc35c1bc28 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 10 Jun 2013 15:28:01 +0200 Subject: [PATCH 2/2] Use new marshalling API. --- coreapi/bellesip_sal/sal_op_call.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c index f9cb812fe..43ae70aaa 100644 --- a/coreapi/bellesip_sal/sal_op_call.c +++ b/coreapi/bellesip_sal/sal_op_call.c @@ -81,13 +81,14 @@ static void sdp_process(SalOp *h){ static int set_sdp(belle_sip_message_t *msg,belle_sdp_session_description_t* session_desc) { belle_sip_header_content_type_t* content_type ; belle_sip_header_content_length_t* content_length; - int length; + belle_sip_error_code error = BELLE_SIP_OK; + unsigned int length = 0; char buff[2048]; if (session_desc) { content_type = belle_sip_header_content_type_create("application","sdp"); - length = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,0,sizeof(buff)); - if (length>=sizeof(buff)) { + error = belle_sip_object_marshal(BELLE_SIP_OBJECT(session_desc),buff,sizeof(buff),&length); + if (error != BELLE_SIP_OK) { ms_error("Buffer too small or sdp too big"); return -1; }