- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6920 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: cparker Date: Thu Dec 20 15:33:27 2007 New Revision: 6920 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Log: Add void * cast for char * arguments so we don't fail -Werror Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Thu Dec 20 15:33:27 2007 @@ -183,7 +183,7 @@ if(profile) { if(profile->caller_id_number) { - if (rc_avpair_add(rad_config, &send, PW_FS_SRC, profile->caller_id_number, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); rc_destroy(rad_config); @@ -191,7 +191,7 @@ } } if(profile->caller_id_name) { - if (rc_avpair_add(rad_config, &send, PW_FS_CLID, profile->caller_id_name, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *)profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); rc_destroy(rad_config); @@ -199,7 +199,7 @@ } } if(profile->destination_number) { - if (rc_avpair_add(rad_config, &send, PW_FS_DST, profile->destination_number, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *)profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); rc_destroy(rad_config); @@ -207,7 +207,7 @@ } } if(profile->dialplan) { - if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, profile->dialplan, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *)profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); rc_destroy(rad_config); @@ -216,7 +216,7 @@ } if(profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, - profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { + (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source); rc_destroy(rad_config); @@ -331,7 +331,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Finished calculating billable time\n"); if(profile->caller_id_number) { - if (rc_avpair_add(rad_config, &send, PW_FS_SRC, profile->caller_id_number, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_SRC, (void *)profile->caller_id_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Src: %s\n", profile->caller_id_number); rc_destroy(rad_config); @@ -339,7 +339,7 @@ } } if(profile->caller_id_name) { - if (rc_avpair_add(rad_config, &send, PW_FS_CLID, profile->caller_id_name, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_CLID, (void *)profile->caller_id_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-CLID: %s\n", profile->caller_id_name); rc_destroy(rad_config); @@ -347,7 +347,7 @@ } } if(profile->destination_number) { - if (rc_avpair_add(rad_config, &send, PW_FS_DST, profile->destination_number, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_DST, (void *)profile->destination_number, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dst: %s\n", profile->destination_number); rc_destroy(rad_config); @@ -355,7 +355,7 @@ } } if(profile->dialplan) { - if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, profile->dialplan, -1, PW_FS_PEC) == NULL) { + if (rc_avpair_add(rad_config, &send, PW_FS_DIALPLAN, (void *)profile->dialplan, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Dialplan: %s\n", profile->dialplan); rc_destroy(rad_config); @@ -364,7 +364,7 @@ } if(profile->caller_extension && profile->caller_extension->last_application->application_name) { if (rc_avpair_add(rad_config, &send, PW_FS_LASTAPP, - profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { + (void *)profile->caller_extension->last_application->application_name, -1, PW_FS_PEC) == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed adding Freeswitch-Lastapp: %s\n", profile->source); rc_destroy(rad_config);

1 0

[commit] r6919 - freeswitch/trunk/src
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Thu Dec 20 15:26:00 2007 New Revision: 6919 Modified: freeswitch/trunk/src/switch_console.c Log: fix FSCORE-75 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu Dec 20 15:26:00 2007 @@ -246,6 +246,7 @@ free(cmd); } } + switch_yield(1000); } switch_core_destroy_memory_pool(&pool);

1 0

