issue #5792

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

diff --git a/ChangeLog b/ChangeLog
index a2bc7152c3af5ca801e7fd1f745c239386c8bbeb..4e98e55bb42e94ca201ff240d51509677bf8165c 100755 (executable)
--- a/ChangeLog
+++ b/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>

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 9c67ec02beefd967dcb88c8a48effa0657989df5..b17b16ddec2674c390e6ea1833a977f5f7ba4e34 100755 (executable)
--- 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 34d822a03ec69dda55c8a3a693337124cd0921f5..c02b19d63108c40e77086dc67f0120a0f329b8a3 100755 (executable)
--- 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);