aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xChangeLog4
-rwxr-xr-xUPGRADE.txt6
-rwxr-xr-xchannels/chan_iax2.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a2bc7152c..4e98e55bb 100755
--- 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 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..c02b19d63 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);