[commit] r6918 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Thu Dec 20 15:20:38 2007 New Revision: 6918 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix MODAPP-58 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Dec 20 15:20:38 2007 @@ -547,7 +547,7 @@ } else { if ((db = switch_core_db_open_file(profile->dbname))) { switch_core_db_test_reactive(db, "select count(message_len) from voicemail_data", "drop table voicemail_data", vm_sql); - switch_core_db_test_reactive(db, "select count(user) from voicemail_prefs", "drop table voicemail_data", vm_pref_sql); + switch_core_db_test_reactive(db, "select count(user) from voicemail_prefs", "drop table voicemail_prefs", vm_pref_sql); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n"); continue;

1 0

[commit] r6917 - in freeswitch/trunk/src: . include mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Thu Dec 20 13:04:07 2007 New Revision: 6917 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/switch_channel.c Log: more cdr stuff Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Dec 20 13:04:07 2007 @@ -464,6 +464,7 @@ */ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel, const char *in); SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix); +SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel); /** @} */ Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu Dec 20 13:04:07 2007 @@ -158,16 +158,8 @@ { switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_SUCCESS; - const char *log_dir = NULL, *accountcode = NULL, *cid_buf = NULL, *a_template_str = NULL, *g_template_str = NULL; + const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; - switch_caller_profile_t *caller_profile, *ocp; - - switch_app_log_t *app_log, *ap; - char *last_app = NULL, *last_arg = NULL; - char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = ""; - int32_t duration = 0, billsec = 0, mduration = 0, billmsec = 0; - switch_time_t uduration = 0, billusec = 0; - time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; @@ -182,106 +174,6 @@ return SWITCH_STATUS_FALSE; } - caller_profile = switch_channel_get_caller_profile(channel); - ocp = switch_channel_get_originatee_caller_profile(channel); - - if (!switch_strlen_zero(caller_profile->caller_id_name)) { - cid_buf = switch_core_session_sprintf(session, "\"%s\" <%s>", caller_profile->caller_id_name, - switch_str_nil(caller_profile->caller_id_number)); - } else { - cid_buf = caller_profile->caller_id_number; - } - - if ((app_log = switch_core_session_get_app_log(session))) { - for (ap = app_log; ap && ap->next; ap = ap->next); - last_app = ap->app; - last_arg = ap->arg; - } - - if (caller_profile->times) { - switch_time_exp_t tm; - switch_size_t retsize; - const char *fmt = "%Y-%m-%d %T"; - - switch_time_exp_lt(&tm, caller_profile->times->created); - switch_strftime(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(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->answered); - switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); - switch_channel_set_variable(channel, "answer_stamp", answer); - - switch_time_exp_lt(&tm, caller_profile->times->hungup); - switch_strftime(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); - tt_prof_created = (time_t) (caller_profile->times->profile_created / 1000000); - mtt_prof_created = (time_t) (caller_profile->times->profile_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); - - 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_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); - - uduration = caller_profile->times->hungup - caller_profile->times->created; - duration = (int32_t)(tt_hungup - tt_created); - mduration = (int32_t)(mtt_hungup - mtt_created); - - 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; - } - } - - - 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", billsec); - switch_channel_set_variable(channel, "billsec", 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), "%" 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); - if (globals.debug) { switch_event_t *event; if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Dec 20 13:04:07 2007 @@ -964,6 +964,8 @@ caller_profile->times->answered = channel->caller_profile->times->answered; caller_profile->times->created = channel->caller_profile->times->created; caller_profile->times->hungup = channel->caller_profile->times->hungup; + } else { + caller_profile->times->created = switch_time_now(); } caller_profile->next = channel->caller_profile; @@ -1160,6 +1162,7 @@ if (channel->state < CS_HANGUP) { switch_event_t *event; switch_channel_state_t last_state = channel->state; + channel->state = CS_HANGUP; channel->hangup_cause = hangup_cause; switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", @@ -1175,6 +1178,8 @@ switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL); switch_core_session_signal_state_change(channel->session); + + switch_channel_set_timestamps(channel); } switch_mutex_unlock(channel->flag_mutex); @@ -1719,6 +1724,136 @@ return stream.data; } +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; + switch_caller_profile_t *caller_profile, *ocp; + switch_app_log_t *app_log, *ap; + char *last_app = NULL, *last_arg = NULL; + char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = ""; + int32_t duration = 0, legbillsec = 0, billsec = 0, mduration = 0, billmsec = 0, legbillmsec = 0; + switch_time_t uduration = 0, legbillusec = 0, billusec = 0; + time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; + + + caller_profile = switch_channel_get_caller_profile(channel); + if (!(ocp = switch_channel_get_originatee_caller_profile(channel))) { + ocp = switch_channel_get_originator_caller_profile(channel); + } + + if (!switch_strlen_zero(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)); + } else { + cid_buf = caller_profile->caller_id_number; + } + + 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; + } + + if (caller_profile->times) { + switch_time_exp_t tm; + switch_size_t retsize; + const char *fmt = "%Y-%m-%d %T"; + + switch_time_exp_lt(&tm, caller_profile->times->created); + switch_strftime(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(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->answered); + switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); + switch_channel_set_variable(channel, "answer_stamp", answer); + + switch_time_exp_lt(&tm, caller_profile->times->hungup); + switch_strftime(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); + tt_prof_created = (time_t) (caller_profile->times->profile_created / 1000000); + mtt_prof_created = (time_t) (caller_profile->times->profile_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); + + 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_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); + + uduration = caller_profile->times->hungup - caller_profile->times->created; + duration = (int32_t)(tt_hungup - tt_created); + mduration = (int32_t)(mtt_hungup - mtt_created); + + 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; + + legbillsec = (int32_t)(tt_hungup - tt_prof_created); + legbillmsec = (int32_t)(mtt_hungup - mtt_prof_created); + legbillusec = caller_profile->times->hungup - caller_profile->times->profile_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_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", 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", billmsec); + switch_channel_set_variable(channel, "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, billusec); + switch_channel_set_variable(channel, "billusec", tmp); + + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec); + switch_channel_set_variable(channel, "flow_billusec", tmp); + + return status; +} /* For Emacs: * Local Variables:

1 0

[commit] r6916 - in freeswitch/trunk/src: . include mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Thu Dec 20 12:27:11 2007 New Revision: 6916 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: cdr update Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Thu Dec 20 12:27:11 2007 @@ -41,6 +41,7 @@ #include <switch.h> SWITCH_BEGIN_EXTERN_C struct switch_channel_timetable { + switch_time_t profile_created; switch_time_t created; switch_time_t answered; switch_time_t hungup; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu Dec 20 12:27:11 2007 @@ -164,10 +164,10 @@ switch_app_log_t *app_log, *ap; char *last_app = NULL, *last_arg = NULL; - char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = ""; + char start[80] = "", answer[80] = "", end[80] = "", tmp[80] = "", profile_start[80] = ""; int32_t duration = 0, billsec = 0, mduration = 0, billmsec = 0; switch_time_t uduration = 0, billusec = 0; - time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0; + time_t tt_created = 0, tt_answered = 0, tt_hungup = 0, mtt_created = 0, mtt_answered = 0, mtt_hungup = 0, tt_prof_created, mtt_prof_created; if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; @@ -207,6 +207,10 @@ switch_strftime(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(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->answered); switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); switch_channel_set_variable(channel, "answer_stamp", answer); @@ -217,10 +221,17 @@ tt_created = (time_t) (caller_profile->times->created / 1000000); mtt_created = (time_t) (caller_profile->times->created / 1000); + tt_prof_created = (time_t) (caller_profile->times->profile_created / 1000000); + mtt_prof_created = (time_t) (caller_profile->times->profile_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); + + 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); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Dec 20 12:27:11 2007 @@ -957,11 +957,13 @@ } caller_profile->times = (switch_channel_timetable_t *) switch_core_session_alloc(channel->session, sizeof(*caller_profile->times)); - caller_profile->times->created = switch_time_now(); + caller_profile->times->profile_created = switch_time_now(); if (channel->caller_profile && channel->caller_profile->times) { - channel->caller_profile->times->transferred = caller_profile->times->created; + channel->caller_profile->times->transferred = caller_profile->times->profile_created; caller_profile->times->answered = channel->caller_profile->times->answered; + caller_profile->times->created = channel->caller_profile->times->created; + caller_profile->times->hungup = channel->caller_profile->times->hungup; } caller_profile->next = channel->caller_profile; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Dec 20 12:27:11 2007 @@ -1460,6 +1460,12 @@ switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->created); switch_xml_set_txt_d(time_tag, tmp); + if (!(time_tag = switch_xml_add_child_d(x_times, "profile_created_time", t_off++))) { + goto error; + } + switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, caller_profile->times->profile_created); + switch_xml_set_txt_d(time_tag, tmp); + if (!(time_tag = switch_xml_add_child_d(x_times, "answered_time", t_off++))) { goto error; }

1 0

[commit] r6915 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: trixter Date: Thu Dec 20 12:02:26 2007 New Revision: 6915 Added: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.php freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.xml Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README Log: added a cli/web test program Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/README Thu Dec 20 12:02:26 2007 @@ -24,3 +24,18 @@ <param name="logDir" value="/usr/local/freeswitch/log"/> </settings> + + + +TO TEST +there is an example XML_CDR record testcdr.xml which you can parse + +Web method: +cp testcdr.php Parse_XML_CDR.php testcdr.xml /path/to/htdocs +goto http://host/testcdr.php + +CLI method: +php testcdr.php + +The XML record is quite long and has many transfers, but this should +let you know how the array is formed so you can reference elements Added: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.php ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.php Thu Dec 20 12:02:26 2007 @@ -0,0 +1,27 @@ +<?php // -*- mode:c; tab-width:4; c-basic-offset:4; indent-tabs-mode:nil; -*- +include_once('Parse_XML_CDR.php'); +Header("Content-type: text/plain"); + +function read_file($filename) +{ + if ( file_exists($filename) && ($fd = @fopen($filename, 'rb')) ) { + $contents = ''; + while (!feof($fd)) { + $contents .= fread($fd, 8192); + } + fclose($fd); + return $contents; + } else { + return false; + } +} + +$xmlraw=read_file("testcdr.xml"); +if($xmlraw !== false) { + $xml = new Parse_CDR_XML($xmlraw); + $cdr=$xml->ReturnArray(); + print_r($cdr); + } else { + echo "Unable to read file"; + } +?> Added: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/testcdr.xml Thu Dec 20 12:02:26 2007 @@ -0,0 +1,1528 @@ +<?xml version="1.0"?> +<cdr> + <variables> + <sip_authorized>true</sip_authorized> + <sip_mailbox>1006</sip_mailbox> + <sip_auth_username>1006</sip_auth_username> + <sip_auth_realm>10.0.1.250</sip_auth_realm> + <mailbox>1006</mailbox> + <accountcode>1006</accountcode> + <user_context>default</user_context> + <effective_caller_id_name>Extension%201006</effective_caller_id_name> + <effective_caller_id_number>1006</effective_caller_id_number> + <sip_from_user>1006</sip_from_user> + <sip_from_port>5060</sip_from_port> + <sip_from_uri>1006%4010.0.1.250%3A5060</sip_from_uri> + <sip_from_host>10.0.1.250</sip_from_host> + <sip_from_user_stripped>1006</sip_from_user_stripped> + <sofia_profile_name>default</sofia_profile_name> + <sip_req_user>1009</sip_req_user> + <sip_req_port>5060</sip_req_port> + <sip_req_uri>1009%4010.0.1.250%3A5060</sip_req_uri> + <sip_req_host>10.0.1.250</sip_req_host> + <sip_to_user>1009</sip_to_user> + <sip_to_port>5060</sip_to_port> + <sip_to_uri>1009%4010.0.1.250%3A5060</sip_to_uri> + <sip_to_host>10.0.1.250</sip_to_host> + <sip_contact_user>1006</sip_contact_user> + <sip_contact_port>5060</sip_contact_port> + <sip_contact_uri>1006%4010.0.1.240%3A5060</sip_contact_uri> + <sip_contact_host>10.0.1.240</sip_contact_host> + <channel_name>sofia/default/1006%4010.0.1.250%3A5060</channel_name> + <sip_call_id>1f9e6333-e0128840-f539ae8d%4010.0.1.240</sip_call_id> + <sip_via_host>10.0.1.240</sip_via_host> + <sip_via_port>5060</sip_via_port> + <sip_via_rport>34699</sip_via_rport> + <max_forwards>70</max_forwards> + <presence_id>1006%4010.0.1.250</presence_id> + <switch_r_sdp>v%3D0%0D%0Ao%3D-%201198125579%201198125579%20IN%20IP4%2010.0.1.240%0D%0As%3DPolycom%20IP%20Phone%0D%0Ac%3DIN%20IP4%2010.0.1.240%0D%0At%3D0%200%0D%0Aa%3Dsendrecv%0D%0Am%3Daudio%202236%20RTP/AVP%209%200%208%2018%20101%0D%0Aa%3Drtpmap%3A9%20G722/8000%0D%0Aa%3Drtpmap%3A0%20PCMU/8000%0D%0Aa%3Drtpmap%3A8%20PCMA/8000%0D%0Aa%3Drtpmap%3A18%20G729/8000%0D%0Aa%3Drtpmap%3A101%20telephone-event/8000%0D%0A</switch_r_sdp> + <remote_media_ip>10.0.1.240</remote_media_ip> + <remote_media_port>2236</remote_media_port> + <read_codec>G722</read_codec> + <read_rate>16000</read_rate> + <write_codec>G722</write_codec> + <write_rate>16000</write_rate> + <local_media_ip>10.0.1.250</local_media_ip> + <local_media_port>2236</local_media_port> + <endpoint_disposition>ANSWER</endpoint_disposition> + <fifo_target>7fa22ce4-9487-4501-965e-7e062792f6c3</fifo_target> + <fifo_status>DONE</fifo_status> + <fifo_timestamp>2007-12-20%2007%3A20%3A20</fifo_timestamp> + <use_profile>nat</use_profile> + <numbering_plan>US</numbering_plan> + <default_gateway>asterlink.com</default_gateway> + <default_area_code>918</default_area_code> + <user_name>default</user_name> + <domain_name>10.0.1.250</domain_name> + <dialed_ext>1002</dialed_ext> + <call_timeout>130</call_timeout> + <hangup_after_bridge>true</hangup_after_bridge> + <left_hanging_extension>5900</left_hanging_extension> + <continue_on_fail>true</continue_on_fail> + <dialed_user>1002</dialed_user> + <dialed_domain>10.0.1.250</dialed_domain> + <switch_m_sdp>v%3D0%0D%0Ao%3D1002%208000%208000%20IN%20IP4%2010.0.1.5%0D%0As%3DSIP%20Call%0D%0Ac%3DIN%20IP4%2010.0.1.5%0D%0At%3D0%200%0D%0Am%3Daudio%205004%20RTP/AVP%200%20101%0D%0Aa%3Drtpmap%3A0%20PCMU/8000%0D%0Aa%3Drtpmap%3A101%20telephone-event/8000%0D%0Aa%3Dfmtp%3A101%200-11%0D%0Aa%3Dptime%3A20%0D%0A</switch_m_sdp> + <originate_disposition>SUCCESS</originate_disposition> + <bridge_channel>sofia/default/1002</bridge_channel> + <bridge_uuid>cf150cd3-af80-49b1-90c9-da7484e9b033</bridge_uuid> + <signal_bond>cf150cd3-af80-49b1-90c9-da7484e9b033</signal_bond> + <hangup_cause>NORMAL_CLEARING</hangup_cause> + <start_stamp>2007-12-20%2007%3A21%3A28</start_stamp> + <answer_stamp>2007-12-20%2007%3A19%3A34</answer_stamp> + <end_stamp>2007-12-20%2007%3A21%3A32</end_stamp> + <start_epoch>1198156888</start_epoch> + <start_uepoch>1198156888447769</start_uepoch> + <answer_epoch>1198156774</answer_epoch> + <answer_uepoch>1198156774875311</answer_uepoch> + <end_epoch>1198156892</end_epoch> + <end_uepoch>1198156892250109</end_uepoch> + <last_app>bridge</last_app> + <last_arg>USER/1002%4010.0.1.250</last_arg> + <caller_id>%22Brian%20West%22%20%3C1006%3E</caller_id> + <duration>4</duration> + <billsec>118</billsec> + <mduration>3803</mduration> + <billmsec>117375</billmsec> + <uduration>3802340</uduration> + <billusec>117374798</billusec> + </variables> + <app_log> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/5900"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="fifo" app_data="5900(a)10.0.1.250 in undef local_stream://moh"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1009"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1009/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1009/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1009(a)10.0.1.250"></application> + <application app_name="playback" app_data="local_stream://moh"></application> + <application app_name="set" app_data="use_profile=nat"></application> + <application app_name="set_user" app_data="default(a)10.0.1.250"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/1006/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="db" app_data="insert/last_dial/1006/1002"></application> + <application app_name="db" app_data="insert/last_dial/global/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/1002/1006"></application> + <application app_name="db" app_data="insert/last_dial_ext/1002/f1d9f5e9-1ccd-4df7-876e-adf6e3602361"></application> + <application app_name="bridge" app_data="USER/1002(a)10.0.1.250"></application> + </app_log> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>cf150cd3-af80-49b1-90c9-da7484e9b033</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>cf150cd3-af80-49b1-90c9-da7484e9b033</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156888447769</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>1198156892250109</hangup_time> + <transfer_time>0</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>4b8d3f9d-0bbd-48b3-b0e0-3a8eb9ead4d7</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>4b8d3f9d-0bbd-48b3-b0e0-3a8eb9ead4d7</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156885001861</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156888447769</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>c68e2ba8-12b8-417f-a919-4caa5437bd9a</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>c68e2ba8-12b8-417f-a919-4caa5437bd9a</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156880578019</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156885001861</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>073c1939-561c-466a-b652-a39ca2aae77a</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>073c1939-561c-466a-b652-a39ca2aae77a</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156876612260</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156880578019</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>2a3db176-a105-4a44-92f2-6e3ac7048d5b</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>2a3db176-a105-4a44-92f2-6e3ac7048d5b</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156839911708</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156876612260</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>a36354f8-4804-4f76-805b-fa0a0ca8903e</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>a36354f8-4804-4f76-805b-fa0a0ca8903e</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156833485893</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156839911708</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>d01dbfc2-d692-48b8-bb10-8b62127f43cd</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>d01dbfc2-d692-48b8-bb10-8b62127f43cd</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156820268791</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156833485893</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="5900"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="fifo" app_data="5900(a)10.0.1.250 in undef local_stream://moh"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>5900</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originator> + <originator_caller_profile> + <username>1009</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1009</caller_id_number> + <network_addr>10.0.1.28</network_addr> + <rdnis></rdnis> + <destination_number>**park+5900</destination_number> + <uuid>7fa22ce4-9487-4501-965e-7e062792f6c3</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009@10.0.1.250:5060</chan_name> + </originator_caller_profile> + </originator> + </caller_profile> + <times> + <created_time>1198156812978484</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156820268791</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>22b5e34f-d334-40fe-b7e7-9ca54b2a7160</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>22b5e34f-d334-40fe-b7e7-9ca54b2a7160</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156806464364</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156812978484</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>6070e39b-71a4-4872-a851-a8c9ac45488d</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>6070e39b-71a4-4872-a851-a8c9ac45488d</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156801337500</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156806464364</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>a95fdc9d-1f64-4962-acb8-a26507c9d224</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>a95fdc9d-1f64-4962-acb8-a26507c9d224</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156797434745</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156801337500</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>a5dfe2cc-7754-4a82-a645-231a15decb3f</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>a5dfe2cc-7754-4a82-a645-231a15decb3f</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156792878476</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156797434745</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>fec1ae9e-546c-4cc5-b22a-55dc997a0e35</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>fec1ae9e-546c-4cc5-b22a-55dc997a0e35</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156788685547</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156792878476</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>4aa48010-4595-461c-936a-179f9fb4d1f3</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>4aa48010-4595-461c-936a-179f9fb4d1f3</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156784428990</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156788685547</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1002" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1002"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1002 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1002</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>545f4ba0-5978-4b41-892f-aca78f174a91</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1002</destination_number> + <uuid>545f4ba0-5978-4b41-892f-aca78f174a91</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1002</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156778376001</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156784428990</transfer_time> + </times> + </callflow> + <callflow dialplan="XML"> + <extension name="global" number="1009" current_app="answer"> + <application app_name="set" app_data="use_profile=${cond(${is_lan_addr(10.0.1.250)} == yes ? nat : default)}"></application> + <application app_name="set_user" app_data="default@${domain}"></application> + <application app_name="info" app_data=""></application> + <application app_name="db" app_data="insert/spymap/${caller_id_number}/${uuid}"></application> + <application app_name="db" app_data="insert/last_dial/${caller_id_number}/${destination_number}"></application> + <application app_name="db" app_data="insert/last_dial/global/${uuid}"></application> + <application app_name="set" app_data="dialed_ext=1009"></application> + <application app_name="ring_ready" app_data=""></application> + <application app_name="set" app_data="call_timeout=130"></application> + <application app_name="set" app_data="hangup_after_bridge=true"></application> + <application app_name="set" app_data="left_hanging_extension=5900"></application> + <application app_name="set" app_data="continue_on_fail=true"></application> + <application app_name="db" app_data="insert/call_return/${dialed_ext}/${caller_id_number}"></application> + <application app_name="db" app_data="insert/last_dial_ext/${dialed_ext}/${uuid}"></application> + <application app_name="bridge" app_data="USER/${dialed_ext}(a)10.0.1.250"></application> + <application last_executed="true" app_name="answer" app_data=""></application> + <application app_name="sleep" app_data="1000"></application> + <application app_name="voicemail" app_data="default 10.0.1.250 ${dialed_ext}"></application> + <application app_name="transfer" app_data="1009 enum"></application> + </extension> + <caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Brian West</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>1009</destination_number> + <uuid>f1d9f5e9-1ccd-4df7-876e-adf6e3602361</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1006@10.0.1.250:5060</chan_name> + <originatee> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>efb71d06-c38c-4af9-a4bd-c5a23b501689</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + <originatee_caller_profile> + <username>1006</username> + <dialplan>XML</dialplan> + <caller_id_name>Extension 1006</caller_id_name> + <ani></ani> + <aniii></aniii> + <caller_id_number>1006</caller_id_number> + <network_addr>10.0.1.240</network_addr> + <rdnis></rdnis> + <destination_number>10.0.1.250/1009</destination_number> + <uuid>efb71d06-c38c-4af9-a4bd-c5a23b501689</uuid> + <source>mod_sofia</source> + <context>default</context> + <chan_name>sofia/default/1009</chan_name> + </originatee_caller_profile> + </originatee> + </caller_profile> + <times> + <created_time>1198156772841382</created_time> + <answered_time>1198156774875311</answered_time> + <hangup_time>0</hangup_time> + <transfer_time>1198156778376001</transfer_time> + </times> + </callflow> +</cdr>

1 0

[commit] r6914 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: trixter Date: Thu Dec 20 11:49:46 2007 New Revision: 6914 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Log: bug fix for multiple caller profiles Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Thu Dec 20 11:49:46 2007 @@ -65,7 +65,7 @@ } break; case "callflow": - $this->_CDR[$name]=array(); + if(!is_array($this->_CDR[$name])) { $this->_CDR[$name]=array(); } $this->currentTag = $name; foreach ($attrs as $key => $value) { $this->_CDR[$this->currentTag][$this->_callflowcnt][$key]=$value;

1 0

[commit] r6913 - in freeswitch/trunk/src: . include mod/endpoints/mod_dingaling mod/endpoints/mod_sofia
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Thu Dec 20 10:41:45 2007 New Revision: 6913 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: add more code to free rtp ports Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Thu Dec 20 10:41:45 2007 @@ -75,7 +75,7 @@ \return the new port to use */ SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip); - +SWITCH_DECLARE(void) switch_rtp_release_port(const char *ip, switch_port_t port); /*! \brief create a new RTP session handle \param new_rtp_session a poiter to aim at the new session Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Dec 20 10:41:45 2007 @@ -687,6 +687,11 @@ tech_pvt = switch_core_session_get_private(*session); + + if (tech_pvt->profile->ip && tech_pvt->local_port) { + switch_rtp_release_port(tech_pvt->profile->ip, tech_pvt->local_port); + } + if (!switch_core_session_running(*session) && (!tech_pvt || !switch_test_flag(tech_pvt, TFLAG_READY))) { switch_core_session_destroy(session); return; @@ -1209,6 +1214,10 @@ tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); + if (tech_pvt->profile->ip && tech_pvt->local_port) { + switch_rtp_release_port(tech_pvt->profile->ip, tech_pvt->local_port); + } + switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); switch_set_flag_locked(tech_pvt, TFLAG_BYE); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Dec 20 10:41:45 2007 @@ -201,7 +201,10 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); - + + if (tech_pvt->profile->rtpip && tech_pvt->local_sdp_audio_port) { + switch_rtp_release_port(tech_pvt->profile->rtpip, tech_pvt->local_sdp_audio_port); + } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { const char *buuid; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Dec 20 10:41:45 2007 @@ -316,16 +316,16 @@ return END_PORT; } -static void release_port(const char *host, switch_port_t port) +SWITCH_DECLARE(void) switch_rtp_release_port(const char *ip, switch_port_t port) { switch_core_port_allocator_t *alloc = NULL; - if (!host) { + if (!ip) { return; } switch_mutex_lock(port_lock); - if ((alloc = switch_core_hash_find(alloc_hash, host))) { + if ((alloc = switch_core_hash_find(alloc_hash, ip))) { switch_core_port_allocator_free_port(alloc, port); } switch_mutex_unlock(port_lock); @@ -634,7 +634,7 @@ rtp_session->rx_host = switch_core_strdup(rtp_session->pool, rx_host); rtp_session->rx_port = rx_port; } else { - release_port(rx_host, rx_port); + switch_rtp_release_port(rx_host, rx_port); } return rtp_session; @@ -731,7 +731,7 @@ switch_core_timer_destroy(&(*rtp_session)->timer); } - release_port((*rtp_session)->rx_host, (*rtp_session)->rx_port); + switch_rtp_release_port((*rtp_session)->rx_host, (*rtp_session)->rx_port); switch_mutex_unlock((*rtp_session)->flag_mutex); return;

1 0

[commit] r6912 - freeswitch/trunk/src
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: anthm Date: Wed Dec 19 22:30:27 2007 New Revision: 6912 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: more stuff Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Dec 19 22:30:27 2007 @@ -653,7 +653,10 @@ switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); //make sure this doesnt break anything - switch_channel_set_state(peer_channel, CS_RESET); + + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) == CS_LOOPBACK) { + switch_channel_set_state(peer_channel, CS_RESET); + } while (switch_channel_get_state(peer_channel) == CS_LOOPBACK) { switch_yield(1000); }

1 0

[commit] r6911 - in freeswitch/trunk/src: include mod/dialplans/mod_dialplan_asterisk
by Freeswitch SVN 20 Dec '07

20 Dec '07

Author: mikej Date: Wed Dec 19 22:07:00 2007 New Revision: 6911 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Log: add more function details for code analysis. Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Wed Dec 19 22:07:00 2007 @@ -137,7 +137,9 @@ \param extension_number extension number \return a new extension object allocated from the session's memory pool */ -SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(switch_core_session_t *session, const char *extension_name, const char *extension_number); +SWITCH_DECLARE(switch_caller_extension_t *) switch_caller_extension_new(_In_ switch_core_session_t *session, + _In_z_ const char *extension_name, + _In_z_ const char *extension_number); /*! \brief Add an application (instruction) to the given extension @@ -146,8 +148,10 @@ \param application_name the name of the application \param extra_data optional argument to the application */ -SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session_t *session, - switch_caller_extension_t *caller_extension, const char *application_name, const char *extra_data); +SWITCH_DECLARE(void) switch_caller_extension_add_application(_In_ switch_core_session_t *session, + _In_ switch_caller_extension_t *caller_extension, + _In_z_ const char *application_name, + _In_z_ const char *extra_data); /*! @@ -156,7 +160,8 @@ \param name the name \note this function is meant for situations where the name paramater is the contents of the variable */ -SWITCH_DECLARE(const char *) switch_caller_get_field_by_name(switch_caller_profile_t *caller_profile, const char *name); +_Check_return_ _Ret_opt_z_ SWITCH_DECLARE(const char *) switch_caller_get_field_by_name(_In_ switch_caller_profile_t *caller_profile, + _In_z_ const char *name); /*! \brief Create a new caller profile object @@ -174,30 +179,32 @@ \param destination_number destination number \return a new profile object allocated from the session's memory pool */ -SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, - const char *username, - const char *dialplan, - const char *caller_id_name, - const char *caller_id_number, - const char *network_addr, - const char *ani, - const char *aniii, - const char *rdnis, const char *source, const char *context, - const char *destination_number); +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(_In_ switch_memory_pool_t *pool, + _In_opt_z_ const char *username, + _In_opt_z_ const char *dialplan, + _In_opt_z_ const char *caller_id_name, + _In_opt_z_ const char *caller_id_number, + _In_opt_z_ const char *network_addr, + _In_opt_z_ const char *ani, + _In_opt_z_ const char *aniii, + _In_opt_z_ const char *rdnis, + _In_opt_z_ const char *source, + _In_opt_z_ const char *context, + _In_opt_z_ const char *destination_number); /*! \brief Clone an existing caller profile object \param session session associated with the profile (bound by scope) \param tocopy the existing profile */ -SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_core_session_t *session, switch_caller_profile_t *tocopy); +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(_In_ switch_core_session_t *session, _In_ switch_caller_profile_t *tocopy); /*! \brief Duplicate an existing caller profile object \param pool pool to duplicate with \param tocopy the existing profile */ -SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(switch_memory_pool_t *pool, switch_caller_profile_t *tocopy); +SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_dup(_In_ switch_memory_pool_t *pool, _In_ switch_caller_profile_t *tocopy); /*! \brief Add headers to an existing event in regards to a specific profile @@ -206,7 +213,9 @@ \param event the event to add the information to */ -SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, const char *prefix, switch_event_t *event); +SWITCH_DECLARE(void) switch_caller_profile_event_set_data(_In_ switch_caller_profile_t *caller_profile, + _In_opt_z_ const char *prefix, + _In_ switch_event_t *event); SWITCH_END_EXTERN_C /** @} */ Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Dec 19 22:07:00 2007 @@ -128,49 +128,52 @@ \param new_bug pointer to assign new bug to \return SWITCH_STATUS_SUCCESS if the operation was a success */ -SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(switch_core_session_t *session, - switch_media_bug_callback_t callback, - void *user_data, time_t stop_time, switch_media_bug_flag_t flags, switch_media_bug_t **new_bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_add(_In_ switch_core_session_t *session, + _In_ switch_media_bug_callback_t callback, + _In_opt_ void *user_data, + _In_ time_t stop_time, + _In_ switch_media_bug_flag_t flags, + _Out_ switch_media_bug_t **new_bug); /*! \brief Obtain private data from a media bug \param bug the bug to get the data from \return the private data */ -SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug); +SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(_In_ switch_media_bug_t *bug); /*! \brief Obtain a replace frame from a media bug \param bug the bug to get the data from */ -SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(switch_media_bug_t *bug); +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_write_replace_frame(_In_ switch_media_bug_t *bug); /*! \brief Set a return replace frame \param bug the bug to set the frame on \param frame the frame to set */ -SWITCH_DECLARE(void) switch_core_media_bug_set_write_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); +SWITCH_DECLARE(void) switch_core_media_bug_set_write_replace_frame(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); /*! \brief Obtain a replace frame from a media bug \param bug the bug to get the data from */ -SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_read_replace_frame(switch_media_bug_t *bug); +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_read_replace_frame(_In_ switch_media_bug_t *bug); /*! \brief Obtain the session from a media bug \param bug the bug to get the data from */ -SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(switch_media_bug_t *bug); +SWITCH_DECLARE(switch_core_session_t *) switch_core_media_bug_get_session(_In_ switch_media_bug_t *bug); -SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(switch_media_bug_t *bug, uint32_t flag); +SWITCH_DECLARE(uint32_t) switch_core_media_bug_test_flag(_In_ switch_media_bug_t *bug, _In_ uint32_t flag); /*! \brief Set a return replace frame \param bug the bug to set the frame on \param frame the frame to set */ -SWITCH_DECLARE(void) switch_core_media_bug_set_read_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); +SWITCH_DECLARE(void) switch_core_media_bug_set_read_replace_frame(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); /*! \brief Remove a media bug from the session @@ -178,20 +181,20 @@ \param bug bug to remove \return SWITCH_STATUS_SUCCESS if the operation was a success */ -SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(switch_core_session_t *session, switch_media_bug_t **bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug); /*! \brief Close and destroy a media bug \param bug bug to remove \return SWITCH_STATUS_SUCCESS if the operation was a success */ -SWITCH_DECLARE(switch_status_t) switch_core_media_bug_close(switch_media_bug_t **bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_close(_Inout_ switch_media_bug_t **bug); /*! \brief Remove all media bugs from the session \param session the session to remove the bugs from \return SWITCH_STATUS_SUCCESS if the operation was a success */ -SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(switch_core_session_t *session); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(_In_ switch_core_session_t *session); /*! \brief Read a frame from the bug @@ -199,7 +202,7 @@ \param frame the frame to write the data to \return the amount of data */ -SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); ///\} Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Wed Dec 19 22:07:00 2007 @@ -303,10 +303,14 @@ #define _In_ #define _In_z_ #define _In_opt_z_ +#define _In_opt_ #define _Printf_format_string_ #define _Ret_opt_z_ #define _Ret_z_ +#define _Out_opt_ +#define _Out_ #define _Check_return_ +#define _Inout_ #endif Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Wed Dec 19 22:07:00 2007 @@ -282,6 +282,10 @@ switch_regex_safe_free(re); if (!extension) { + if (switch_strlen_zero(field_data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No extension!\n"); + break; + } if ((extension = switch_caller_extension_new(session, field_data, field_data)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); break;

1 0