[asterisk-commits] murf: trunk r70122 - in /trunk: cdr/ configs/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jun 19 15:38:22 CDT 2007
Author: murf
Date: Tue Jun 19 15:38:21 2007
New Revision: 70122
URL: http://svn.digium.com/view/asterisk?view=rev&rev=70122
Log:
This enhancement provided via bug 9993, a patch to upgrade cdr_manager to have cdr_custom capabilities. Many thanks to eserra for this contribution
Modified:
trunk/cdr/cdr_manager.c
trunk/configs/cdr_manager.conf.sample
Modified: trunk/cdr/cdr_manager.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_manager.c?view=diff&rev=70122&r1=70121&r2=70122
==============================================================================
--- trunk/cdr/cdr_manager.c (original)
+++ trunk/cdr/cdr_manager.c Tue Jun 19 15:38:21 2007
@@ -41,29 +41,34 @@
#include "asterisk/utils.h"
#include "asterisk/manager.h"
#include "asterisk/config.h"
+#include "asterisk/pbx.h"
#define DATE_FORMAT "%Y-%m-%d %T"
#define CONF_FILE "cdr_manager.conf"
+#define CUSTOM_FIELDS_BUF_SIZE 1024
static char *name = "cdr_manager";
static int enablecdr = 0;
-
-static int loadconfigurationfile(void)
-{
- char *cat;
+struct ast_str *customfields;
+
+static int load_config(void)
+{
+ char *cat = NULL;
struct ast_config *cfg;
struct ast_variable *v;
+ customfields = NULL;
+
cfg = ast_config_load(CONF_FILE);
if (!cfg) {
/* Standard configuration */
+ ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n");
enablecdr = 0;
return 0;
}
- cat = ast_category_browse(cfg, NULL);
- while (cat) {
+ while ( (cat = ast_category_browse(cfg, cat)) ) {
if (!strcasecmp(cat, "general")) {
v = ast_variable_browse(cfg, cat);
while (v) {
@@ -73,10 +78,23 @@
v = v->next;
}
+ } else if (!strcasecmp(cat, "mappings")) {
+ customfields = ast_str_create(CUSTOM_FIELDS_BUF_SIZE);
+ v = ast_variable_browse(cfg, cat);
+ while (v) {
+ if (customfields && !ast_strlen_zero(v->name) && !ast_strlen_zero(v->value)) {
+ if( (customfields->used + strlen(v->value) + strlen(v->name) + 14) < customfields->len) {
+ ast_str_append(&customfields, -1, "%s: ${CDR(%s)}\r\n", v->value, v->name);
+ ast_log(LOG_NOTICE, "Added mapping %s: ${CDR(%s)}\n", v->value, v->name);
+ } else {
+ ast_log(LOG_WARNING, "No more buffer space to add other custom fields\n");
+ break;
+ }
+
+ }
+ v = v->next;
+ }
}
-
- /* Next category */
- cat = ast_category_browse(cfg, cat);
}
ast_config_destroy(cfg);
@@ -90,7 +108,9 @@
char strStartTime[80] = "";
char strAnswerTime[80] = "";
char strEndTime[80] = "";
-
+ char buf[CUSTOM_FIELDS_BUF_SIZE];
+ struct ast_channel dummy;
+
if (!enablecdr)
return 0;
@@ -107,6 +127,14 @@
t = cdr->end.tv_sec;
ast_localtime(&t, &timeresult, NULL);
strftime(strEndTime, sizeof(strEndTime), DATE_FORMAT, &timeresult);
+
+ /* Custom fields handling */
+ memset(buf, 0 , sizeof(buf));
+ if (customfields != NULL && customfields->used > 0) {
+ memset(&dummy, 0, sizeof(dummy));
+ dummy.cdr = cdr;
+ pbx_substitute_variables_helper(&dummy, customfields->str, buf, sizeof(buf) - 1);
+ }
manager_event(EVENT_FLAG_CALL, "Cdr",
"AccountCode: %s\r\n"
@@ -126,18 +154,22 @@
"Disposition: %s\r\n"
"AMAFlags: %s\r\n"
"UniqueID: %s\r\n"
- "UserField: %s\r\n",
+ "UserField: %s\r\n"
+ "%s",
cdr->accountcode, cdr->src, cdr->dst, cdr->dcontext, cdr->clid, cdr->channel,
cdr->dstchannel, cdr->lastapp, cdr->lastdata, strStartTime, strAnswerTime, strEndTime,
- cdr->duration, cdr->billsec, ast_cdr_disp2str(cdr->disposition),
- ast_cdr_flags2str(cdr->amaflags), cdr->uniqueid, cdr->userfield);
-
+ cdr->duration, cdr->billsec, ast_cdr_disp2str(cdr->disposition),
+ ast_cdr_flags2str(cdr->amaflags), cdr->uniqueid, cdr->userfield,buf);
+
return 0;
}
static int unload_module(void)
{
ast_cdr_unregister(name);
+ if (customfields)
+ ast_free(customfields);
+
return 0;
}
@@ -146,7 +178,7 @@
int res;
/* Configuration file */
- if (!loadconfigurationfile())
+ if (!load_config())
return AST_MODULE_LOAD_DECLINE;
res = ast_cdr_register(name, "Asterisk Manager Interface CDR Backend", manager_log);
@@ -159,7 +191,11 @@
static int reload(void)
{
- loadconfigurationfile();
+ if (customfields) {
+ ast_free(customfields);
+ }
+
+ load_config();
return 0;
}
Modified: trunk/configs/cdr_manager.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/cdr_manager.conf.sample?view=diff&rev=70122&r1=70121&r2=70122
==============================================================================
--- trunk/configs/cdr_manager.conf.sample (original)
+++ trunk/configs/cdr_manager.conf.sample Tue Jun 19 15:38:21 2007
@@ -4,3 +4,12 @@
[general]
enabled = no
+; The "mappings" category can be used to define additional "key: value" pairs
+; that will be included in the manager event. (after AccountCode, Source, etc).
+;
+; Each line like "varname => label" will include a "label: ${CDR(varname)}"
+; in the generated event where ${CDR(varname)} its replaced with its value
+;
+;[mappings]
+;rate => Rate
+;carrier => Carrier
More information about the asterisk-commits
mailing list