diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-04-03 18:57:52 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-04-03 18:57:52 +0000 |
| commit | 3f14c8b6fcf52489fa6d172e66962a2dc170fbb1 (patch) | |
| tree | e6a267a157a0b7df4d8b3cf769572db8a3974712 | |
| parent | b908f9717aec69711a8bb937c2b434acbada04c3 (diff) | |
Merged revisions 59936 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r59936 | russell | 2007-04-03 13:55:57 -0500 (Tue, 03 Apr 2007) | 11 lines
Merged revisions 59916 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r59916 | russell | 2007-04-03 13:43:54 -0500 (Tue, 03 Apr 2007) | 3 lines
Make chan_sip report when it encounters an unknown option.
(issue #9440, reported by nightcrawler)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7c1167204..69b12cff8 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16557,7 +16557,8 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, int user->maxcallbitrate = atoi(v->value); if (user->maxcallbitrate < 0) user->maxcallbitrate = default_maxcallbitrate; - } + } 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); } ast_copy_flags(&user->flags[0], &userflags[0], mask[0].flags); ast_copy_flags(&user->flags[1], &userflags[1], mask[1].flags); @@ -16865,7 +16866,8 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str peer->maxcallbitrate = atoi(v->value); if (peer->maxcallbitrate < 0) peer->maxcallbitrate = default_maxcallbitrate; - } + } 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); } if (!ast_test_flag(&global_flags[1], SIP_PAGE2_IGNOREREGEXPIRE) && ast_test_flag(&peer->flags[1], SIP_PAGE2_DYNAMIC) && realtime) { time_t nowtime = time(NULL); @@ -17270,7 +17272,8 @@ static int reload_config(enum channelreloadreason reason) default_maxcallbitrate = DEFAULT_MAX_CALL_BITRATE; } else if (!strcasecmp(v->name, "matchexterniplocally")) { global_matchexterniplocally = ast_true(v->value); - } + } else + ast_log(LOG_WARNING, "Ignoring unknown option '%s' at line %d of sip.conf!\n", v->name, v->lineno); } if (!allow_external_domains && AST_LIST_EMPTY(&domain_list)) { @@ -17283,6 +17286,8 @@ static int reload_config(enum channelreloadreason reason) /* 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); } ucfg = ast_config_load("users.conf"); |