From 4e5ea82b7eaa36cffec1024db51bfdf017c89690 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Thu, 30 Mar 2006 18:17:36 +0000 Subject: deprecate insecure=very and insecure=yes, since we have more explicit versions available now git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16548 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ff0ce2250..a5c67cfd1 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11959,6 +11959,8 @@ static struct ast_channel *sip_request_call(const char *type, int format, void * static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask, struct ast_variable *v) { int res = 0; + static int dep_insecure_very = 0; + static int dep_insecure_yes = 0; if (!strcasecmp(v->name, "trustrpid")) { ast_set_flag(&mask[0], SIP_TRUSTRPID); @@ -12008,10 +12010,20 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask } else if (!strcasecmp(v->name, "insecure")) { ast_set_flag(&mask[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE); ast_clear_flag(&flags[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE); - if (!strcasecmp(v->value, "very")) + if (!strcasecmp(v->value, "very")) { ast_set_flag(&flags[0], SIP_INSECURE_PORT | SIP_INSECURE_INVITE); - else if (ast_true(v->value)) + if (!dep_insecure_very) { + ast_log(LOG_WARNING, "insecure=very at line %d is deprecated; use insecure=port,invite instead\n", v->lineno); + dep_insecure_very = 1; + } + } + else if (ast_true(v->value)) { ast_set_flag(&flags[0], SIP_INSECURE_PORT); + if (!dep_insecure_yes) { + ast_log(LOG_WARNING, "insecure=%s at line %d is deprecated; use insecure=port instead\n", v->value, v->lineno); + dep_insecure_yes = 1; + } + } else if (!ast_false(v->value)) { char buf[64]; char *word, *next; -- cgit v1.2.3