kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

删除不必要的event变量

Browse Source
This commit is contained in:
qiwei 2024-10-18 23:13:08 +08:00
parent 7f932db494
commit a231eec09c
12 changed files with 369 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -518,7 +518,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
if (switch_channel_test_flag(channel, CF_ANSWERED) || sofia_test_flag(tech_pvt, TFLAG_ANS)) {
if (!tech_pvt->got_bye) {
switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye");
}
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel));
if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
@ -536,7 +536,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel));
if (!tech_pvt->got_bye) {
switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel");
switch_channel_set_variable(channel, "sip_invite_failure_status", "487");
switch_channel_set_variable(channel, "sip_invite_failure_phrase", "CANCEL");
}
@ -613,7 +613,7 @@ switch_status_t sofia_on_hangup(switch_core_session_t *session)
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause);
if (!tech_pvt->got_bye) {
switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse");
}
if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
char *cid = generate_pai_str(tech_pvt);
@ -4982,8 +4982,8 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
}
}
switch_channel_set_variable_printf(nchannel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
switch_channel_set_variable(nchannel, "sip_profile_name", profile_name);
//switch_channel_set_variable_printf(nchannel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
//switch_channel_set_variable(nchannel, "sip_profile_name", profile_name);
if (switch_stristr("fs_path", tech_pvt->dest)) {
char *remote_host = NULL;
@ -5035,7 +5035,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
}
}
}
switch_channel_set_variable(nchannel, "sip_destination_url", tech_pvt->dest);
//switch_channel_set_variable(nchannel, "sip_destination_url", tech_pvt->dest);
#if 0
dest_num = switch_core_session_strdup(nsession, dest);
if ((p = strchr(dest_num, '@'))) {

24
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -1095,7 +1095,7 @@ void sofia_handle_sip_i_bye(switch_core_session_t *session, int status,
}
tech_pvt->got_bye = 1;
switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_bye");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_bye");
return;
}
@ -1643,7 +1643,7 @@ static void our_sofia_event_callback(nua_event_t event,
case nua_i_cancel:
if (sip && channel) {
switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_cancel");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_cancel");
switch_channel_set_variable(channel, "sip_invite_failure_status", "487");
switch_channel_set_variable(channel, "sip_invite_failure_phrase", "CANCEL");
@ -2668,7 +2668,7 @@ void event_handler(switch_event_t *event)
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Caller-ID-Name", switch_event_get_header_nil(event, "Orig-Caller-Caller-ID-Name"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Caller-ID-Number", switch_event_get_header_nil(event, "Orig-Caller-Caller-ID-Number"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Destination-Number", switch_event_get_header_nil(event, "Orig-Caller-Destination-Number"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Direction", switch_event_get_header_nil(event, "Orig-Caller-Direction"));
//switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Direction", switch_event_get_header_nil(event, "Orig-Caller-Direction"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "Caller-Username", switch_event_get_header_nil(event, "Orig-Caller-Username"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "channel-state", switch_event_get_header_nil(event, "orig-channel-state"));
switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "force-status", switch_event_get_header_nil(event, "orig-force-status"));
@ -6617,9 +6617,9 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
if (de && de->data && de->data->e_msg) {
sofia_glue_get_addr(de->data->e_msg, network_ip, sizeof(network_ip), &network_port);
switch_channel_set_variable_printf(channel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
switch_channel_set_variable(channel, "sip_reply_host", network_ip);
switch_channel_set_variable_printf(channel, "sip_reply_port", "%d", network_port);
//switch_channel_set_variable_printf(channel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
//switch_channel_set_variable(channel, "sip_reply_host", network_ip);
//switch_channel_set_variable_printf(channel, "sip_reply_port", "%d", network_port);
switch_channel_set_variable_printf(channel, "sip_network_ip", "%s", network_ip);
switch_channel_set_variable_printf(channel, "sip_network_port", "%d", network_port);
@ -6650,7 +6650,7 @@ static void sofia_handle_sip_r_invite(switch_core_session_t *session, int status
}
if (status > 299) {
switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_refuse");
//switch_channel_set_variable(channel, "sip_hangup_disposition", "recv_refuse");
}
if (status >= 400) {
@ -10742,7 +10742,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
channel = tech_pvt->channel = switch_core_session_get_channel(session);
switch_channel_set_variable_printf(channel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
//switch_channel_set_variable_printf(channel, "sip_local_network_addr", "%s", profile->extsipip ? profile->extsipip : profile->sipip);
switch_channel_set_variable_printf(channel, "sip_network_ip", "%s", network_ip);
switch_channel_set_variable_printf(channel, "sip_network_port", "%d", network_port);
switch_channel_set_variable_printf(channel, "sip_invite_stamp", "%" SWITCH_TIME_T_FMT, sip_invite_time);
@ -10864,10 +10864,10 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
set_variable_sip_param(channel, "from", sip->sip_from->a_params);
}
switch_channel_set_variable(channel, "sofia_profile_name", profile->name);
switch_channel_set_variable(channel, "sofia_profile_url", profile->url);
switch_channel_set_variable(channel, "recovery_profile_name", profile->name);
switch_channel_set_variable(channel, "sofia_profile_domain_name", profile->domain_name);
//switch_channel_set_variable(channel, "sofia_profile_name", profile->name);
//switch_channel_set_variable(channel, "sofia_profile_url", profile->url);
//switch_channel_set_variable(channel, "recovery_profile_name", profile->name);
//switch_channel_set_variable(channel, "sofia_profile_domain_name", profile->domain_name);
if (!zstr(sip->sip_from->a_display)) {
displayname = sip->sip_from->a_display;

8
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -1334,7 +1334,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
from_str = sofia_overcome_sip_uri_weakness(session, invite_from_uri ? invite_from_uri : use_from_str, 0, SWITCH_TRUE, invite_from_params, NULL);
to_str = sofia_overcome_sip_uri_weakness(session, invite_to_uri ? invite_to_uri : tech_pvt->dest_to, 0, SWITCH_FALSE, invite_to_params, NULL);
switch_channel_set_variable(channel, "sip_outgoing_contact_uri", invite_contact);
//switch_channel_set_variable(channel, "sip_outgoing_contact_uri", invite_contact);
/*
Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,
@ -1586,9 +1586,9 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
holdstr = sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD) ? hold_char : "";
if (!switch_channel_get_variable(channel, "sofia_profile_name")) {
switch_channel_set_variable(channel, "sofia_profile_name", tech_pvt->profile->name);
switch_channel_set_variable(channel, "recovery_profile_name", tech_pvt->profile->name);
switch_channel_set_variable(channel, "sofia_profile_url", tech_pvt->profile->url);
//switch_channel_set_variable(channel, "sofia_profile_name", tech_pvt->profile->name);
//switch_channel_set_variable(channel, "recovery_profile_name", tech_pvt->profile->name);
//switch_channel_set_variable(channel, "sofia_profile_url", tech_pvt->profile->url);
}
extra_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_HEADER_PREFIX);

4
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -1394,7 +1394,7 @@ static switch_event_t *actual_sofia_presence_event_handler(switch_event_t *event
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Answer-State", "early");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State", status);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", "EARLY");
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", "EARLY");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "astate", "early");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "early");
} else {
@ -1406,7 +1406,7 @@ static switch_event_t *actual_sofia_presence_event_handler(switch_event_t *event
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Answer-State", "answered");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", status);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State", status);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", "ACTIVE");
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", "ACTIVE");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "astate", "confirmed");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "answer-state", "confirmed");
}

90
src/switch_caller.c
View File

@ -328,9 +328,9 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->direction == SWITCH_CALL_DIRECTION_INBOUND ?
"inbound" : "outbound");
switch_snprintf(header_name, sizeof(header_name), "%s-Logical-Direction", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->logical_direction == SWITCH_CALL_DIRECTION_INBOUND ?
"inbound" : "outbound");
//switch_snprintf(header_name, sizeof(header_name), "%s-Logical-Direction", prefix);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->logical_direction == SWITCH_CALL_DIRECTION_INBOUND ?
// "inbound" : "outbound");
if (!zstr(caller_profile->username)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Username", prefix);
@ -380,34 +380,34 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
switch_snprintf(header_name, sizeof(header_name), "%s-Destination-Number", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->destination_number);
}
if (!zstr(caller_profile->uuid)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Unique-ID", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->uuid);
}
if (!zstr(caller_profile->source)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Source", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->source);
}
if (!zstr(caller_profile->transfer_source)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Transfer-Source", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->transfer_source);
}
if (!zstr(caller_profile->context)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Context", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->context);
}
if (!zstr(caller_profile->rdnis)) {
switch_snprintf(header_name, sizeof(header_name), "%s-RDNIS", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->rdnis);
}
if (!zstr(caller_profile->chan_name)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->chan_name);
}
if (!zstr(caller_profile->profile_index)) {
switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Index", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->profile_index);
}
//if (!zstr(caller_profile->uuid)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Unique-ID", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->uuid);
//}
//if (!zstr(caller_profile->source)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Source", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->source);
//}
//if (!zstr(caller_profile->transfer_source)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Transfer-Source", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->transfer_source);
//}
//if (!zstr(caller_profile->context)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Context", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->context);
//}
//if (!zstr(caller_profile->rdnis)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-RDNIS", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->rdnis);
//}
//if (!zstr(caller_profile->chan_name)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->chan_name);
//}
//if (!zstr(caller_profile->profile_index)) {
// switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Index", prefix);
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->profile_index);
//}
if (caller_profile->soft) {
profile_node_t *pn;
@ -429,8 +429,8 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
if (times) {
switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Created-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->profile_created);
//switch_snprintf(header_name, sizeof(header_name), "%s-Profile-Created-Time", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->profile_created);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Created-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->created);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Answered-Time", prefix);
@ -440,19 +440,20 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Progress-Media-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->progress_media);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Hangup-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->hungup);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->transferred);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Resurrect-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->resurrected);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Bridged-Time", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->bridged);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Last-Hold", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->last_hold);
switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Hold-Accum", prefix);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->hold_accum);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->hungup);
//switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Transfer-Time", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->transferred);
//switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Resurrect-Time", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->resurrected);
//switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Bridged-Time", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->bridged);
//switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Last-Hold", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->last_hold);
//switch_snprintf(header_name, sizeof(header_name), "%s-Channel-Hold-Accum", prefix);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%" SWITCH_TIME_T_FMT, times->hold_accum);
}
/*
switch_snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "true" : "false");
@ -461,6 +462,7 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_
switch_snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "true" : "false");
*/
}
SWITCH_DECLARE(switch_status_t) switch_caller_extension_clone(switch_caller_extension_t **new_ext, switch_caller_extension_t *orig,

348
src/switch_channel.c
View File

@ -433,7 +433,7 @@ SWITCH_DECLARE(void) switch_channel_set_direction(switch_channel_t *channel, swi
{
if (!switch_core_session_in_thread(channel->session)) {
channel->direction = channel->logical_direction = direction;
switch_channel_set_variable(channel, "direction", switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
//switch_channel_set_variable(channel, "direction", switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
}
}
@ -469,7 +469,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel,
(*channel)->hangup_cause = SWITCH_CAUSE_NONE;
(*channel)->name = "";
(*channel)->direction = (*channel)->logical_direction = direction;
switch_channel_set_variable(*channel, "direction", switch_channel_direction(*channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
//switch_channel_set_variable(*channel, "direction", switch_channel_direction(*channel) == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
return SWITCH_STATUS_SUCCESS;
}
@ -2010,7 +2010,7 @@ SWITCH_DECLARE(void) switch_channel_set_flag_value(switch_channel_t *channel, sw
}
if (flag == CF_OUTBOUND) {
switch_channel_set_variable(channel, "is_outbound", "true");
//switch_channel_set_variable(channel, "is_outbound", "true");
}
if (flag == CF_RECOVERED) {
@ -2036,7 +2036,7 @@ SWITCH_DECLARE(void) switch_channel_set_flag_recursive(switch_channel_t *channel
switch_mutex_unlock(channel->flag_mutex);
if (flag == CF_OUTBOUND) {
switch_channel_set_variable(channel, "is_outbound", "true");
//switch_channel_set_variable(channel, "is_outbound", "true");
}
if (flag == CF_RECOVERED) {
@ -2198,7 +2198,7 @@ SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch
}
if (flag == CF_OUTBOUND) {
switch_channel_set_variable(channel, "is_outbound", NULL);
//switch_channel_set_variable(channel, "is_outbound", NULL);
}
if (flag == CF_RECOVERED) {
@ -2228,7 +2228,7 @@ SWITCH_DECLARE(void) switch_channel_clear_flag_recursive(switch_channel_t *chann
switch_mutex_unlock(channel->flag_mutex);
if (flag == CF_OUTBOUND) {
switch_channel_set_variable(channel, "is_outbound", NULL);
//switch_channel_set_variable(channel, "is_outbound", NULL);
}
}
@ -2658,7 +2658,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_basic_data(switch_channel_t *chann
{
switch_caller_profile_t *caller_profile, *originator_caller_profile = NULL, *originatee_caller_profile = NULL;
switch_codec_implementation_t impl = { 0 };
char state_num[25];
//char state_num[25];
const char *v;
switch_mutex_lock(channel->profile_mutex);
@ -2669,21 +2669,21 @@ SWITCH_DECLARE(void) switch_channel_event_set_basic_data(switch_channel_t *chann
}
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State", switch_channel_state_name(channel->running_state));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", switch_channel_callstate2str(channel->callstate));
switch_snprintf(state_num, sizeof(state_num), "%d", channel->state);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", state_num);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Name", switch_channel_get_name(channel));
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-State", switch_channel_callstate2str(channel->callstate));
//switch_snprintf(state_num, sizeof(state_num), "%d", channel->state);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-State-Number", state_num);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Name", switch_channel_get_name(channel));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(channel->session));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Session-External-ID", switch_core_session_get_external_id(channel->session));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Call-Direction",
channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Presence-Call-Direction",
channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Presence-Call-Direction",
// channel->direction == SWITCH_CALL_DIRECTION_OUTBOUND ? "outbound" : "inbound");
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-HIT-Dialplan",
switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND ||
switch_channel_test_flag(channel, CF_DIALPLAN) ? "true" : "false");
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-HIT-Dialplan",
// switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_INBOUND ||
// switch_channel_test_flag(channel, CF_DIALPLAN) ? "true" : "false");
if ((v = switch_channel_get_variable_dup(channel, "presence_id", SWITCH_FALSE, -1))) {
@ -2700,11 +2700,11 @@ SWITCH_DECLARE(void) switch_channel_event_set_basic_data(switch_channel_t *chann
switch_event_add_presence_data_cols(channel, event, "PD-");
}
if ((v = switch_channel_get_variable_dup(channel, "call_uuid", SWITCH_FALSE, -1))) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-UUID", v);
} else {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-UUID", switch_core_session_get_uuid(channel->session));
}
//if ((v = switch_channel_get_variable_dup(channel, "call_uuid", SWITCH_FALSE, -1))) {
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-UUID", v);
//} else {
// switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Channel-Call-UUID", switch_core_session_get_uuid(channel->session));
//}
if (switch_channel_down_nosig(channel)) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Answer-State", "hangup");
@ -4488,20 +4488,20 @@ SWITCH_DECLARE(switch_core_session_t *) switch_channel_get_session(switch_channe
SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel)
{
switch_status_t status = SWITCH_STATUS_SUCCESS;
const char *cid_buf = NULL;
//const char *cid_buf = NULL;
switch_caller_profile_t *caller_profile;
switch_app_log_t *app_log, *ap;
char *last_app = NULL, *last_arg = NULL;
char start[80] = "", resurrect[80] = "", answer[80] = "", hold[80],
bridge[80] = "", progress[80] = "", progress_media[80] = "", end[80] = "", tmp[80] = "",
profile_start[80] = "";
int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0, progressmsec = 0, progress_mediamsec = 0;
int32_t answersec = 0, answermsec = 0, waitsec = 0, waitmsec = 0;
switch_time_t answerusec = 0;
switch_time_t uduration = 0, legbillusec = 0, billusec = 0, progresssec = 0, progressusec = 0, progress_mediasec = 0, progress_mediausec = 0, waitusec = 0;
time_t tt_created = 0, tt_answered = 0, tt_resurrected = 0, tt_bridged, tt_last_hold, tt_hold_accum,
//char *last_app = NULL, *last_arg = NULL;
char /*start[80] = "",*/ resurrect[80] = "", answer[80] = "", hold[80],
bridge[80] = "", progress[80] = "", progress_media[80] = ""/*, end[80] = "", tmp[80] = "",
profile_start[80] = ""*/;
//int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0, progressmsec = 0, progress_mediamsec = 0;
//int32_t answersec = 0, answermsec = 0, waitsec = 0, waitmsec = 0;
//switch_time_t answerusec = 0;
//switch_time_t uduration = 0, legbillusec = 0, billusec = 0, progresssec = 0, progressusec = 0, progress_mediasec = 0, progress_mediausec = 0, waitusec = 0;
/*time_t tt_created = 0, tt_answered = 0, tt_resurrected = 0, tt_bridged, tt_last_hold, tt_hold_accum,
tt_progress = 0, tt_progress_media = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_bridged = 0,
mtt_hungup = 0, tt_prof_created, mtt_progress = 0, mtt_progress_media = 0;
mtt_hungup = 0, tt_prof_created, mtt_progress = 0, mtt_progress_media = 0;*/
void *pop;
char dtstr[SWITCH_DTMF_LOG_LEN + 1] = "";
int x = 0;
@ -4522,15 +4522,15 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
if ((app_log = switch_core_session_get_app_log(channel->session))) {
for (ap = app_log; ap && ap->next; ap = ap->next);
last_app = ap->app;
last_arg = ap->arg;
//last_app = ap->app;
//last_arg = ap->arg;
}
if (!zstr(caller_profile->caller_id_name)) {
cid_buf = switch_core_session_sprintf(channel->session, "\"%s\" <%s>", caller_profile->caller_id_name,
switch_str_nil(caller_profile->caller_id_number));
/*cid_buf = switch_core_session_sprintf(channel->session, "\"%s\" <%s>", caller_profile->caller_id_name,
switch_str_nil(caller_profile->caller_id_number));*/
} else {
cid_buf = caller_profile->caller_id_number;
//cid_buf = caller_profile->caller_id_number;
}
while (x < SWITCH_DTMF_LOG_LEN && switch_queue_trypop(channel->dtmf_log_queue, &pop) == SWITCH_STATUS_SUCCESS) {
@ -4587,7 +4587,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
switch_safe_free(substituted);
switch_safe_free(X);
} else {
switch_channel_set_variable(channel, "digits_dialed", "none");
//switch_channel_set_variable(channel, "digits_dialed", "none");
}
if (caller_profile->times) {
@ -4595,13 +4595,13 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
switch_size_t retsize;
const char *fmt = "%Y-%m-%d %T";
switch_time_exp_lt(&tm, caller_profile->times->created);
switch_strftime_nocheck(start, &retsize, sizeof(start), fmt, &tm);
switch_channel_set_variable(channel, "start_stamp", start);
//switch_time_exp_lt(&tm, caller_profile->times->created);
//switch_strftime_nocheck(start, &retsize, sizeof(start), fmt, &tm);
//switch_channel_set_variable(channel, "start_stamp", start);
switch_time_exp_lt(&tm, caller_profile->times->profile_created);
switch_strftime_nocheck(profile_start, &retsize, sizeof(profile_start), fmt, &tm);
switch_channel_set_variable(channel, "profile_start_stamp", profile_start);
//switch_time_exp_lt(&tm, caller_profile->times->profile_created);
//switch_strftime_nocheck(profile_start, &retsize, sizeof(profile_start), fmt, &tm);
//switch_channel_set_variable(channel, "profile_start_stamp", profile_start);
if (caller_profile->times->answered) {
switch_time_exp_lt(&tm, caller_profile->times->answered);
@ -4656,186 +4656,186 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *
free(stream.data);
}
switch_time_exp_lt(&tm, caller_profile->times->hungup);
switch_strftime_nocheck(end, &retsize, sizeof(end), fmt, &tm);
switch_channel_set_variable(channel, "end_stamp", end);
//switch_time_exp_lt(&tm, caller_profile->times->hungup);
//switch_strftime_nocheck(end, &retsize, sizeof(end), fmt, &tm);
//switch_channel_set_variable(channel, "end_stamp", end);
tt_created = (time_t) (caller_profile->times->created / 1000000);
mtt_created = (time_t) (caller_profile->times->created / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_created);
switch_channel_set_variable(channel, "start_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created);
switch_channel_set_variable(channel, "start_uepoch", tmp);
//tt_created = (time_t) (caller_profile->times->created / 1000000);
//mtt_created = (time_t) (caller_profile->times->created / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_created);
//switch_channel_set_variable(channel, "start_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created);
//switch_channel_set_variable(channel, "start_uepoch", tmp);
tt_prof_created = (time_t) (caller_profile->times->profile_created / 1000000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_prof_created);
switch_channel_set_variable(channel, "profile_start_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created);
switch_channel_set_variable(channel, "profile_start_uepoch", tmp);
//tt_prof_created = (time_t) (caller_profile->times->profile_created / 1000000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_prof_created);
//switch_channel_set_variable(channel, "profile_start_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created);
//switch_channel_set_variable(channel, "profile_start_uepoch", tmp);
tt_answered = (time_t) (caller_profile->times->answered / 1000000);
mtt_answered = (time_t) (caller_profile->times->answered / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_answered);
switch_channel_set_variable(channel, "answer_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered);
switch_channel_set_variable(channel, "answer_uepoch", tmp);
//tt_answered = (time_t) (caller_profile->times->answered / 1000000);
//mtt_answered = (time_t) (caller_profile->times->answered / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_answered);
//switch_channel_set_variable(channel, "answer_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->answered);
//switch_channel_set_variable(channel, "answer_uepoch", tmp);
tt_bridged = (time_t) (caller_profile->times->bridged / 1000000);
mtt_bridged = (time_t) (caller_profile->times->bridged / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_bridged);
switch_channel_set_variable(channel, "bridge_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->bridged);
switch_channel_set_variable(channel, "bridge_uepoch", tmp);
//tt_bridged = (time_t) (caller_profile->times->bridged / 1000000);
//mtt_bridged = (time_t) (caller_profile->times->bridged / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_bridged);
//switch_channel_set_variable(channel, "bridge_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->bridged);
//switch_channel_set_variable(channel, "bridge_uepoch", tmp);
tt_last_hold = (time_t) (caller_profile->times->last_hold / 1000000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_last_hold);
switch_channel_set_variable(channel, "last_hold_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->last_hold);
switch_channel_set_variable(channel, "last_hold_uepoch", tmp);
//tt_last_hold = (time_t) (caller_profile->times->last_hold / 1000000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_last_hold);
//switch_channel_set_variable(channel, "last_hold_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->last_hold);
//switch_channel_set_variable(channel, "last_hold_uepoch", tmp);
tt_hold_accum = (time_t) (caller_profile->times->hold_accum / 1000000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hold_accum);
switch_channel_set_variable(channel, "hold_accum_seconds", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum);
switch_channel_set_variable(channel, "hold_accum_usec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum / 1000);
switch_channel_set_variable(channel, "hold_accum_ms", tmp);
//tt_hold_accum = (time_t) (caller_profile->times->hold_accum / 1000000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hold_accum);
//switch_channel_set_variable(channel, "hold_accum_seconds", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum);
//switch_channel_set_variable(channel, "hold_accum_usec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hold_accum / 1000);
//switch_channel_set_variable(channel, "hold_accum_ms", tmp);
tt_resurrected = (time_t) (caller_profile->times->resurrected / 1000000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_resurrected);
switch_channel_set_variable(channel, "resurrect_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->resurrected);
switch_channel_set_variable(channel, "resurrect_uepoch", tmp);
//tt_resurrected = (time_t) (caller_profile->times->resurrected / 1000000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_resurrected);
//switch_channel_set_variable(channel, "resurrect_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->resurrected);
//switch_channel_set_variable(channel, "resurrect_uepoch", tmp);
tt_progress = (time_t) (caller_profile->times->progress / 1000000);
mtt_progress = (time_t) (caller_profile->times->progress / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress);
switch_channel_set_variable(channel, "progress_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress);
switch_channel_set_variable(channel, "progress_uepoch", tmp);
//tt_progress = (time_t) (caller_profile->times->progress / 1000000);
//mtt_progress = (time_t) (caller_profile->times->progress / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress);
//switch_channel_set_variable(channel, "progress_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress);
//switch_channel_set_variable(channel, "progress_uepoch", tmp);
tt_progress_media = (time_t) (caller_profile->times->progress_media / 1000000);
mtt_progress_media = (time_t) (caller_profile->times->progress_media / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress_media);
switch_channel_set_variable(channel, "progress_media_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media);
switch_channel_set_variable(channel, "progress_media_uepoch", tmp);
//tt_progress_media = (time_t) (caller_profile->times->progress_media / 1000000);
//mtt_progress_media = (time_t) (caller_profile->times->progress_media / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_progress_media);
//switch_channel_set_variable(channel, "progress_media_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->progress_media);
//switch_channel_set_variable(channel, "progress_media_uepoch", tmp);
tt_hungup = (time_t) (caller_profile->times->hungup / 1000000);
mtt_hungup = (time_t) (caller_profile->times->hungup / 1000);
switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hungup);
switch_channel_set_variable(channel, "end_epoch", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup);
switch_channel_set_variable(channel, "end_uepoch", tmp);
//tt_hungup = (time_t) (caller_profile->times->hungup / 1000000);
//mtt_hungup = (time_t) (caller_profile->times->hungup / 1000);
//switch_snprintf(tmp, sizeof(tmp), "%" TIME_T_FMT, tt_hungup);
//switch_channel_set_variable(channel, "end_epoch", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->hungup);
//switch_channel_set_variable(channel, "end_uepoch", tmp);
duration = (int32_t) (tt_hungup - tt_created);
mduration = (int32_t) (mtt_hungup - mtt_created);
uduration = caller_profile->times->hungup - caller_profile->times->created;
//duration = (int32_t) (tt_hungup - tt_created);
//mduration = (int32_t) (mtt_hungup - mtt_created);
//uduration = caller_profile->times->hungup - caller_profile->times->created;
if (caller_profile->times->bridged > caller_profile->times->created) {
waitsec = (int32_t) (tt_bridged - tt_created);
waitmsec = (int32_t) (mtt_bridged - mtt_created);
waitusec = caller_profile->times->bridged - caller_profile->times->created;
//waitsec = (int32_t) (tt_bridged - tt_created);
//waitmsec = (int32_t) (mtt_bridged - mtt_created);
//waitusec = caller_profile->times->bridged - caller_profile->times->created;
} else {
waitsec = 0;
waitmsec = 0;
waitusec = 0;
//waitsec = 0;
//waitmsec = 0;
//waitusec = 0;
}
if (caller_profile->times->answered) {
billsec = (int32_t) (tt_hungup - tt_answered);
billmsec = (int32_t) (mtt_hungup - mtt_answered);
billusec = caller_profile->times->hungup - caller_profile->times->answered;
//billsec = (int32_t) (tt_hungup - tt_answered);
//billmsec = (int32_t) (mtt_hungup - mtt_answered);
//billusec = caller_profile->times->hungup - caller_profile->times->answered;
legbillsec = (int32_t) (tt_hungup - tt_created);
legbillmsec = (int32_t) (mtt_hungup - mtt_created);
legbillusec = caller_profile->times->hungup - caller_profile->times->created;
//legbillsec = (int32_t) (tt_hungup - tt_created);
//legbillmsec = (int32_t) (mtt_hungup - mtt_created);
//legbillusec = caller_profile->times->hungup - caller_profile->times->created;
answersec = (int32_t) (tt_answered - tt_created);
answermsec = (int32_t) (mtt_answered - mtt_created);
answerusec = caller_profile->times->answered - caller_profile->times->created;
//answersec = (int32_t) (tt_answered - tt_created);
//answermsec = (int32_t) (mtt_answered - mtt_created);
//answerusec = caller_profile->times->answered - caller_profile->times->created;
}
if (caller_profile->times->progress) {
progresssec = (int32_t) (tt_progress - tt_created);
progressmsec = (int32_t) (mtt_progress - mtt_created);
progressusec = caller_profile->times->progress - caller_profile->times->created;
//progresssec = (int32_t) (tt_progress - tt_created);
//progressmsec = (int32_t) (mtt_progress - mtt_created);
//progressusec = caller_profile->times->progress - caller_profile->times->created;
}
if (caller_profile->times->progress_media) {
progress_mediasec = (int32_t) (tt_progress_media - tt_created);
progress_mediamsec = (int32_t) (mtt_progress_media - mtt_created);
progress_mediausec = caller_profile->times->progress_media - caller_profile->times->created;
//progress_mediasec = (int32_t) (tt_progress_media - tt_created);
//progress_mediamsec = (int32_t) (mtt_progress_media - mtt_created);
//progress_mediausec = caller_profile->times->progress_media - caller_profile->times->created;
}
}
switch_channel_set_variable(channel, "last_app", last_app);
switch_channel_set_variable(channel, "last_arg", last_arg);
switch_channel_set_variable(channel, "caller_id", cid_buf);
//switch_channel_set_variable(channel, "last_app", last_app);
//switch_channel_set_variable(channel, "last_arg", last_arg);
//switch_channel_set_variable(channel, "caller_id", cid_buf);
switch_snprintf(tmp, sizeof(tmp), "%d", duration);
switch_channel_set_variable(channel, "duration", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", duration);
//switch_channel_set_variable(channel, "duration", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", billsec);
switch_channel_set_variable(channel, "billsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", billsec);
//switch_channel_set_variable(channel, "billsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%"SWITCH_TIME_T_FMT, progresssec);
switch_channel_set_variable(channel, "progresssec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%"SWITCH_TIME_T_FMT, progresssec);
//switch_channel_set_variable(channel, "progresssec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", answersec);
switch_channel_set_variable(channel, "answersec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", answersec);
//switch_channel_set_variable(channel, "answersec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", waitsec);
switch_channel_set_variable(channel, "waitsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", waitsec);
//switch_channel_set_variable(channel, "waitsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%"SWITCH_TIME_T_FMT, progress_mediasec);
switch_channel_set_variable(channel, "progress_mediasec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%"SWITCH_TIME_T_FMT, progress_mediasec);
//switch_channel_set_variable(channel, "progress_mediasec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", legbillsec);
switch_channel_set_variable(channel, "flow_billsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", legbillsec);
//switch_channel_set_variable(channel, "flow_billsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", mduration);
switch_channel_set_variable(channel, "mduration", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", mduration);
//switch_channel_set_variable(channel, "mduration", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", billmsec);
switch_channel_set_variable(channel, "billmsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", billmsec);
//switch_channel_set_variable(channel, "billmsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", progressmsec);
switch_channel_set_variable(channel, "progressmsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", progressmsec);
//switch_channel_set_variable(channel, "progressmsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", answermsec);
switch_channel_set_variable(channel, "answermsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", answermsec);
//switch_channel_set_variable(channel, "answermsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", waitmsec);
switch_channel_set_variable(channel, "waitmsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", waitmsec);
//switch_channel_set_variable(channel, "waitmsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", progress_mediamsec);
switch_channel_set_variable(channel, "progress_mediamsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", progress_mediamsec);
//switch_channel_set_variable(channel, "progress_mediamsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%d", legbillmsec);
switch_channel_set_variable(channel, "flow_billmsec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%d", legbillmsec);
//switch_channel_set_variable(channel, "flow_billmsec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, uduration);
switch_channel_set_variable(channel, "uduration", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, uduration);
//switch_channel_set_variable(channel, "uduration", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec);
switch_channel_set_variable(channel, "billusec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, billusec);
//switch_channel_set_variable(channel, "billusec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progressusec);
switch_channel_set_variable(channel, "progressusec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progressusec);
//switch_channel_set_variable(channel, "progressusec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, answerusec);
switch_channel_set_variable(channel, "answerusec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, answerusec);
//switch_channel_set_variable(channel, "answerusec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, waitusec);
switch_channel_set_variable(channel, "waitusec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, waitusec);
//switch_channel_set_variable(channel, "waitusec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progress_mediausec);
switch_channel_set_variable(channel, "progress_mediausec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, progress_mediausec);
//switch_channel_set_variable(channel, "progress_mediausec", tmp);
switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec);
switch_channel_set_variable(channel, "flow_billusec", tmp);
//switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec);
//switch_channel_set_variable(channel, "flow_billusec", tmp);
switch_mutex_unlock(channel->profile_mutex);

176
src/switch_core_media.c
View File

@ -2034,9 +2034,9 @@ SWITCH_DECLARE(switch_status_t) switch_media_handle_create(switch_media_handle_t
session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].crypto_type = CRYPTO_INVALID;
switch_channel_set_variable(session->channel, "video_media_flow", "disabled");
switch_channel_set_variable(session->channel, "audio_media_flow", "disabled");
switch_channel_set_variable(session->channel, "text_media_flow", "disabled");
//switch_channel_set_variable(session->channel, "video_media_flow", "disabled");
//switch_channel_set_variable(session->channel, "audio_media_flow", "disabled");
//switch_channel_set_variable(session->channel, "text_media_flow", "disabled");
session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].smode = SWITCH_MEDIA_FLOW_DISABLED;
session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].smode = SWITCH_MEDIA_FLOW_DISABLED;
@ -2280,7 +2280,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_prepare_codecs(switch_core_ses
}
tmp_codec_string = switch_core_session_strdup(smh->session, codec_string);
switch_channel_set_variable(session->channel, "rtp_use_codec_string", codec_string);
//switch_channel_set_variable(session->channel, "rtp_use_codec_string", codec_string);
smh->codec_order_last = switch_separate_string(tmp_codec_string, ',', smh->codec_order, SWITCH_MAX_CODECS);
smh->mparams->num_codecs = switch_loadable_module_get_codecs_sorted(smh->codecs, smh->fmtp, SWITCH_MAX_CODECS, smh->codec_order, smh->codec_order_last);
return SWITCH_STATUS_SUCCESS;
@ -4549,73 +4549,73 @@ static void restore_pmaps(switch_rtp_engine_t *engine)
}
}
static const char *media_flow_varname(switch_media_type_t type)
{
const char *varname = "invalid";
//static const char *media_flow_varname(switch_media_type_t type)
//{
// const char *varname = "invalid";
//
// switch(type) {
// case SWITCH_MEDIA_TYPE_AUDIO:
// varname = "audio_media_flow";
// break;
// case SWITCH_MEDIA_TYPE_VIDEO:
// varname = "video_media_flow";
// break;
// case SWITCH_MEDIA_TYPE_TEXT:
// varname = "text_media_flow";
// break;
// }
//
// return varname;
//}
switch(type) {
case SWITCH_MEDIA_TYPE_AUDIO:
varname = "audio_media_flow";
break;
case SWITCH_MEDIA_TYPE_VIDEO:
varname = "video_media_flow";
break;
case SWITCH_MEDIA_TYPE_TEXT:
varname = "text_media_flow";
break;
}
//static const char *remote_media_flow_varname(switch_media_type_t type)
//{
// const char *varname = "invalid";
//
// switch(type) {
// case SWITCH_MEDIA_TYPE_AUDIO:
// varname = "remote_audio_media_flow";
// break;
// case SWITCH_MEDIA_TYPE_VIDEO:
// varname = "remote_video_media_flow";
// break;
// case SWITCH_MEDIA_TYPE_TEXT:
// varname = "remote_text_media_flow";
// break;
// }
//
// return varname;
//}
return varname;
}
static const char *remote_media_flow_varname(switch_media_type_t type)
{
const char *varname = "invalid";
switch(type) {
case SWITCH_MEDIA_TYPE_AUDIO:
varname = "remote_audio_media_flow";
break;
case SWITCH_MEDIA_TYPE_VIDEO:
varname = "remote_video_media_flow";
break;
case SWITCH_MEDIA_TYPE_TEXT:
varname = "remote_text_media_flow";
break;
}
return varname;
}
static void media_flow_get_mode(switch_media_flow_t smode, const char **mode_str, switch_media_flow_t *opp_mode)
{
const char *smode_str = "";
switch_media_flow_t opp_smode = smode;
switch(smode) {
case SWITCH_MEDIA_FLOW_SENDONLY:
opp_smode = SWITCH_MEDIA_FLOW_RECVONLY;
smode_str = "sendonly";
break;
case SWITCH_MEDIA_FLOW_RECVONLY:
opp_smode = SWITCH_MEDIA_FLOW_SENDONLY;
smode_str = "recvonly";
break;
case SWITCH_MEDIA_FLOW_INACTIVE:
smode_str = "inactive";
break;
case SWITCH_MEDIA_FLOW_DISABLED:
smode_str = "disabled";
break;
case SWITCH_MEDIA_FLOW_SENDRECV:
smode_str = "sendrecv";
break;
}
*mode_str = smode_str;
*opp_mode = opp_smode;
}
//static void media_flow_get_mode(switch_media_flow_t smode, const char **mode_str, switch_media_flow_t *opp_mode)
//{
// const char *smode_str = "";
// switch_media_flow_t opp_smode = smode;
//
// switch(smode) {
// case SWITCH_MEDIA_FLOW_SENDONLY:
// opp_smode = SWITCH_MEDIA_FLOW_RECVONLY;
// smode_str = "sendonly";
// break;
// case SWITCH_MEDIA_FLOW_RECVONLY:
// opp_smode = SWITCH_MEDIA_FLOW_SENDONLY;
// smode_str = "recvonly";
// break;
// case SWITCH_MEDIA_FLOW_INACTIVE:
// smode_str = "inactive";
// break;
// case SWITCH_MEDIA_FLOW_DISABLED:
// smode_str = "disabled";
// break;
// case SWITCH_MEDIA_FLOW_SENDRECV:
// smode_str = "sendrecv";
// break;
// }
//
// *mode_str = smode_str;
// *opp_mode = opp_smode;
//
//}
static void check_stream_changes(switch_core_session_t *session, const char *r_sdp, switch_sdp_type_t sdp_type)
{
@ -4687,7 +4687,7 @@ SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session,
{
switch_media_handle_t *smh;
switch_rtp_engine_t *engine;
const char *varname = NULL, *smode_str = NULL;
//const char *varname = NULL, *smode_str = NULL;
switch_media_flow_t old_smode, opp_smode = smode;
switch_core_session_t *other_session;
int pass_codecs = 0;
@ -4698,15 +4698,15 @@ SWITCH_DECLARE(void) switch_core_media_set_smode(switch_core_session_t *session,
engine = &smh->engines[type];
varname = media_flow_varname(type);
//varname = media_flow_varname(type);
media_flow_get_mode(smode, &smode_str, &opp_smode);
//media_flow_get_mode(smode, &smode_str, &opp_smode);
old_smode = engine->smode;
engine->smode = smode;
switch_channel_set_variable(session->channel, varname, smode_str);
//switch_channel_set_variable(session->channel, varname, smode_str);
if (switch_channel_var_true(session->channel, "rtp_pass_codecs_on_reinvite") || engine->pass_codecs) {
pass_codecs = 1;
@ -4731,8 +4731,8 @@ static void switch_core_media_set_rmode(switch_core_session_t *session, switch_m
{
switch_media_handle_t *smh;
switch_rtp_engine_t *engine;
const char *varname = NULL, *rmode_str = NULL;
switch_media_flow_t opp_rmode = rmode;
//const char *varname = NULL, *rmode_str = NULL;
//switch_media_flow_t opp_rmode = rmode;
switch_core_session_t *other_session = NULL;
if (!(smh = session->media_handle)) {
@ -4741,8 +4741,8 @@ static void switch_core_media_set_rmode(switch_core_session_t *session, switch_m
engine = &smh->engines[type];
varname = remote_media_flow_varname(type);
media_flow_get_mode(rmode, &rmode_str, &opp_rmode);
//varname = remote_media_flow_varname(type);
//media_flow_get_mode(rmode, &rmode_str, &opp_rmode);
if (engine->rmode != rmode) {
engine->pass_codecs = 1;
@ -4759,7 +4759,7 @@ static void switch_core_media_set_rmode(switch_core_session_t *session, switch_m
switch_core_session_rwunlock(other_session);
}
switch_channel_set_variable(session->channel, varname, rmode_str);
//switch_channel_set_variable(session->channel, varname, rmode_str);
}
//?
@ -6313,7 +6313,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
payload_map_t *pmap;
a_engine->rmode = SWITCH_MEDIA_FLOW_DISABLED;
switch_channel_set_variable(smh->session->channel, "audio_media_flow", "inactive");
//switch_channel_set_variable(smh->session->channel, "audio_media_flow", "inactive");
pmap = switch_core_media_add_payload_map(session,
@ -8220,9 +8220,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_choose_port(switch_core_sessio
engine->adv_sdp_ip = smh->mparams->adv_sdp_audio_ip = smh->mparams->extrtpip = switch_core_session_strdup(session, use_ip);
if (type == SWITCH_MEDIA_TYPE_AUDIO) {
switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, engine->local_sdp_ip);
switch_channel_set_variable_printf(session->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, "%d", sdp_port);
switch_channel_set_variable(session->channel, SWITCH_ADVERTISED_MEDIA_IP_VARIABLE, engine->adv_sdp_ip);
//switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, engine->local_sdp_ip);
//switch_channel_set_variable_printf(session->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, "%d", sdp_port);
//switch_channel_set_variable(session->channel, SWITCH_ADVERTISED_MEDIA_IP_VARIABLE, engine->adv_sdp_ip);
} else if (type == SWITCH_MEDIA_TYPE_VIDEO) {
switch_channel_set_variable(session->channel, SWITCH_LOCAL_VIDEO_IP_VARIABLE, engine->adv_sdp_ip);
switch_channel_set_variable_printf(session->channel, SWITCH_LOCAL_VIDEO_PORT_VARIABLE, "%d", sdp_port);
@ -8669,9 +8669,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
}
switch_snprintf(tmp, sizeof(tmp), "%d", a_engine->local_sdp_port);
switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, a_engine->local_sdp_ip);
switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp);
switch_channel_set_variable(session->channel, SWITCH_ADVERTISED_MEDIA_IP_VARIABLE, a_engine->adv_sdp_ip);
//switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_IP_VARIABLE, a_engine->local_sdp_ip);
//switch_channel_set_variable(session->channel, SWITCH_LOCAL_MEDIA_PORT_VARIABLE, tmp);
//switch_channel_set_variable(session->channel, SWITCH_ADVERTISED_MEDIA_IP_VARIABLE, a_engine->adv_sdp_ip);
if (a_engine->rtp_session && is_reinvite) {
const char *rport = NULL;
@ -10185,7 +10185,7 @@ SWITCH_DECLARE(void)switch_core_media_set_local_sdp(switch_core_session_t *sessi
if (smh->sdp_mutex) switch_mutex_lock(smh->sdp_mutex);
smh->mparams->local_sdp_str = dup ? switch_core_session_strdup(session, sdp_str) : (char *) sdp_str;
switch_channel_set_variable(session->channel, "rtp_local_sdp_str", smh->mparams->local_sdp_str);
//switch_channel_set_variable(session->channel, "rtp_local_sdp_str", smh->mparams->local_sdp_str);
if (smh->sdp_mutex) switch_mutex_unlock(smh->sdp_mutex);
}
@ -14061,8 +14061,8 @@ SWITCH_DECLARE (void) switch_core_media_recover_session(switch_core_session_t *s
}
if ((tmp = switch_channel_get_variable(session->channel, "rtp_last_audio_codec_string"))) {
const char *vtmp = switch_channel_get_variable(session->channel, "rtp_last_video_codec_string");
switch_channel_set_variable_printf(session->channel, "rtp_use_codec_string", "%s%s%s", tmp, vtmp ? "," : "", vtmp ? vtmp : "");
//const char *vtmp = switch_channel_get_variable(session->channel, "rtp_last_video_codec_string");
//switch_channel_set_variable_printf(session->channel, "rtp_use_codec_string", "%s%s%s", tmp, vtmp ? "," : "", vtmp ? vtmp : "");
}
if ((tmp = switch_channel_get_variable(session->channel, "rtp_use_codec_string"))) {

6
src/switch_core_session.c
View File

@ -2046,7 +2046,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session
}
switch_channel_set_variable(session->channel, "uuid", use_uuid);
switch_channel_set_variable(session->channel, "call_uuid", use_uuid);
//switch_channel_set_variable(session->channel, "call_uuid", use_uuid);
switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str);
@ -2466,7 +2466,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_
}
switch_channel_set_variable(session->channel, "uuid", session->uuid_str);
switch_channel_set_variable(session->channel, "call_uuid", session->uuid_str);
//switch_channel_set_variable(session->channel, "call_uuid", session->uuid_str);
session->endpoint_interface = endpoint_interface;
session->raw_write_frame.data = session->raw_write_buf;
@ -2510,7 +2510,7 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request_uuid(switch_
switch_mutex_unlock(runtime.session_hash_mutex);
switch_channel_set_variable_printf(session->channel, "session_id", "%u", session->id);
//switch_channel_set_variable_printf(session->channel, "session_id", "%u", session->id);
return session;
}

14
src/switch_core_state_machine.c
View File

@ -177,7 +177,7 @@ static void switch_core_standard_on_destroy(switch_core_session_t *session)
static void switch_core_standard_on_reset(switch_core_session_t *session)
{
switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
//switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard RESET\n", switch_channel_get_name(session->channel));
@ -229,7 +229,7 @@ static void switch_core_standard_on_routing(switch_core_session_t *session)
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel));
switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
//switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
if ((switch_channel_test_flag(session->channel, CF_ANSWERED) ||
switch_channel_test_flag(session->channel, CF_EARLY_MEDIA) ||
@ -324,7 +324,7 @@ static void switch_core_standard_on_execute(switch_core_session_t *session)
switch_channel_clear_flag(session->channel, CF_RECOVERING);
switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
//switch_channel_set_variable(session->channel, "call_uuid", switch_core_session_get_uuid(session));
if (switch_channel_get_variable(session->channel, "recovered") && !switch_channel_test_flag(session->channel, CF_RECOVERED)) {
switch_channel_set_flag(session->channel, CF_RECOVERED);
@ -792,8 +792,8 @@ static void api_hook(switch_core_session_t *session, const char *hook_var, int u
SWITCH_DECLARE(void) switch_core_session_hangup_state(switch_core_session_t *session, switch_bool_t force)
{
switch_call_cause_t cause = switch_channel_get_cause(session->channel);
switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel);
//switch_call_cause_t cause = switch_channel_get_cause(session->channel);
//switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel);
int proceed = 1;
int global_proceed = 1;
int do_extra_handlers = 1;
@ -836,8 +836,8 @@ SWITCH_DECLARE(void) switch_core_session_hangup_state(switch_core_session_t *ses
switch_channel_stop_broadcast(session->channel);
switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause));
switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850);
//switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause));
//switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850);
//switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL);
switch_channel_set_timestamps(session->channel);

26
src/switch_event.c
View File

@ -102,7 +102,7 @@ static int DISPATCH_THREAD_COUNT = 0;
static int EVENT_CHANNEL_DISPATCH_THREAD_COUNT = 0;
static int EVENT_CHANNEL_DISPATCH_THREAD_STARTING = 0;
static int SYSTEM_RUNNING = 0;
static uint64_t EVENT_SEQUENCE_NR = 0;
//static uint64_t EVENT_SEQUENCE_NR = 0;
#ifdef SWITCH_EVENT_RECYCLE
static switch_queue_t *EVENT_RECYCLE_QUEUE = NULL;
static switch_queue_t *EVENT_HEADER_RECYCLE_QUEUE = NULL;
@ -1975,30 +1975,30 @@ SWITCH_DECLARE(void) switch_event_prep_for_delivery_detailed(const char *file, c
char date[80] = "";
switch_size_t retsize;
switch_time_t ts = switch_micro_time_now();
uint64_t seq;
//uint64_t seq;
switch_mutex_lock(EVENT_QUEUE_MUTEX);
seq = ++EVENT_SEQUENCE_NR;
//seq = ++EVENT_SEQUENCE_NR;
switch_mutex_unlock(EVENT_QUEUE_MUTEX);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Name", switch_event_name(event->event_id));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Core-UUID", switch_core_get_uuid());
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Hostname", switch_core_get_hostname());
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Switchname", switch_core_get_switchname());
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv4", guess_ip_v4);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv6", guess_ip_v6);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Core-UUID", switch_core_get_uuid());
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Hostname", switch_core_get_hostname());
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-Switchname", switch_core_get_switchname());
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv4", guess_ip_v4);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv6", guess_ip_v6);
switch_time_exp_lt(&tm, ts);
switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Date-Local", date);
switch_rfc822_date(date, ts);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", date);
//switch_rfc822_date(date, ts);
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", date);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Date-Timestamp", "%" SWITCH_UINT64_T_FMT, (uint64_t) ts);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Calling-File", switch_cut_path(file));
//switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Calling-File", switch_cut_path(file));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Event-Calling-Function", func);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Sequence", "%" SWITCH_UINT64_T_FMT, seq);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Calling-Line-Number", "%d", line);
//switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Sequence", "%" SWITCH_UINT64_T_FMT, seq);
}

8
src/switch_ivr_bridge.c
View File

@ -1443,7 +1443,7 @@ static switch_status_t signal_bridge_on_hangup(switch_core_session_t *session)
switch_channel_set_variable(other_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, NULL);
switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL);
switch_channel_set_variable(other_channel, "call_uuid", switch_core_session_get_uuid(other_session));
//switch_channel_set_variable(other_channel, "call_uuid", switch_core_session_get_uuid(other_session));
if (switch_channel_up_nosig(other_channel)) {
if (switch_true(switch_channel_get_variable(other_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE))) {
@ -1552,7 +1552,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_signal_bridge(switch_core_session_t *
switch_channel_set_variable(caller_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session));
switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(session));
switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(session));
//switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(session));
switch_channel_set_flag_recursive(caller_channel, CF_BRIDGE_ORIGINATOR);
switch_channel_clear_flag(peer_channel, CF_BRIDGE_ORIGINATOR);
@ -1681,7 +1681,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
switch_channel_set_state(peer_channel, CS_CONSUME_MEDIA);
}
switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(session));
//switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(session));
switch_channel_set_bridge_time(caller_channel);
switch_channel_set_bridge_time(peer_channel);
@ -1874,7 +1874,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
done:
switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(peer_session));
//switch_channel_set_variable(peer_channel, "call_uuid", switch_core_session_get_uuid(peer_session));
if (br && switch_event_create(&event, SWITCH_EVENT_CHANNEL_UNBRIDGE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Bridge-A-Unique-ID", switch_core_session_get_uuid(session));

20
src/switch_ivr_originate.c
View File

@ -1868,7 +1868,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
switch_channel_set_variable(channel, "originate_disposition", "success");
} else {
switch_channel_set_variable(channel, "originate_disposition", "failure");
switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(*cause));
//switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(*cause));
}
}
@ -3040,15 +3040,15 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
}
}
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false");
//switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "originate_early_media", oglobals.early_ok ? "true" : "false");
if (caller_channel && switch_true(switch_channel_get_variable(caller_channel, "push_channel_name"))) {
char *new_name = switch_core_session_sprintf(session, "%s__B", switch_channel_get_name(caller_channel));
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_channel_name", new_name);
new_name = switch_core_session_sprintf(session, "_%s", switch_channel_get_name(caller_channel));
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_h_X-FS-Channel-Name", new_name);
}
//if (caller_channel && switch_true(switch_channel_get_variable(caller_channel, "push_channel_name"))) {
// char *new_name = switch_core_session_sprintf(session, "%s__B", switch_channel_get_name(caller_channel));
// switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_channel_name", new_name);
// new_name = switch_core_session_sprintf(session, "_%s", switch_channel_get_name(caller_channel));
// switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "sip_h_X-FS-Channel-Name", new_name);
//}
reason = switch_core_session_outgoing_channel(oglobals.session, originate_var_event, chan_type,
@ -3093,7 +3093,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
switch_channel_set_flag(oglobals.originate_status[i].peer_channel, CF_ORIGINATING);
if (caller_channel) {
switch_channel_set_variable(oglobals.originate_status[i].peer_channel, "call_uuid", switch_channel_get_variable(caller_channel, "call_uuid"));
//switch_channel_set_variable(oglobals.originate_status[i].peer_channel, "call_uuid", switch_channel_get_variable(caller_channel, "call_uuid"));
}
@ -3225,7 +3225,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
l_session = NULL;
}
switch_channel_set_variable(oglobals.originate_status[i].peer_channel, "originate_endpoint", chan_type);
//switch_channel_set_variable(oglobals.originate_status[i].peer_channel, "originate_endpoint", chan_type);
switch_channel_execute_on(oglobals.originate_status[i].peer_channel, SWITCH_CHANNEL_EXECUTE_ON_ORIGINATE_VARIABLE);
switch_channel_api_on(oglobals.originate_status[i].peer_channel, SWITCH_CHANNEL_API_ON_ORIGINATE_VARIABLE);
}