witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

repair sending of messages with external-body URL

Browse source
This commit is contained in:
Simon Morlat 2015-12-21 10:59:19 +01:00
parent 29d2355ba7
commit cb49c4f342
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
coreapi/bellesip_sal/sal_op_message.c
View file

@ -160,11 +160,11 @@ void sal_process_incoming_message(SalOp *op,const belle_sip_request_event_t *eve
}
rcs_filetransfer=is_rcs_filetransfer(content_type);
if (content_type && ((plain_text=is_plain_text(content_type))
|| (external_body=is_external_body(content_type))
|| (decryptedMessage!=NULL)
|| rcs_filetransfer)) {
|| (rcs_filetransfer = is_rcs_filetransfer(content_type)) )) {
SalMessage salmsg;
char message_id[256]={0};
@ -241,6 +241,7 @@ int sal_message_send(SalOp *op, const char *from, const char *to, const char* co
size_t content_length = msg?strlen(msg):0;
time_t curtime=time(NULL);
uint8_t *multipartEncryptedMessage = NULL;
const char *body;
int retval;
if (op->dialog){
@ -321,7 +322,11 @@ int sal_message_send(SalOp *op, const char *from, const char *to, const char* co
belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_content_type_parse(content_type_raw)));
belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_content_length_create(content_length)));
belle_sip_message_add_header(BELLE_SIP_MESSAGE(req),BELLE_SIP_HEADER(belle_sip_header_date_create_from_time(&curtime)));
belle_sip_message_set_body(BELLE_SIP_MESSAGE(req),(multipartEncryptedMessage==NULL)?msg:(const char *)multipartEncryptedMessage,content_length);
body = (multipartEncryptedMessage==NULL) ? msg : (char*) multipartEncryptedMessage;
if (body){
/*don't call set_body() with null argument because it resets content type and content length*/
belle_sip_message_set_body(BELLE_SIP_MESSAGE(req), body, content_length);
}
retval = sal_op_send_request(op,req);
free(multipartEncryptedMessage);

2
mediastreamer2

@ -1 +1 @@
Subproject commit 813aa6164aadcae5dbb2ea19b1f47deb8ce329f1
Subproject commit 0add81683f61d85304011b122b3c1ffa61590867