[asterisk-commits] branch oej/subscribemwi r15441 - in /team/oej/subscribemwi: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar 27 21:58:29 2006
New Revision: 15441

URL: http://svn.digium.com/view/asterisk?rev=15441&view=rev
Log:
Update to trunk...

Modified:
    team/oej/subscribemwi/   (props changed)
    team/oej/subscribemwi/acl.c
    team/oej/subscribemwi/channels/chan_iax2.c
    team/oej/subscribemwi/channels/chan_sip.c
    team/oej/subscribemwi/channels/iax2-provision.c

Propchange: team/oej/subscribemwi/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 27 21:58:29 2006
@@ -1,1 +1,1 @@
-/trunk:1-15435
+/trunk:1-15440

Modified: team/oej/subscribemwi/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi/acl.c?rev=15441&r1=15440&r2=15441&view=diff
==============================================================================
--- team/oej/subscribemwi/acl.c (original)
+++ team/oej/subscribemwi/acl.c Mon Mar 27 21:58:29 2006
@@ -313,7 +313,7 @@
 	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;
 }

Modified: team/oej/subscribemwi/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi/channels/chan_iax2.c?rev=15441&r1=15440&r2=15441&view=diff
==============================================================================
--- team/oej/subscribemwi/channels/chan_iax2.c (original)
+++ team/oej/subscribemwi/channels/chan_iax2.c Mon Mar 27 21:58:29 2006
@@ -9040,7 +9040,7 @@
 	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 @@
 				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")) {

Modified: team/oej/subscribemwi/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi/channels/chan_sip.c?rev=15441&r1=15440&r2=15441&view=diff
==============================================================================
--- team/oej/subscribemwi/channels/chan_sip.c (original)
+++ team/oej/subscribemwi/channels/chan_sip.c Mon Mar 27 21:58:29 2006
@@ -12889,18 +12889,18 @@
 				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);

Modified: team/oej/subscribemwi/channels/iax2-provision.c
URL: http://svn.digium.com/view/asterisk/team/oej/subscribemwi/channels/iax2-provision.c?rev=15441&r1=15440&r2=15441&view=diff
==============================================================================
--- team/oej/subscribemwi/channels/iax2-provision.c (original)
+++ team/oej/subscribemwi/channels/iax2-provision.c Mon Mar 27 21:58:29 2006
@@ -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 at digium.com>
  *
@@ -330,7 +330,7 @@
 				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))