From 9ce476a89c45a3b8de28d360cb36049d40a65e80 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 11 Apr 2007 14:04:44 +0000 Subject: [PATCH] Merged revisions 61376 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r61376 | russell | 2007-04-11 09:02:54 -0500 (Wed, 11 Apr 2007) | 5 lines Remove the attempt at reporting configuration errors in sip.conf. This can cause a bunch of improper messages when using realtime. I give up. As oej tried to convince me when I put this in, there is just no easy way to do it. (inspired by a message on the -dev list) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61377 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index dcee22a50f..9921e30bd1 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -16137,8 +16137,7 @@ 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); @@ -16522,8 +16521,7 @@ 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)) { @@ -16536,8 +16534,6 @@ 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");