kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 16:05:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix when the subscription_terminated callback is called for subscription handlers.

Browse Source 
The previous placement would result in the resubscribe() callback called instead of
the subscription_terminated() callback being called when a subscription was ended
via a SUBSCRIBE request. This would result in confusing PJSIP and having it throw
an assertion.
........

Merged revisions 397955 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-08-29 22:26:03 +00:00
parent de7ce39187
commit 8990924953
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/res_pjsip_pubsub.c
+5 -9
View File
@@ -962,15 +962,6 @@ static void pubsub_on_evsub_state(pjsip_evsub *evsub, pjsip_event *event)
return;
}
if (event->type == PJSIP_EVENT_RX_MSG) {
sub->handler->subscription_terminated(sub, event->body.rx_msg.rdata);
}
if (event->type == PJSIP_EVENT_TSX_STATE &&
event->body.tsx_state.type == PJSIP_EVENT_RX_MSG) {
sub->handler->subscription_terminated(sub, event->body.tsx_state.src.rdata);
}
if (sub->handler->subscription_shutdown) {
sub->handler->subscription_shutdown(sub);
}
@@ -1052,6 +1043,11 @@ static void pubsub_on_rx_refresh(pjsip_evsub *evsub, pjsip_rx_data *rdata,
return;
}
if (pjsip_evsub_get_state(sub->evsub) == PJSIP_EVSUB_STATE_TERMINATED) {
sub->handler->subscription_terminated(sub, rdata);
return;
}
sub->handler->resubscribe(sub, rdata, &response_data);
if (!response_data_changed(&response_data)) {