projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
56a2baa
)
Merge "res_pjsip_pubsub: On notify fail deleted sub_tree is then referenced"
author
Joshua Colp
<jcolp@digium.com>
Fri, 17 Apr 2015 15:25:23 +0000
(10:25 -0500)
committer
Gerrit Code Review
<gerrit2@gerrit.digium.api>
Fri, 17 Apr 2015 15:25:23 +0000
(10:25 -0500)
res/res_pjsip_pubsub.c
patch
|
blob
|
history
diff --git
a/res/res_pjsip_pubsub.c
b/res/res_pjsip_pubsub.c
index
e7b4b02
..
cf649b4
100644
(file)
--- a/
res/res_pjsip_pubsub.c
+++ b/
res/res_pjsip_pubsub.c
@@
-2601,11
+2601,12
@@
static pj_bool_t pubsub_on_rx_subscribe_request(pjsip_rx_data *rdata)
sip_subscription_accept(sub_tree, rdata, resp);
if (generate_initial_notify(sub_tree->root)) {
pjsip_evsub_terminate(sub_tree->evsub, PJ_TRUE);
+ } else {
+ send_notify(sub_tree, 1);
+ ast_test_suite_event_notify("SUBSCRIPTION_ESTABLISHED",
+ "Resource: %s",
+ sub_tree->root->resource);
}
- send_notify(sub_tree, 1);
- ast_test_suite_event_notify("SUBSCRIPTION_ESTABLISHED",
- "Resource: %s",
- sub_tree->root->resource);
}
resource_tree_destroy(&tree);