kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove inconsistency in CEL eventtype for user defined events.

Browse Source 
The CEL eventtype field for ODBC and PGSQL backends should be USER_DEFINED
instead of the user defined event name supplied by the CELGenUserEvent
application.  If the field is output as a number, the user defined name
does not have a value and is always output as 21 for USER_DEFINED and the
userdeftype field would be required to supply the user defined name.

The following CEL backends (cel_odbc, cel_pgsql, cel_custom, cel_manager,
and cel_sqlite3_custom) can be independently configured to remove this
inconsistency.

* Allows cel_manager, cel_custom, and cel_sqlite3_custom to behave the
same way.

(closes issue ASTERISK-17189)
Reported by: Bryant Zimmerman

Review: https://reviewboard.asterisk.org/r/1669/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-02-01 17:42:15 +00:00
parent a99b3c817b
commit 797d633139
10 changed files with 119 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cel/cel_manager.c
View File

@@ -49,14 +49,25 @@ static const char DATE_FORMAT[] = "%Y-%m-%d %T";
static const char CONF_FILE[] = "cel.conf";
/*! \brief AMI CEL is off by default */
#define CEL_AMI_ENABLED_DEFAULT 0
static int enablecel;
/*! \brief show_user_def is off by default */
#define CEL_SHOW_USERDEF_DEFAULT 0
/*! TRUE if we should set the EventName header to USER_DEFINED on user events. */
static unsigned char cel_show_user_def;
static struct ast_event_sub *event_sub;
static void manager_log(const struct ast_event *event, void *userdata)
{
struct ast_tm timeresult;
char start_time[80] = "";
char user_defined_header[160];
const char *event_name;
struct ast_cel_event_record record = {
.version = AST_CEL_EVENT_RECORD_VERSION,
};
@@ -72,6 +83,17 @@ static void manager_log(const struct ast_event *event, void *userdata)
ast_localtime(&record.event_time, &timeresult, NULL);
ast_strftime(start_time, sizeof(start_time), DATE_FORMAT, &timeresult);
event_name = record.event_name;
user_defined_header[0] = '\0';
if (record.event_type == AST_CEL_USER_DEFINED) {
if (cel_show_user_def) {
snprintf(user_defined_header, sizeof(user_defined_header),
"UserDefType: %s\r\n", record.user_defined_name);
} else {
event_name = record.user_defined_name;
}
}
manager_event(EVENT_FLAG_CALL, "CEL",
"EventName: %s\r\n"
"AccountCode: %s\r\n"
@@ -92,8 +114,9 @@ static void manager_log(const struct ast_event *event, void *userdata)
"Userfield: %s\r\n"
"Peer: %s\r\n"
"PeerAccount: %s\r\n"
"%s"
"Extra: %s\r\n",
record.event_name,
event_name,
record.account_code,
record.caller_id_num,
record.caller_id_name,
@@ -112,6 +135,7 @@ static void manager_log(const struct ast_event *event, void *userdata)
record.user_field,
record.peer,
record.peer_account,
user_defined_header,
record.extra);
}
@@ -121,7 +145,8 @@ static int load_config(int reload)
struct ast_config *cfg;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_variable *v;
int newenablecel = 0;
int newenablecel = CEL_AMI_ENABLED_DEFAULT;
int new_cel_show_user_def = CEL_SHOW_USERDEF_DEFAULT;
cfg = ast_config_load(CONF_FILE, config_flags);
if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
@@ -141,7 +166,9 @@ static int load_config(int reload)
for (v = ast_variable_browse(cfg, cat); v; v = v->next) {
if (!strcasecmp(v->name, "enabled")) {
newenablecel = ast_true(v->value);
newenablecel = ast_true(v->value) ? 1 : 0;
} else if (!strcasecmp(v->name, "show_user_defined")) {
new_cel_show_user_def = ast_true(v->value) ? 1 : 0;
} else {
ast_log(LOG_NOTICE, "Unknown option '%s' specified "
"for cel_manager.\n", v->name);
@@ -151,6 +178,7 @@ static int load_config(int reload)
ast_config_destroy(cfg);
cel_show_user_def = new_cel_show_user_def;
if (enablecel && !newenablecel) {
if (event_sub) {
event_sub = ast_event_unsubscribe(event_sub);

26
cel/cel_odbc.c
View File

@@ -53,6 +53,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define CONFIG "cel_odbc.conf"
static struct ast_event_sub *event_sub = NULL;
/*! \brief show_user_def is off by default */
#define CEL_SHOW_USERDEF_DEFAULT 0
/*! TRUE if we should set the eventtype field to USER_DEFINED on user events. */
static unsigned char cel_show_user_def;
/* Optimization to reduce number of memory allocations */
static int maxsize = 512, maxsize2 = 512;
@@ -103,7 +109,20 @@ static int load_config(void)
return -1;
}
/* Process the general category */
cel_show_user_def = CEL_SHOW_USERDEF_DEFAULT;
for (var = ast_variable_browse(cfg, "general"); var; var = var->next) {
if (!strcasecmp(var->name, "show_user_defined")) {
cel_show_user_def = ast_true(var->value) ? 1 : 0;
} else {
/* Unknown option name. */
}
}
for (catg = ast_category_browse(cfg, NULL); catg; catg = ast_category_browse(cfg, catg)) {
if (!strcasecmp(catg, "general")) {
continue;
}
var = ast_variable_browse(cfg, catg);
if (!var)
continue;
@@ -476,7 +495,12 @@ static void odbc_log(const struct ast_event *event, void *userdata)
* form (but only when we're dealing with a character-based field).
*/
if (strcasecmp(entry->name, "eventtype") == 0) {
snprintf(colbuf, sizeof(colbuf), "%s", record.event_name);
const char *event_name;
event_name = (!cel_show_user_def
&& record.event_type == AST_CEL_USER_DEFINED)
? record.user_defined_name : record.event_name;
snprintf(colbuf, sizeof(colbuf), "%s", event_name);
}
/* Truncate too-long fields */

33
cel/cel_pgsql.c
View File

@@ -63,6 +63,12 @@ static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword
static int connected = 0;
static int maxsize = 512, maxsize2 = 512;
/*! \brief show_user_def is off by default */
#define CEL_SHOW_USERDEF_DEFAULT 0
/*! TRUE if we should set the eventtype field to USER_DEFINED on user events. */
static unsigned char cel_show_user_def;
AST_MUTEX_DEFINE_STATIC(pgsql_lock);
static PGconn *conn = NULL;
@@ -70,12 +76,12 @@ static PGresult *result = NULL;
static struct ast_event_sub *event_sub = NULL;
struct columns {
char *name;
char *type;
int len;
unsigned int notnull:1;
unsigned int hasdefault:1;
AST_RWLIST_ENTRY(columns) list;
char *name;
char *type;
int len;
unsigned int notnull:1;
unsigned int hasdefault:1;
AST_RWLIST_ENTRY(columns) list;
};
static AST_RWLIST_HEAD_STATIC(psql_columns, columns);
@@ -185,8 +191,13 @@ static void pgsql_log(const struct ast_event *event, void *userdata)
ast_str_append(&sql2, 0, "%s%f", SEP, (double) record.event_type);
} else {
/* Char field, probably */
LENGTHEN_BUF2(strlen(record.event_name) + 1);
ast_str_append(&sql2, 0, "%s'%s'", SEP, record.event_name);
const char *event_name;
event_name = (!cel_show_user_def
&& record.event_type == AST_CEL_USER_DEFINED)
? record.user_defined_name : record.event_name;
LENGTHEN_BUF2(strlen(event_name) + 1);
ast_str_append(&sql2, 0, "%s'%s'", SEP, event_name);
}
} else if (strcmp(cur->name, "amaflags") == 0) {
if (strncmp(cur->type, "int", 3) == 0) {
@@ -449,6 +460,10 @@ static int process_my_load_module(struct ast_config *cfg)
if (!(table = ast_strdup(tmp))) {
return AST_MODULE_LOAD_DECLINE;
}
cel_show_user_def = CEL_SHOW_USERDEF_DEFAULT;
if ((tmp = ast_variable_retrieve(cfg, "global", "show_user_defined"))) {
cel_show_user_def = ast_true(tmp) ? 1 : 0;
}
if (option_debug) {
if (ast_strlen_zero(pghostname)) {
ast_debug(3, "cel_pgsql: using default unix socket\n");
@@ -460,6 +475,8 @@ static int process_my_load_module(struct ast_config *cfg)
ast_debug(3, "cel_pgsql: got dbname of %s\n", pgdbname);
ast_debug(3, "cel_pgsql: got password of %s\n", pgpassword);
ast_debug(3, "cel_pgsql: got sql table name of %s\n", table);
ast_debug(3, "cel_pgsql: got show_user_defined of %s\n",
cel_show_user_def ? "Yes" : "No");
}
conn = PQsetdbLogin(pghostname, pgdbport, NULL, NULL, pgdbname, pgdbuser, pgpassword);

12
cel/cel_tds.c
View File

@@ -19,17 +19,17 @@
* \brief FreeTDS CEL logger
*
* See also
* \arg \ref Config_cdr
* \arg \ref Config_cel
* \arg http://www.freetds.org/
* \ingroup cdr_drivers
* \ingroup cel_drivers
*/
/*! \verbatim
*
* Table Structure for `cdr`
* Table Structure for `cel`
*
CREATE TABLE [dbo].[cdr] (
CREATE TABLE [dbo].[cel] (
[accountcode] [varchar] (20) NULL ,
[cidname] [varchar] (80) NULL ,
[cidnum] [varchar] (80) NULL ,
@@ -204,7 +204,9 @@ retry:
")",
settings->table, accountcode_ai, clidnum_ai, clid_ai, cidani_ai, cidrdnis_ai,
ciddnid_ai, exten_ai, context_ai, channel_ai, app_ai, appdata_ai, start,
record.event_name, ast_cel_get_ama_flag_name(record.amaflag), uniqueid_ai, linkedid_ai,
(record.event_type == AST_CEL_USER_DEFINED)
? record.user_defined_name : record.event_name,
ast_cel_get_ama_flag_name(record.amaflag), uniqueid_ai, linkedid_ai,
userfield_ai, peer_ai);
if (erc == FAIL) {