diff options
author | Richard Mudgett <rmudgett@digium.com> | 2015-01-12 18:09:27 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2015-01-12 18:09:27 +0000 |
commit | c7ea108e02a03728f4c0eef4506678b81a22159c (patch) | |
tree | c024d0473b792401fb6be54046d1ae6049e908d8 /res | |
parent | 9065488ddd308ef4a3b46ad2da0a993e2e18c370 (diff) |
Revert -r430452 It needs to be redone for the next major AMI version change instead.
ASTERISK-24049
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@430509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/parking/parking_manager.c | 6 | ||||
-rw-r--r-- | res/res_fax.c | 2 | ||||
-rw-r--r-- | res/res_manager_devicestate.c | 2 | ||||
-rw-r--r-- | res/res_manager_presencestate.c | 2 | ||||
-rw-r--r-- | res/res_mwi_external_ami.c | 2 | ||||
-rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 6 | ||||
-rw-r--r-- | res/res_pjsip_outbound_registration.c | 3 | ||||
-rw-r--r-- | res/res_pjsip_pubsub.c | 9 | ||||
-rw-r--r-- | res/res_pjsip_registrar.c | 3 |
9 files changed, 21 insertions, 14 deletions
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c index 0e8f50dea..74b455928 100644 --- a/res/parking/parking_manager.c +++ b/res/parking/parking_manager.c @@ -255,7 +255,7 @@ static void manager_parking_status_single_lot(struct mansession *s, const struct return; } - astman_send_listack(s, m, "Parked calls will follow"); + astman_send_listack(s, m, "Parked calls will follow", "start"); iter_users = ao2_iterator_init(curlot->parked_users, 0); while ((curuser = ao2_iterator_next(&iter_users))) { @@ -308,7 +308,7 @@ static void manager_parking_status_all_lots(struct mansession *s, const struct m return; } - astman_send_listack(s, m, "Parked calls will follow"); + astman_send_listack(s, m, "Parked calls will follow", "start"); iter_lots = ao2_iterator_init(lot_container, 0); while ((curlot = ao2_iterator_next(&iter_lots))) { @@ -422,7 +422,7 @@ static int manager_parking_lot_list(struct mansession *s, const struct message * return 0; } - astman_send_listack(s, m, "Parking lots will follow"); + astman_send_listack(s, m, "Parking lots will follow", "start"); list_data.id_text = id_text; list_data.count = 0; diff --git a/res/res_fax.c b/res/res_fax.c index d20bce615..5f2798ab4 100644 --- a/res/res_fax.c +++ b/res/res_fax.c @@ -4200,7 +4200,7 @@ static int manager_fax_sessions(struct mansession *s, const struct message *m) snprintf(id_text, sizeof(id_text), "ActionID: %s\r\n", action_id); } - astman_send_listack(s, m, "FAXSessionsEntry event list will follow"); + astman_send_listack(s, m, "FAXSessionsEntry event list will follow", "Start"); iter = ao2_iterator_init(faxregistry.container, 0); while ((session = ao2_iterator_next(&iter))) { diff --git a/res/res_manager_devicestate.c b/res/res_manager_devicestate.c index bc2e4f23d..3d1f1ab10 100644 --- a/res/res_manager_devicestate.c +++ b/res/res_manager_devicestate.c @@ -85,7 +85,7 @@ static int action_devicestatelist(struct mansession *s, const struct message *m) return 0; } - astman_send_listack(s, m, "Device State Changes will follow"); + astman_send_listack(s, m, "Device State Changes will follow", "start"); it_states = ao2_iterator_init(device_states, 0); for (; (msg = ao2_iterator_next(&it_states)); ao2_ref(msg, -1)) { diff --git a/res/res_manager_presencestate.c b/res/res_manager_presencestate.c index 1b5c540a3..bb9e63ab9 100644 --- a/res/res_manager_presencestate.c +++ b/res/res_manager_presencestate.c @@ -85,7 +85,7 @@ static int action_presencestatelist(struct mansession *s, const struct message * return 0; } - astman_send_listack(s, m, "Presence State Changes will follow"); + astman_send_listack(s, m, "Presence State Changes will follow", "start"); it_states = ao2_iterator_init(presence_states, 0); for (; (msg = ao2_iterator_next(&it_states)); ao2_ref(msg, -1)) { diff --git a/res/res_mwi_external_ami.c b/res/res_mwi_external_ami.c index 2efefa60e..87ce411e6 100644 --- a/res/res_mwi_external_ami.c +++ b/res/res_mwi_external_ami.c @@ -197,7 +197,7 @@ static int mwi_mailbox_get(struct mansession *s, const struct message *m) return 0; } - astman_send_listack(s, m, "Mailboxes will follow"); + astman_send_listack(s, m, "Mailboxes will follow", "start"); id = astman_get_header(m, "ActionID"); if (!ast_strlen_zero(id)) { diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index fb554fd89..7dad58c15 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -1162,7 +1162,8 @@ static int ami_show_endpoint(struct mansession *s, const struct message *m) return -1; } - astman_send_listack(s, m, "Following are Events for each object associated with the the Endpoint"); + astman_send_listack(s, m, "Following are Events for each object associated with the the Endpoint", + "start"); /* the endpoint detail needs to always come first so apply as such */ if (format_ami_endpoint(endpoint, &ami) || @@ -1245,7 +1246,8 @@ static int ami_show_endpoints(struct mansession *s, const struct message *m) return 0; } - astman_send_listack(s, m, "A listing of Endpoints follows, presented as EndpointList events"); + astman_send_listack(s, m, "A listing of Endpoints follows, presented as EndpointList events", + "start"); ao2_callback(endpoints, OBJ_NODATA, format_ami_endpoints, &ami); diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c index fe9f0b588..3a01a9426 100644 --- a/res/res_pjsip_outbound_registration.c +++ b/res/res_pjsip_outbound_registration.c @@ -1420,7 +1420,8 @@ static int ami_show_outbound_registrations(struct mansession *s, return -1; } - astman_send_listack(s, m, "Following are Events for each Outbound registration"); + astman_send_listack(s, m, "Following are Events for each Outbound registration", + "start"); ao2_callback(regs, OBJ_NODATA, ami_outbound_registration_detail, &ami_outbound); diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 1b2f39dd1..3f3fb9b9c 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -3262,7 +3262,8 @@ static int ami_show_subscriptions_inbound(struct mansession *s, const struct mes 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"); + astman_send_listack(s, m, "Following are Events for each inbound Subscription", + "start"); num = for_each_subscription(ami_subscription_detail_inbound, &ami); @@ -3276,7 +3277,8 @@ static int ami_show_subscriptions_outbound(struct mansession *s, const struct me 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"); + astman_send_listack(s, m, "Following are Events for each outbound Subscription", + "start"); num = for_each_subscription(ami_subscription_detail_outbound, &ami); @@ -3320,7 +3322,8 @@ static int ami_show_resource_lists(struct mansession *s, const struct message *m return 0; } - astman_send_listack(s, m, "A listing of resource lists follows, presented as ResourceListDetail events"); + 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); diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c index f0d1f500d..daeeec9b8 100644 --- a/res/res_pjsip_registrar.c +++ b/res/res_pjsip_registrar.c @@ -767,7 +767,8 @@ static int ami_show_registrations(struct mansession *s, const struct message *m) int count = 0; struct ast_sip_ami ami = { .s = s, .m = m, .arg = &count, .action_id = astman_get_header(m, "ActionID"), }; - astman_send_listack(s, m, "Following are Events for each Inbound registration"); + astman_send_listack(s, m, "Following are Events for each Inbound registration", + "start"); ami_registrations_endpoints(&ami); |