kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ActionID to CoreShowChannel event.

Browse Source 
There is inconsistency in how we handle manager responses that are lists of
items and, unfortunately, third parties have come to rely on ActionID being on
every event within those lists instead of just keeping track of the ActionID for
the current response.  This change makes CoreShowChannels include the ActionID
with each CoreShowChannel event generated as a result of it being called.

(closes issue #15001)
Reported by: sum
Patches:
      patchactionid2.patch uploaded by sum (license 766)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@196945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-05-26 22:38:05 +00:00
parent bbd9f040e1
commit 68d44ce5ff
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/manager.c
View File

@@ -3408,16 +3408,16 @@ static int action_reload(struct mansession *s, const struct message *m)
static int action_coreshowchannels(struct mansession *s, const struct message *m)
{
const char *actionid = astman_get_header(m, "ActionID");
char actionidtext[256];
char idText[256];
struct ast_channel *c = NULL;
int numchans = 0;
int duration, durh, durm, durs;
struct ast_channel_iterator *iter;
if (!ast_strlen_zero(actionid)) {
snprintf(actionidtext, sizeof(actionidtext), "ActionID: %s\r\n", actionid);
snprintf(idText, sizeof(idText), "ActionID: %s\r\n", actionid);
} else {
actionidtext[0] = '\0';
idText[0] = '\0';
}
if (!(iter = ast_channel_iterator_all_new(0))) {
@@ -3444,6 +3444,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
astman_append(s,
"Event: CoreShowChannel\r\n"
"%s"
"Channel: %s\r\n"
"UniqueID: %s\r\n"
"Context: %s\r\n"
@@ -3458,8 +3459,8 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
"AccountCode: %s\r\n"
"BridgedChannel: %s\r\n"
"BridgedUniqueID: %s\r\n"
"\r\n", c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state, ast_state2str(c->_state),
c->appl ? c->appl : "", c->data ? S_OR(c->data, ""): "",
"\r\n", idText, c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state,
ast_state2str(c->_state), c->appl ? c->appl : "", c->data ? S_OR(c->data, "") : "",
S_OR(c->cid.cid_num, ""), durbuf, S_OR(c->accountcode, ""), bc ? bc->name : "", bc ? bc->uniqueid : "");
ast_channel_unlock(c);
@@ -3472,7 +3473,7 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m
"EventList: Complete\r\n"
"ListItems: %d\r\n"
"%s"
"\r\n", numchans, actionidtext);
"\r\n", numchans, idText);
ast_channel_iterator_destroy(iter);