summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2017-10-19 08:14:22 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2017-10-19 08:14:22 -0500
commit6bb92a716482102c1983a3990db5e288771ecfd3 (patch)
tree9953fe231db77f794fcc6ea40ff506173f10736b
parenteb59d807828c34d7842e779a8dc7c7ab0da733e0 (diff)
parentc9e19b31f53a3f1641ace9462a016e26f200b1d1 (diff)
Merge "chan_sip: Fix output of 'sip set debug off'."
-rw-r--r--channels/chan_sip.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 62ff505fc..6d8514199 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22710,7 +22710,12 @@ static char *sip_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args
} else if (!strcasecmp(what, "off")) {
sipdebug &= ~sip_debug_console;
sipdebug_text = 0;
- ast_cli(a->fd, "SIP Debugging Disabled\n");
+ if (sipdebug == sip_debug_none) {
+ ast_cli(a->fd, "SIP Debugging Disabled\n");
+ } else {
+ ast_cli(a->fd, "SIP Debugging still enabled due to configuration.\n");
+ ast_cli(a->fd, "Set sipdebug=no in sip.conf and reload to actually disable.\n");
+ }
return CLI_SUCCESS;
}
} else if (a->argc == e->args + 1) { /* ip/peer */