clean up arg vs expanded

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11574 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 236f1669217074ba35ff20bed30190a08ba94bb0..4f1eb1376ab0d6cf438b2d4bdfd2eb2d1e5039f7 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -1,3 +1,4 @@
+
 /* 
  * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
  * Copyright (C) 2005/2006, Anthony Minessale II <anthmct@yahoo.com>
@@ -592,7 +593,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_cha
                        if (ok) {
                                switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value);
                        } else {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (contains a variable)\n");
+                               abort();
+                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname);
                        }
                }
                switch_mutex_unlock(channel->profile_mutex);

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index f2318d82dfc2157e8ca2f8ec9ff2b2cfa22008da..cf3dcc1c140601ffad8eb1c51dbf4400098a9158 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -1299,7 +1299,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
                log = switch_core_session_alloc(session, sizeof(*log));
 
                log->app = switch_core_session_strdup(session, application_interface->interface_name);
-               log->arg = switch_core_session_strdup(session, arg);
+               log->arg = switch_core_session_strdup(session, expanded);
 
                for (lp = session->app_log; lp && lp->next; lp = lp->next);
 
@@ -1311,13 +1311,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
        }
        
        switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_VARIABLE, application_interface->interface_name);
-       switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, arg);
+       switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_DATA_VARIABLE, expanded);
        switch_channel_set_variable(channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE, NULL);
        
        if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_EXECUTE) == SWITCH_STATUS_SUCCESS) {
                switch_channel_event_set_data(session->channel, event);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg);
+               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded);
                switch_event_fire(&event);
        }
 
@@ -1333,7 +1333,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
                const char *resp = switch_channel_get_variable(session->channel, SWITCH_CURRENT_APPLICATION_RESPONSE_VARIABLE);
                switch_channel_event_set_data(session->channel, event);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application", application_interface->interface_name);
-               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", arg);
+               switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Data", expanded);
                switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Application-Response", resp ? resp : "_none_");
                switch_event_fire(&event);
        }