issue #5792

git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-2@7150 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bcda32fa1..d70b7fe1e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-11-20  Russell Bryant  <russell@digium.com>
 
+	* UPGRADE.txt: Add a note on a second way that the IAX2 channel naming convention has changed. (issue #5792)
+	* channels/chan_iax2.c: Fix alignment of the output for the "iax2 show peer <peer>" CLI command (issue #5792)
+
 	* channels/Makefile: Re-add chan_oss to the default build. (issue #5799)
 
 	* res/res_musiconhold.c: Fix incorrect argument for the buffer size to an ast_copy_string call (issue #5803)
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 9c67ec02b..b17b16dde 100755
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -52,8 +52,10 @@ Dialing:
 
 IAX: 
 
-* The naming convention for IAX channels has changed in a minor way such 
-  that the call number follows a "-" rather than a "/" character.
+* The naming convention for IAX channels has changed in two ways: 
+   1. The call number follows a "-" rather than a "/" character.
+   2. The name of the channel has been simplified to IAX2/peer-callno,
+   rather than IAX2/peer@peer-callno or even IAX2/peer@peer/callno.
 
 SIP:
 
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 34d822a03..710892998 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1954,8 +1954,8 @@ static int iax2_show_peer(int fd, int argc, char *argv[])
 
 		ast_cli(fd, "  Status       : ");
 		peer_status(peer, status, sizeof(status));	
-		ast_cli(fd, " Qualify        : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
 		ast_cli(fd, "%s\n",status);
+		ast_cli(fd, " Qualify        : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
 		ast_cli(fd,"\n");
 		if (ast_test_flag(peer, IAX_TEMPONLY))
 			destroy_peer(peer);