[asterisk-commits] branch oej/test-this-branch r16269 - in /team/oej/test-this-branch: ./ config...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 29 15:08:37 2006
New Revision: 16269

URL: http://svn.digium.com/view/asterisk?rev=16269&view=rev
Log:
Resolve conflict, reset automerge

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/configs/oss.conf.sample
    team/oej/test-this-branch/pbx/pbx_config.c

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 29 15:08:37 2006
@@ -1,1 +1,1 @@
-/trunk:1-16227
+/trunk:1-16267

Modified: team/oej/test-this-branch/configs/oss.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/configs/oss.conf.sample?rev=16269&r1=16268&r2=16269&view=diff
==============================================================================
--- team/oej/test-this-branch/configs/oss.conf.sample (original)
+++ team/oej/test-this-branch/configs/oss.conf.sample Wed Mar 29 15:08:37 2006
@@ -1,6 +1,6 @@
-#
-# Automatically generated from ../channels/chan_oss.c
-#
+;
+; Automatically generated from ../channels/chan_oss.c
+;
 
 [general]
     ; General config options, with default values shown.

Modified: team/oej/test-this-branch/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/pbx/pbx_config.c?rev=16269&r1=16268&r2=16269&view=diff
==============================================================================
--- team/oej/test-this-branch/pbx/pbx_config.c (original)
+++ team/oej/test-this-branch/pbx/pbx_config.c Wed Mar 29 15:08:37 2006
@@ -1529,6 +1529,31 @@
 						data = "";
 					if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar))
 						ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s'\n", v->value, cxt);
+				} else if(!strcasecmp(v->name, "include")) {
+					memset(realvalue, 0, sizeof(realvalue));
+					pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
+					if (ast_context_add_include2(con, realvalue, registrar))
+						ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s'\n", v->value, cxt);
+				} else if(!strcasecmp(v->name, "ignorepat")) {
+					memset(realvalue, 0, sizeof(realvalue));
+					pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
+					if (ast_context_add_ignorepat2(con, realvalue, registrar))
+						ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt);
+				} else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) {
+					char *stringp= realvalue;
+					char *appl, *data;
+
+					memset(realvalue, 0, sizeof(realvalue));
+					if (!strcasecmp(v->name, "switch"))
+						pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
+					else
+						ast_copy_string(realvalue, v->value, sizeof(realvalue));
+					appl = strsep(&stringp, "/");
+					data = strsep(&stringp, ""); /* XXX what for ? */
+					if (!data)
+						data = "";
+					if (ast_context_add_switch2(con, appl, data, !strcasecmp(v->name, "eswitch"), registrar))
+						ast_log(LOG_WARNING, "Unable to include switch '%s' in context '%s'\n", v->value, cxt);
 				}
 			}
 		}