issue #5792

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7138 65c4cc65-6c06-0410-ace0-fbb531ad65f3

ChangeLog

@@ -1,5 +1,9 @@
 2005-11-20  Josh Roberson <josh@asteriasgi.com>
 
+	* channels/chan_iax2.c: Fix output of iax2 show peer <peer> (issue #5792)
+
+	* UPGRADE.txt: Adjust note for naming conventions of iax2 channels. (issue #5792)
+
 	* res/res_musiconhold.c: Correct typo in ast_copy_string() for class->mode.  (issue #5803)
 
 2005-11-19  Josh Roberson <josh@asteriasgi.com>

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:
 

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);