[Freeswitch-trunk] [commit] r6173 - freeswitch/trunk/src

[Freeswitch SVN]

Author: anthm
Date: Wed Nov  7 13:28:33 2007
New Revision: 6173

Modified:
   freeswitch/trunk/src/switch_channel.c

Log:
add more nested var tricks

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Wed Nov  7 13:28:33 2007
@@ -1381,14 +1381,23 @@
 				}
 
 				if (vtype == 1) {
+					char *expanded = NULL;
+
+					if ((expanded = switch_channel_expand_variables(channel, (char *)vname)) == vname) {
+						expanded = NULL;
+					} else {
+						vname = expanded;
+					}
 					sub_val = switch_channel_get_variable(channel, vname);
+					switch_safe_free(expanded);
 				} else {
 					switch_stream_handle_t stream = { 0 };
+					char *expanded = NULL;
 
 					SWITCH_STANDARD_STREAM(stream);
 
 					if (stream.data) {
-						char *expanded = NULL;
+
 
 						if ((expanded = switch_channel_expand_variables(channel, vval)) == vval) {
 							expanded = NULL;