From a19d3524382185f85386b0cf44039f5a5e811a37 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 3 Apr 2007 18:43:54 +0000 Subject: [PATCH] Make chan_sip report when it encounters an unknown option. (issue #9440, reported by nightcrawler) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@59916 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c79e7ab65d..2f5c9cb119 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -12343,10 +12343,8 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int user->callingpres = ast_parse_caller_presentation(v->value); if (user->callingpres == -1) user->callingpres = atoi(v->value); - } - /*else if (strcasecmp(v->name,"type")) - * ast_log(LOG_WARNING, "Ignoring %s\n", v->name); - */ + } else if (strcasecmp(v->name, "type")) + ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); v = v->next; } ast_copy_flags(user, &userflags, mask.flags); @@ -12629,11 +12627,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int ast_log(LOG_WARNING, "Qualification of peer '%s' should be 'yes', 'no', or a number of milliseconds at line %d of sip.conf\n", peer->name, v->lineno); peer->maxms = 0; } - } - /* else if (strcasecmp(v->name,"type")) - * ast_log(LOG_WARNING, "Ignoring %s\n", v->name); - */ - v=v->next; + } else if (strcasecmp(v->name, "type")) + ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); + v = v->next; } if (!ast_test_flag((&global_flags_page2), SIP_PAGE2_IGNOREREGEXPIRE) && ast_test_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC) && realtime) { time_t nowtime; @@ -12928,10 +12924,8 @@ static int reload_config(void) } } else if (!strcasecmp(v->name, "callevents")) { callevents = ast_true(v->value); - } - /* else if (strcasecmp(v->name,"type")) - * ast_log(LOG_WARNING, "Ignoring %s\n", v->name); - */ + } else + ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); v = v->next; } @@ -12946,7 +12940,8 @@ static int reload_config(void) /* Format for authentication is auth = username:password@realm */ if (!strcasecmp(v->name, "auth")) { authl = add_realm_authentication(authl, v->value, v->lineno); - } + } else + ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); v = v->next; } -- 2.47.2