From c14c078405bf141d3b189efe77f08b4d7363978e Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Sun, 20 Nov 2005 23:33:03 +0000 Subject: [PATCH] issue #5792 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7150 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- ChangeLog | 3 +++ UPGRADE.txt | 6 ++++-- channels/chan_iax2.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcda32fa17..d70b7fe1ee 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-11-20 Russell Bryant + * 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 " 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 9c67ec02be..b17b16ddec 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 34d822a03e..7108929983 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);