From e34c67d3080e154c5ee1f4881e6758f140c4bd41 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 11 Apr 2007 14:13:08 +0000
Subject: [PATCH] Merged revisions 61377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r61377 | russell | 2007-04-11 09:04:44 -0500 (Wed, 11 Apr 2007) | 13 lines
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/trunk@61379 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 b37338890a..5e3898f014 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16854,8 +16854,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);
@@ -17260,8 +17259,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)) {
@@ -17274,8 +17272,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");
--
GitLab