diff options
| author | Mark Michelson <mmichelson@digium.com> | 2015-04-07 15:33:33 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2015-04-07 15:33:33 +0000 |
| commit | c516981dc7706979ae3e5d2a44927e005ec4d9f4 (patch) | |
| tree | 0371d79a79e8d1b18f5bb097a848f768c4c676e4 /res/res_pjsip_messaging.c | |
| parent | ab803ec3422e5377b5aa4769fbcc6b315d167d8b (diff) | |
Do not queue message requests that we do not respond to.
If we receive a MESSAGE request that we cannot send a response
to, we should not send the incoming MESSAGE to the dialplan.
This commit should help the bouncing message_retrans test to
pass consistently.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@434218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_messaging.c')
| -rw-r--r-- | res/res_pjsip_messaging.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c index daa043c73..dab70ca96 100644 --- a/res/res_pjsip_messaging.c +++ b/res/res_pjsip_messaging.c @@ -673,9 +673,16 @@ static pj_bool_t module_on_rx_request(pjsip_rx_data *rdata) return PJ_TRUE; } - /* send it to the messaging core */ - ast_msg_queue(msg); - send_response(rdata, PJSIP_SC_ACCEPTED, NULL, NULL); + /* Send it to the messaging core. + * + * If we are unable to send a response, the most likely reason is that we + * are handling a retransmission of an incoming MESSAGE and were unable to + * create a transaction due to a duplicate key. If we are unable to send + * a response, we should not queue the message to the dialplan + */ + if (!send_response(rdata, PJSIP_SC_ACCEPTED, NULL, NULL)) { + ast_msg_queue(msg); + } return PJ_TRUE; } |