kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix minor cid issue in mod_fifo

This commit is contained in:
Anthony Minessale 2013-04-22 16:30:06 -05:00
parent f038338e81
commit 360429304f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -2985,8 +2985,6 @@ SWITCH_STANDARD_APP(fifo_function)
originatee_cp = switch_channel_get_caller_profile(other_channel); originatee_cp = switch_channel_get_caller_profile(other_channel);
if (switch_channel_inbound_display(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) { if (switch_channel_direction(other_channel) == SWITCH_CALL_DIRECTION_INBOUND) {
switch_channel_set_flag(other_channel, CF_BLEG); 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_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); 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_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); originatee_cp->caller_id_number = switch_core_strdup(originatee_cp->pool, originator_cp->caller_id_number);
ts = switch_micro_time_now(); ts = switch_micro_time_now();
switch_time_exp_lt(&tm, ts); switch_time_exp_lt(&tm, ts);
epoch_start = (long)switch_epoch_time_now(NULL); epoch_start = (long)switch_epoch_time_now(NULL);

2
src/switch_channel.c
View File

@ -2886,7 +2886,7 @@ SWITCH_DECLARE(void) switch_channel_invert_cid(switch_channel_t *channel)
tnum = cp->caller_id_number; tnum = cp->caller_id_number;
#ifdef DEEP_DEBUG_CID #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 #endif
cp->caller_id_name = cp->callee_id_name; cp->caller_id_name = cp->callee_id_name;