<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7747">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Sean Bright: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">manager.c: Update AMI Status event documentation<br><br>The AMI Status event had linkedid listed twice and was missing the<br>effective connected line name and number headers.<br><br>NOTE: The linkedid and other standard channel snapshot fields in the XML<br>documentation are part of the <channel_snapshot/> XML template defined in<br>doc/appdocsxml.xslt.<br><br>* Cached the effective connected line party id so it doesn't get<br>calculated four times.<br><br>Change-Id: I004c4c4f9e7b40ef55035c831702721bec82496c<br>---<br>M main/manager.c<br>1 file changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/main/manager.c b/main/manager.c<br>index 890a975..4e611a0 100644<br>--- a/main/manager.c<br>+++ b/main/manager.c<br>@@ -247,13 +247,15 @@<br> <parameter name="DNID"><br> <para>Dialed number identifier</para><br> </parameter><br>+ <parameter name="EffectiveConnectedLineNum"><br>+ </parameter><br>+ <parameter name="EffectiveConnectedLineName"><br>+ </parameter><br> <parameter name="TimeToHangup"><br> <para>Absolute lifetime of the channel</para><br> </parameter><br> <parameter name="BridgeID"><br> <para>Identifier of the bridge the channel is in, may be empty if not in one</para><br>- </parameter><br>- <parameter name="Linkedid"><br> </parameter><br> <parameter name="Application"><br> <para>Application currently executing on the channel</para><br>@@ -4583,6 +4585,7 @@<br> struct timeval now;<br> long elapsed_seconds;<br> struct ast_bridge *bridge;<br>+ struct ast_party_id effective_id;<br> <br> ast_channel_lock(chan);<br> <br>@@ -4611,10 +4614,12 @@<br> channels++;<br> <br> bridge = ast_channel_get_bridge(chan);<br>+ effective_id = ast_channel_connected_effective_id(chan);<br> <br> astman_append(s,<br> "Event: Status\r\n"<br> "Privilege: Call\r\n"<br>+ /* v-- Start channel snapshot headers */<br> "Channel: %s\r\n"<br> "ChannelState: %u\r\n"<br> "ChannelStateDesc: %s\r\n"<br>@@ -4627,13 +4632,14 @@<br> "Exten: %s\r\n"<br> "Priority: %d\r\n"<br> "Uniqueid: %s\r\n"<br>+ "Linkedid: %s\r\n"<br>+ /* ^-- End channel snapshot headers */<br> "Type: %s\r\n"<br> "DNID: %s\r\n"<br> "EffectiveConnectedLineNum: %s\r\n"<br> "EffectiveConnectedLineName: %s\r\n"<br> "TimeToHangup: %ld\r\n"<br> "BridgeID: %s\r\n"<br>- "Linkedid: %s\r\n"<br> "Application: %s\r\n"<br> "Data: %s\r\n"<br> "Nativeformats: %s\r\n"<br>@@ -4647,6 +4653,7 @@<br> "%s"<br> "%s"<br> "\r\n",<br>+ /* v-- Start channel snapshot headers */<br> ast_channel_name(chan),<br> ast_channel_state(chan),<br> ast_state2str(ast_channel_state(chan)),<br>@@ -4659,13 +4666,14 @@<br> ast_channel_exten(chan),<br> ast_channel_priority(chan),<br> ast_channel_uniqueid(chan),<br>+ ast_channel_linkedid(chan),<br>+ /* ^-- End channel snapshot headers */<br> ast_channel_tech(chan)->type,<br> S_OR(ast_channel_dialed(chan)->number.str, ""),<br>- S_COR(ast_channel_connected_effective_id(chan).number.valid, ast_channel_connected_effective_id(chan).number.str, "<unknown>"),<br>- S_COR(ast_channel_connected_effective_id(chan).name.valid, ast_channel_connected_effective_id(chan).name.str, "<unknown>"),<br>+ S_COR(effective_id.number.valid, effective_id.number.str, "<unknown>"),<br>+ S_COR(effective_id.name.valid, effective_id.name.str, "<unknown>"),<br> (long)ast_channel_whentohangup(chan)->tv_sec,<br> bridge ? bridge->uniqueid : "",<br>- ast_channel_linkedid(chan),<br> ast_channel_appl(chan),<br> ast_channel_data(chan),<br> ast_format_cap_get_names(ast_channel_nativeformats(chan), &codec_buf),<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7747">change 7747</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7747"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I004c4c4f9e7b40ef55035c831702721bec82496c </div>
<div style="display:none"> Gerrit-Change-Number: 7747 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>