[Freeswitch-svn] [commit] r6917 - in freeswitch/trunk/src: . include mod/event_handlers/mod_cdr_csv
Freeswitch SVN
anthm at freeswitch.org
Thu Dec 20 13:04:08 EST 2007
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:
More information about the Freeswitch-svn
mailing list