CHANNEL(callid): Give dialplan access to the callid.
[asterisk/asterisk.git] / funcs / func_cdr.c
index 2d120bb..83942db 100644 (file)
@@ -31,8 +31,6 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/module.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
@@ -180,7 +178,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                                <para>Write-Only</para>
                                        </enum>
                                        <enum name="disable">
-                                               <para>Disable CDRs for this channel.</para>
+                                               <para>Setting to 1 will disable CDRs for this channel.
+                                               Setting to 0 will enable CDRs for this channel.</para>
                                                <para>Write-Only</para>
                                        </enum>
                                </enumlist>
@@ -220,6 +219,32 @@ STASIS_MESSAGE_TYPE_DEFN_LOCAL(cdr_read_message_type);
 STASIS_MESSAGE_TYPE_DEFN_LOCAL(cdr_write_message_type);
 STASIS_MESSAGE_TYPE_DEFN_LOCAL(cdr_prop_write_message_type);
 
+static struct timeval cdr_retrieve_time(struct ast_channel *chan, const char *time_name)
+{
+       struct timeval time = { 0 };
+       char *value = NULL;
+       char tempbuf[128];
+       long int tv_sec;
+       long int tv_usec;
+
+       if (ast_strlen_zero(ast_channel_name(chan))) {
+               /* Format request on a dummy channel */
+               ast_cdr_format_var(ast_channel_cdr(chan), time_name, &value, tempbuf, sizeof(tempbuf), 1);
+       } else {
+               ast_cdr_getvar(ast_channel_name(chan), time_name, tempbuf, sizeof(tempbuf));
+       }
+
+       /* time.tv_usec is suseconds_t, which could be int or long */
+       if (sscanf(tempbuf, "%ld.%ld", &tv_sec, &tv_usec) == 2) {
+               time.tv_sec = tv_sec;
+               time.tv_usec = tv_usec;
+       } else {
+               ast_log(AST_LOG_WARNING, "Failed to fully extract '%s' from CDR\n", time_name);
+       }
+
+       return time;
+}
+
 static void cdr_read_callback(void *data, struct stasis_subscription *sub, struct stasis_message *message)
 {
        struct cdr_func_payload *payload = stasis_message_data(message);
@@ -267,16 +292,21 @@ static void cdr_read_callback(void *data, struct stasis_subscription *sub, struc
 
        if (ast_test_flag(&flags, OPT_FLOAT)
                && (!strcasecmp("billsec", args.variable) || !strcasecmp("duration", args.variable))) {
-               long ms;
-               double dtime;
+               struct timeval start = cdr_retrieve_time(payload->chan, !strcasecmp("billsec", args.variable) ? "answer" : "start");
+               struct timeval finish = cdr_retrieve_time(payload->chan, "end");
+               double delta;
 
-               if (sscanf(tempbuf, "%30ld", &ms) != 1) {
-                       ast_log(AST_LOG_WARNING, "Unable to parse %s (%s) from the CDR for channel %s\n",
-                               args.variable, tempbuf, ast_channel_name(payload->chan));
-                       return;
+               if (ast_tvzero(finish)) {
+                       finish = ast_tvnow();
                }
-               dtime = (double)(ms / 1000.0);
-               snprintf(tempbuf, sizeof(tempbuf), "%lf", dtime);
+
+               if (ast_tvzero(start)) {
+                       delta = 0.0;
+               } else {
+                       delta = (double)(ast_tvdiff_us(finish, start) / 1000000.0);
+               }
+               snprintf(tempbuf, sizeof(tempbuf), "%lf", delta);
+
        } else if (!ast_test_flag(&flags, OPT_UNPARSED)) {
                if (!strcasecmp("start", args.variable)
                        || !strcasecmp("end", args.variable)
@@ -284,14 +314,16 @@ static void cdr_read_callback(void *data, struct stasis_subscription *sub, struc
                        struct timeval fmt_time;
                        struct ast_tm tm;
                        /* tv_usec is suseconds_t, which could be int or long */
+                       long int tv_sec;
                        long int tv_usec;
 
-                       if (sscanf(tempbuf, "%ld.%ld", &fmt_time.tv_sec, &tv_usec) != 2) {
+                       if (sscanf(tempbuf, "%ld.%ld", &tv_sec, &tv_usec) != 2) {
                                ast_log(AST_LOG_WARNING, "Unable to parse %s (%s) from the CDR for channel %s\n",
                                        args.variable, tempbuf, ast_channel_name(payload->chan));
                                return;
                        }
-                       if (fmt_time.tv_sec) {
+                       if (tv_sec) {
+                               fmt_time.tv_sec = tv_sec;
                                fmt_time.tv_usec = tv_usec;
                                ast_localtime(&fmt_time, &tm, NULL);
                                ast_strftime(tempbuf, sizeof(tempbuf), "%Y-%m-%d %T", &tm);