From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 2 Nov 2010 23:07:13 +0000 (+0000)
Subject: Merged revisions 293722 via svnmerge from
X-Git-Tag: 1.6.2.15-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c28ab1dc087283c9ea45f143f21e6cf146052b;p=thirdparty%2Fasterisk.git

Merged revisions 293722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r293722 | jpeeler | 2010-11-02 18:02:51 -0500 (Tue, 02 Nov 2010) | 8 lines

  Add enabled/disabled information for rtautoclear sip show settings output.

  When setting to zero/"no", the numeric default was shown making it not obvious
  the disabled setting was respected.

  (closes issue #18123)
  Reported by: zerohalo
........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8ffc323dfc..519236fa8e 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16307,7 +16307,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
 		ast_cli(a->fd, "  Update:                 %s\n", cli_yesno(sip_cfg.peer_rtupdate));
 		ast_cli(a->fd, "  Ignore Reg. Expire:     %s\n", cli_yesno(sip_cfg.ignore_regexpire));
 		ast_cli(a->fd, "  Save sys. name:         %s\n", cli_yesno(sip_cfg.rtsave_sysname));
-		ast_cli(a->fd, "  Auto Clear:             %d\n", sip_cfg.rtautoclear);
+		ast_cli(a->fd, "  Auto Clear:             %d (%s)\n", sip_cfg.rtautoclear, ast_test_flag(&global_flags[1], SIP_PAGE2_RTAUTOCLEAR) ? "Enabled" : "Disabled");
 	}
 	ast_cli(a->fd, "\n----\n");
 	return CLI_SUCCESS;