mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 11:32:25 +00:00
use proper file name
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@15436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
2
acl.c
2
acl.c
@@ -313,7 +313,7 @@ int ast_str2tos(const char *value, unsigned int *tos)
|
||||
else
|
||||
return -1;
|
||||
|
||||
ast_log(LOG_WARNING, "tos value %s is deprecated. See doc/iptos.txt for more information.", value);
|
||||
ast_log(LOG_WARNING, "tos value %s is deprecated. See doc/ip-tos.txt for more information.", value);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -9040,7 +9040,7 @@ static int set_config(char *config_file, int reload)
|
||||
tosval = ast_variable_retrieve(cfg, "general", "tos");
|
||||
if (tosval) {
|
||||
if (ast_str2tos(tosval, &tos))
|
||||
ast_log(LOG_WARNING, "Invalid tos value, see doc/iptos.txt for more information.\n");
|
||||
ast_log(LOG_WARNING, "Invalid tos value, see doc/ip-tos.txt for more information.\n");
|
||||
}
|
||||
while(v) {
|
||||
if (!strcasecmp(v->name, "bindport")){
|
||||
@@ -9190,7 +9190,7 @@ static int set_config(char *config_file, int reload)
|
||||
ast_context_create(NULL, regcontext, "IAX2");
|
||||
} else if (!strcasecmp(v->name, "tos")) {
|
||||
if (ast_str2tos(v->value, &tos))
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/iptos.txt for more information.'\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/ip-tos.txt for more information.'\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "accountcode")) {
|
||||
ast_copy_string(accountcode, v->value, sizeof(accountcode));
|
||||
} else if (!strcasecmp(v->name, "amaflags")) {
|
||||
|
||||
@@ -12821,18 +12821,18 @@ static int reload_config(enum channelreloadreason reason)
|
||||
global_tos_sip = temp_tos;
|
||||
global_tos_audio = temp_tos;
|
||||
global_tos_video = temp_tos;
|
||||
ast_log(LOG_WARNING, "tos value at line %d is deprecated. See doc/iptos.txt for more information.", v->lineno);
|
||||
ast_log(LOG_WARNING, "tos value at line %d is deprecated. See doc/ip-tos.txt for more information.", v->lineno);
|
||||
} else
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, See doc/iptos.txt for more information.\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, See doc/ip-tos.txt for more information.\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "tos_sip")) {
|
||||
if (ast_str2tos(v->value, &global_tos_sip))
|
||||
ast_log(LOG_WARNING, "Invalid tos_sip value at line %d, recommended value is 'cs3'. See doc/iptos.txt.\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos_sip value at line %d, recommended value is 'cs3'. See doc/ip-tos.txt.\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "tos_audio")) {
|
||||
if (ast_str2tos(v->value, &global_tos_audio))
|
||||
ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, recommended value is 'ef'. See doc/iptos.txt.\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, recommended value is 'ef'. See doc/ip-tos.txt.\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "tos_video")) {
|
||||
if (ast_str2tos(v->value, &global_tos_video))
|
||||
ast_log(LOG_WARNING, "Invalid tos_video value at line %d, recommended value is 'af41'. See doc/iptos.txt.\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos_video value at line %d, recommended value is 'af41'. See doc/ip-tos.txt.\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "bindport")) {
|
||||
if (sscanf(v->value, "%d", &ourport) == 1) {
|
||||
bindaddr.sin_port = htons(ourport);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Asterisk -- An open source telephony toolkit.
|
||||
*
|
||||
* Copyright (C) 1999 - 2005, Digium, Inc.
|
||||
* Copyright (C) 1999 - 2006, Digium, Inc.
|
||||
*
|
||||
* Mark Spencer <markster@digium.com>
|
||||
*
|
||||
@@ -330,7 +330,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
|
||||
ast_log(LOG_WARNING, "Ignoring invalid codec '%s' for '%s' at line %d\n", v->value, s, v->lineno);
|
||||
} else if (!strcasecmp(v->name, "tos")) {
|
||||
if (ast_str2tos(v->value, &cur->tos))
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/iptos.txt for more information.\n", v->lineno);
|
||||
ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/ip-tos.txt for more information.\n", v->lineno);
|
||||
} else if (!strcasecmp(v->name, "user")) {
|
||||
strncpy(cur->user, v->value, sizeof(cur->user) - 1);
|
||||
if (strcmp(cur->user, v->value))
|
||||
|
||||
Reference in New Issue
Block a user