From: Jeff Peeler Date: Tue, 2 Nov 2010 23:10:07 +0000 (+0000) Subject: Merged revisions 293724 via svnmerge from X-Git-Tag: 11.0.0-beta1~2149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9528e27b8c8cfc9d17a221afe6bd2a914a686754;p=thirdparty%2Fasterisk.git Merged revisions 293724 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r293724 | jpeeler | 2010-11-02 18:09:06 -0500 (Tue, 02 Nov 2010) | 22 lines Merged revisions 293723 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r293723 | jpeeler | 2010-11-02 18:07:13 -0500 (Tue, 02 Nov 2010) | 15 lines 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/trunk@293725 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a53fe4a1d3..a238fd5e69 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17108,7 +17108,7 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_ ast_cli(a->fd, " Update: %s\n", AST_CLI_YESNO(sip_cfg.peer_rtupdate)); ast_cli(a->fd, " Ignore Reg. Expire: %s\n", AST_CLI_YESNO(sip_cfg.ignore_regexpire)); ast_cli(a->fd, " Save sys. name: %s\n", AST_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;