fix minor cid issue in mod_fifo

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 87b928825d683e9b755b83d7bd37269a2d2cd89f..c809a470da5a5670297f78d54edefdcde16775b5 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -2985,8 +2985,6 @@ SWITCH_STANDARD_APP(fifo_function)
                                originatee_cp = switch_channel_get_caller_profile(other_channel);
 
                                if (switch_channel_inbound_display(other_channel)) {
-                                       switch_channel_invert_cid(other_channel);
-
                                        if (switch_channel_direction(other_channel) == SWITCH_CALL_DIRECTION_INBOUND) {
                                                switch_channel_set_flag(other_channel, CF_BLEG);
                                        }
@@ -3005,12 +3003,17 @@ SWITCH_STANDARD_APP(fifo_function)
                                
                                originator_cp->callee_id_name = switch_core_strdup(originator_cp->pool, originatee_cp->callee_id_name);
                                originator_cp->callee_id_number = switch_core_strdup(originator_cp->pool, originatee_cp->callee_id_number);
+
+
+                               originatee_cp->callee_id_name = switch_core_strdup(originatee_cp->pool, originatee_cp->caller_id_name);
+                               originatee_cp->callee_id_number = switch_core_strdup(originatee_cp->pool, originatee_cp->caller_id_number);
                                
                                originatee_cp->caller_id_name = switch_core_strdup(originatee_cp->pool, originator_cp->caller_id_name);
                                originatee_cp->caller_id_number = switch_core_strdup(originatee_cp->pool, originator_cp->caller_id_number);
 
 
 
+
                                ts = switch_micro_time_now();
                                switch_time_exp_lt(&tm, ts);
                                epoch_start = (long)switch_epoch_time_now(NULL);

diff --git a/src/switch_channel.c b/src/switch_channel.c
index e4f445ef59050516546325f5f582bb178cf2af4e..2295153b0fb28b465a58bbff7b9c5d8ed84603bd 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2886,7 +2886,7 @@ SWITCH_DECLARE(void) switch_channel_invert_cid(switch_channel_t *channel)
        tnum = cp->caller_id_number;
 
 #ifdef DEEP_DEBUG_CID
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SWAP [%s][%s] [%s][%s]\n", originate_cp->caller_id_name, cp->caller_id_number, cp->callee_id_name, cp->callee_id_number);
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SWAP [%s][%s] [%s][%s]\n", cp->caller_id_name, cp->caller_id_number, cp->callee_id_name, cp->callee_id_number);
 #endif
 
        cp->caller_id_name = cp->callee_id_name;