diff options
Diffstat (limited to 'channels/chan_pjsip.c')
| -rw-r--r-- | channels/chan_pjsip.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index a560d7706..0fbfd9ea5 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -1429,8 +1429,6 @@ static void clear_session_and_channel(struct ast_sip_session *session, struct as static int hangup(void *data) { - pj_status_t status; - pjsip_tx_data *packet = NULL; struct hangup_data *h_data = data; struct ast_channel *ast = h_data->chan; struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(ast); @@ -1438,12 +1436,19 @@ static int hangup(void *data) struct ast_sip_session *session = channel->session; int cause = h_data->cause; - if (!session->defer_terminate && - ((status = pjsip_inv_end_session(session->inv_session, cause ? cause : 603, NULL, &packet)) == PJ_SUCCESS) && packet) { - if (packet->msg->type == PJSIP_RESPONSE_MSG) { - ast_sip_session_send_response(session, packet); - } else { - ast_sip_session_send_request(session, packet); + if (!session->defer_terminate) { + pj_status_t status; + pjsip_tx_data *packet = NULL; + + if (session->inv_session->state == PJSIP_INV_STATE_NULL) { + pjsip_inv_terminate(session->inv_session, cause ? cause : 603, PJ_TRUE); + } else if (((status = pjsip_inv_end_session(session->inv_session, cause ? cause : 603, NULL, &packet)) == PJ_SUCCESS) + && packet) { + if (packet->msg->type == PJSIP_RESPONSE_MSG) { + ast_sip_session_send_response(session, packet); + } else { + ast_sip_session_send_request(session, packet); + } } } |