diff options
author | Joshua Colp <jcolp@digium.com> | 2017-01-23 11:10:10 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-01-23 11:10:10 -0600 |
commit | 4fc146e28711c3441ee7959022091957692f7f49 (patch) | |
tree | dbcfdbb0e3046527671a1f99e6078aee7a936009 /res/res_pjsip_pubsub.c | |
parent | fb21931a5295140e28878d8a83b0baa18424771b (diff) | |
parent | 3890337e7a14bb04bcd2d60b2112de588ec93828 (diff) |
Merge "res_pjsip_pubsub.c: Fix AMI event list counts." into 13
Diffstat (limited to 'res/res_pjsip_pubsub.c')
-rw-r--r-- | res/res_pjsip_pubsub.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index d99fb4057..448fa571d 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -3660,6 +3660,8 @@ static int ami_subscription_detail(struct sip_subscription_tree *sub_tree, sip_subscription_to_ami(sub_tree, &buf); astman_append(ami->s, "%s\r\n", ast_str_buffer(buf)); ast_free(buf); + + ++ami->count; return 0; } @@ -3678,14 +3680,13 @@ static int ami_subscription_detail_outbound(struct sip_subscription_tree *sub_tr static int ami_show_subscriptions_inbound(struct mansession *s, const struct message *m) { struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), }; - int num; - astman_send_listack(s, m, "Following are Events for " - "each inbound Subscription", "start"); + astman_send_listack(s, m, "Following are Events for each inbound Subscription", + "start"); - num = for_each_subscription(ami_subscription_detail_inbound, &ami); + for_each_subscription(ami_subscription_detail_inbound, &ami); - astman_send_list_complete_start(s, m, "InboundSubscriptionDetailComplete", num); + astman_send_list_complete_start(s, m, "InboundSubscriptionDetailComplete", ami.count); astman_send_list_complete_end(s); return 0; } @@ -3693,14 +3694,13 @@ static int ami_show_subscriptions_inbound(struct mansession *s, const struct mes static int ami_show_subscriptions_outbound(struct mansession *s, const struct message *m) { struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), }; - int num; - astman_send_listack(s, m, "Following are Events for " - "each outbound Subscription", "start"); + astman_send_listack(s, m, "Following are Events for each outbound Subscription", + "start"); - num = for_each_subscription(ami_subscription_detail_outbound, &ami); + for_each_subscription(ami_subscription_detail_outbound, &ami); - astman_send_list_complete_start(s, m, "OutboundSubscriptionDetailComplete", num); + astman_send_list_complete_start(s, m, "OutboundSubscriptionDetailComplete", ami.count); astman_send_list_complete_end(s); return 0; } @@ -3721,31 +3721,31 @@ static int format_ami_resource_lists(void *obj, void *arg, int flags) return CMP_STOP; } astman_append(ami->s, "%s\r\n", ast_str_buffer(buf)); - ast_free(buf); + + ++ami->count; return 0; } static int ami_show_resource_lists(struct mansession *s, const struct message *m) { struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), }; - int num; struct ao2_container *lists; lists = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "resource_list", AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL); - if (!lists || !(num = ao2_container_count(lists))) { + if (!lists || !ao2_container_count(lists)) { astman_send_error(s, m, "No resource lists found\n"); return 0; } - astman_send_listack(s, m, "A listing of resource lists follows, " - "presented as ResourceListDetail events", "start"); + astman_send_listack(s, m, "A listing of resource lists follows, presented as ResourceListDetail events", + "start"); ao2_callback(lists, OBJ_NODATA, format_ami_resource_lists, &ami); - astman_send_list_complete_start(s, m, "ResourceListDetailComplete", num); + astman_send_list_complete_start(s, m, "ResourceListDetailComplete", ami.count); astman_send_list_complete_end(s); return 0; } |