kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 61376 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-04-11 14:04:44 +00:00
parent 4e2ab7de64
commit 9ce476a89c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -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");