Make cdr_mysql compile again by not directly setting the run-time CDR object
authorMatthew Jordan <mjordan@digium.com>
Mon, 17 Jun 2013 03:31:19 +0000 (03:31 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 17 Jun 2013 03:31:19 +0000 (03:31 +0000)
A stray ast_cdr_setvar was missed in cdr_mysql (silly addons). This has now
been refactored to not set the property, as the property would have been set
on a run-time object that was already dispatched to the backend. The module
simply remembers the value it wanted to set and writes it to MySQL later
in the processing.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391964 65c4cc65-6c06-0410-ace0-fbb531ad65f3

addons/cdr_mysql.c

index 23e96c5..25b55b3 100644 (file)
@@ -251,7 +251,7 @@ db_reconnect:
                                        char timestr[128];
                                        ast_localtime(&tv, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL);
                                        ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %T", &tm);
-                                       ast_cdr_setvar(cdr, "calldate", timestr);
+                                       value = ast_strdupa(timestr);
                                        cdrname = "calldate";
                                } else {
                                        cdrname = "start";
@@ -278,6 +278,8 @@ db_reconnect:
                                 strstr(entry->type, "numeric") ||
                                 strstr(entry->type, "fixed"))) {
                                ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 1);
+                       } else if (!strcmp(cdrname, "calldate")) {
+                               /* Skip calldate - the value has already been dup'd */
                        } else {
                                ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 0);
                        }