add originated_legs and originate_causes to A leg when present in an originate to...

diff --git a/src/switch_event.c b/src/switch_event.c
index e371695b28294f6e5eefd679a369d30f85edc1f8..566ccc82f836ffe13460be0c3d727e6f5a3f75f1 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -1016,7 +1016,12 @@ static switch_status_t switch_event_base_add_header(switch_event_t *event, switc
                        switch_assert(hv);
                        header->value = hv;
 
-                       switch_snprintf(header->value, len, "ARRAY::");
+                       if (header->idx > 1) {
+                               switch_snprintf(header->value, len, "ARRAY::");
+                       } else {
+                               *header->value = '\0';
+                       }
+
                        for(j = 0; j < header->idx; j++) {
                                switch_snprintf(header->value + strlen(header->value), len - strlen(header->value), "%s%s", j == 0 ? "" : "|:", header->array[j]);
                        }

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 0efa8e238e6c06abf6b623d65b7accafb8f4e08d..17f1ad19e2c1c0860c50bc73b9307b2a0dd12b12 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1853,6 +1853,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
        int read_packet = 0;
        int check_reject = 1;
        switch_codec_implementation_t read_impl = { 0 };
+
+       if (session) {
+               switch_channel_set_variable(switch_core_session_get_channel(session), "originated_legs", NULL);
+               switch_channel_set_variable(switch_core_session_get_channel(session), "originate_causes", NULL);
+       }
+       
        
        if (strstr(bridgeto, SWITCH_ENT_ORIGINATE_DELIM)) {
                return switch_ivr_enterprise_originate(session, bleg, cause, bridgeto, timelimit_sec, table, cid_name_override, cid_num_override,
@@ -2741,7 +2747,18 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
                                        }
 
                                        if (session) {
+                                               switch_channel_t *channel = switch_core_session_get_channel(session);
+                                               char *val = 
+                                                       switch_core_session_sprintf(session, "%s;%s;%s", 
+                                                                                                               switch_core_session_get_uuid(originate_status[i].peer_session),
+                                                                                                               switch_str_nil(switch_channel_get_variable(originate_status[i].peer_channel, "callee_id_name")),
+                                                                                                               switch_str_nil(switch_channel_get_variable(originate_status[i].peer_channel, "callee_id_number")));
+                                               
+
                                                switch_channel_set_variable(originate_status[i].peer_channel, "originating_leg_uuid", switch_core_session_get_uuid(session));
+                                               
+                                               switch_channel_add_variable_var_check(channel, "originated_legs", val, SWITCH_FALSE, SWITCH_STACK_PUSH);
+                                                                                                                         
                                        }
 
                                        switch_channel_execute_on(originate_status[i].peer_channel, SWITCH_CHANNEL_EXECUTE_ON_ORIGINATE_VARIABLE);
@@ -3573,10 +3590,19 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 
                        for (i = 0; i < and_argc; i++) {
                                switch_channel_state_t state;
+                               char *val;                                                      
 
                                if (!originate_status[i].peer_channel) {
                                        continue;
                                }
+                               
+                               if (session) {
+                                       val = switch_core_session_sprintf(originate_status[i].peer_session, "%s;%s", 
+                                                                                                         switch_core_session_get_uuid(originate_status[i].peer_session), 
+                                                                                                         switch_channel_cause2str(switch_channel_get_cause(originate_status[i].peer_channel)));
+                                       
+                                       switch_channel_add_variable_var_check(switch_core_session_get_channel(session), "originate_causes", val, SWITCH_FALSE, SWITCH_STACK_PUSH);
+                               }
 
                                if (status == SWITCH_STATUS_SUCCESS) {
                                        switch_channel_clear_flag(originate_status[i].peer_channel, CF_ORIGINATING);