sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res_pjsip_messaging: Ensure MESSAGE_SEND_STATUS is set properly" into 16

This commit is contained in:
Friendly Automation 2020-01-28 10:17:45 -06:00 committed by Gerrit Code Review
parent de3b98fcc4 4bbf24d2ff
commit 35a782d58a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_pjsip_messaging.c
View File

@ -637,7 +637,7 @@ static struct msg_data *msg_data_create(const struct ast_msg *msg, const char *t
static int msg_send(void *data)
{
RAII_VAR(struct msg_data *, mdata, data, ao2_cleanup);
struct msg_data *mdata = data; /* The caller holds a reference */
const struct ast_sip_body body = {
.type = "text",
@ -681,24 +681,28 @@ static int msg_send(void *data)
return -1;
}
return PJ_SUCCESS;
return 0;
}
static int sip_msg_send(const struct ast_msg *msg, const char *to, const char *from)
{
struct msg_data *mdata;
int res;
if (ast_strlen_zero(to)) {
ast_log(LOG_ERROR, "SIP MESSAGE - a 'To' URI must be specified\n");
return -1;
}
if (!(mdata = msg_data_create(msg, to, from)) ||
ast_sip_push_task(message_serializer, msg_send, mdata)) {
ao2_cleanup(mdata);
mdata = msg_data_create(msg, to, from);
if (!mdata) {
return -1;
}
return 0;
res = ast_sip_push_task_wait_serializer(message_serializer, msg_send, mdata);
ao2_ref(mdata, -1);
return res;
}
static const struct ast_msg_tech msg_tech = {