[asterisk-commits] rmudgett: trunk r313367 - in /trunk: ./ main/cli.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Apr 11 17:28:43 2011
New Revision: 313367

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=313367
Log:
Merged revisions 313366 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r313366 | rmudgett | 2011-04-11 17:27:25 -0500 (Mon, 11 Apr 2011) | 2 lines
  
  Added "Connected Line ID" and "Connected Line ID Name" to "core show channel" output.
........

Modified:
    trunk/   (props changed)
    trunk/main/cli.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cli.c?view=diff&rev=313367&r1=313366&r2=313367
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Mon Apr 11 17:28:43 2011
@@ -1438,6 +1438,8 @@
 		"       LinkedID: %s\n"
 		"      Caller ID: %s\n"
 		" Caller ID Name: %s\n"
+		"Connected Line ID: %s\n"
+		"Connected Line ID Name: %s\n"
 		"    DNID Digits: %s\n"
 		"       Language: %s\n"
 		"          State: %s (%d)\n"
@@ -1466,6 +1468,8 @@
 		c->name, c->tech->type, c->uniqueid, c->linkedid,
 		S_COR(c->caller.id.number.valid, c->caller.id.number.str, "(N/A)"),
 		S_COR(c->caller.id.name.valid, c->caller.id.name.str, "(N/A)"),
+		S_COR(c->connected.id.number.valid, c->connected.id.number.str, "(N/A)"),
+		S_COR(c->connected.id.name.valid, c->connected.id.name.str, "(N/A)"),
 		S_OR(c->dialed.number.str, "(N/A)"),
 		c->language,	
 		ast_state2str(c->_state), c->_state, c->rings,