From 61b45fd7a413eedd1d5000e0a05149e7878f1b71 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Mar 2018 14:20:11 +0100 Subject: [PATCH] Fixed issue with server presence & content headers --- src/c-wrapper/api/c-content.cpp | 22 ++++++++++++++++++++-- src/content/content-manager.cpp | 18 ++++++++++-------- src/content/content-type.cpp | 3 +++ src/content/content-type.h | 2 ++ 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/src/c-wrapper/api/c-content.cpp b/src/c-wrapper/api/c-content.cpp index 211985bbb..30021cbb7 100644 --- a/src/c-wrapper/api/c-content.cpp +++ b/src/c-wrapper/api/c-content.cpp @@ -159,7 +159,7 @@ void linphone_content_set_name(LinphoneContent *content, const char *name) { } bool_t linphone_content_is_multipart(const LinphoneContent *content) { - return L_GET_CPP_PTR_FROM_C_OBJECT(content)->getContentType() == LinphonePrivate::ContentType::Multipart; + return L_GET_CPP_PTR_FROM_C_OBJECT(content)->getContentType().isMultipart(); } LinphoneContent * linphone_content_get_part(const LinphoneContent *content, int idx) { @@ -244,6 +244,13 @@ static LinphoneContent * linphone_content_new_with_body_handler(SalBodyHandler * for (const belle_sip_list_t *parts = belle_sip_multipart_body_handler_get_parts(mpbh); parts; parts = parts->next) { belle_sip_body_handler_t *part = BELLE_SIP_BODY_HANDLER(parts->data); LinphoneContent *part_content = linphone_content_new_with_body_handler((SalBodyHandler *)part); + + const belle_sip_list_t *headers = belle_sip_body_handler_get_headers(part); + for (; headers != NULL; headers = headers->next) { + belle_sip_header_t *header = BELLE_SIP_HEADER(headers->data); + L_GET_CPP_PTR_FROM_C_OBJECT(part_content)->addHeader(belle_sip_header_get_name(header), belle_sip_header_get_unparsed_value(header)); + } + contents.push_back(*L_GET_CPP_PTR_FROM_C_OBJECT(part_content)); } LinphonePrivate::Content multipartContent = LinphonePrivate::ContentManager::contentListToMultipart(contents); @@ -281,7 +288,7 @@ LinphoneContent * linphone_content_from_sal_body_handler(SalBodyHandler *body_ha SalBodyHandler * sal_body_handler_from_content(const LinphoneContent *content) { if (content == NULL) return NULL; SalBodyHandler *body_handler; - if (L_GET_CPP_PTR_FROM_C_OBJECT(content)->getContentType() == LinphonePrivate::ContentType::Multipart) { + if (L_GET_CPP_PTR_FROM_C_OBJECT(content)->getContentType().isMultipart()) { size_t size = linphone_content_get_size(content); char *buffer = ms_strdup(L_GET_CPP_PTR_FROM_C_OBJECT(content)->getBodyAsUtf8String().c_str()); const char *boundary = L_STRING_TO_C(L_GET_CPP_PTR_FROM_C_OBJECT(content)->getContentType().getParameter()); @@ -291,6 +298,17 @@ SalBodyHandler * sal_body_handler_from_content(const LinphoneContent *content) { body_handler = sal_body_handler_new(); sal_body_handler_set_data(body_handler, belle_sip_strdup(linphone_content_get_string_buffer(content))); } + + for (const auto &header : L_GET_CPP_PTR_FROM_C_OBJECT(content)->getHeaders()) { + belle_sip_header_t *additionalHeader = BELLE_SIP_HEADER( + belle_sip_header_create( + header.first.c_str(), + header.second.c_str() + ) + ); + belle_sip_body_handler_add_header(BELLE_SIP_BODY_HANDLER(body_handler), additionalHeader); + } + sal_body_handler_set_type(body_handler, linphone_content_get_type(content)); sal_body_handler_set_subtype(body_handler, linphone_content_get_subtype(content)); sal_body_handler_set_size(body_handler, linphone_content_get_size(content)); diff --git a/src/content/content-manager.cpp b/src/content/content-manager.cpp index 94ee69ce9..d4c286c79 100644 --- a/src/content/content-manager.cpp +++ b/src/content/content-manager.cpp @@ -45,23 +45,25 @@ list ContentManager::multipartToContentList (const Content &content) { list contents; for (const belle_sip_list_t *parts = belle_sip_multipart_body_handler_get_parts(mpbh); parts; parts = parts->next) { belle_sip_body_handler_t *part = BELLE_SIP_BODY_HANDLER(parts->data); - belle_sip_header_content_type_t *partContentType = nullptr; + Content content; + for (const belle_sip_list_t *it = belle_sip_body_handler_get_headers(part); it; it = it->next) { belle_sip_header_t *header = BELLE_SIP_HEADER(it->data); if (strcasecmp("Content-Type", belle_sip_header_get_name(header)) == 0) { - partContentType = BELLE_SIP_HEADER_CONTENT_TYPE(header); - break; + belle_sip_header_content_type_t * partContentType = BELLE_SIP_HEADER_CONTENT_TYPE(header); + content.setContentType(ContentType( + belle_sip_header_content_type_get_type(partContentType), + belle_sip_header_content_type_get_subtype(partContentType) + )); + } else { + content.addHeader(belle_sip_header_get_name(header), belle_sip_header_get_unparsed_value(header)); } } - Content content; content.setBody(static_cast( belle_sip_memory_body_handler_get_buffer(BELLE_SIP_MEMORY_BODY_HANDLER(part)) )); - content.setContentType(ContentType( - belle_sip_header_content_type_get_type(partContentType), - belle_sip_header_content_type_get_subtype(partContentType) - )); + contents.push_back(move(content)); } diff --git a/src/content/content-type.cpp b/src/content/content-type.cpp index 78c356af6..e457ff828 100644 --- a/src/content/content-type.cpp +++ b/src/content/content-type.cpp @@ -172,6 +172,9 @@ string ContentType::asString () const { return ""; } +bool ContentType::isMultipart() const { + return getType() == "multipart"; +} bool ContentType::isFile () const { // TODO Remove when not needed anymore in step 2.1 of maindb diff --git a/src/content/content-type.h b/src/content/content-type.h index b13063115..bdf51c75d 100644 --- a/src/content/content-type.h +++ b/src/content/content-type.h @@ -60,6 +60,8 @@ public: std::string asString () const; + bool isMultipart() const; + static bool isFile (const ContentType &contentType); static const ContentType ConferenceInfo;