kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 23:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use compatible names for event extra data for various CEL backends.

Browse Source 
* Change eventextra to extra in cel_psql.c and cel_odbc.c.

* Change EventExtra to Extra in cel_manager.c.

(issue ASTERISK-17190)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@350571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-01-13 17:23:57 +00:00
parent 773074f3b7
commit 26966a5cd8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cel/cel_manager.c
View File

@@ -92,7 +92,7 @@ static void manager_log(const struct ast_event *event, void *userdata)
"Userfield: %s\r\n" "Userfield: %s\r\n"
"Peer: %s\r\n" "Peer: %s\r\n"
"PeerAccount: %s\r\n" "PeerAccount: %s\r\n"
"EventExtra: %s\r\n", "Extra: %s\r\n",
record.event_name, record.event_name,
record.account_code, record.account_code,
record.caller_id_num, record.caller_id_num,

2
cel/cel_odbc.c
View File

@@ -438,7 +438,7 @@ static void odbc_log(const struct ast_event *event, void *userdata)
ast_copy_string(colbuf, record.peer, sizeof(colbuf)); ast_copy_string(colbuf, record.peer, sizeof(colbuf));
} else if (strcmp(entry->celname, "amaflags") == 0) { } else if (strcmp(entry->celname, "amaflags") == 0) {
snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag); snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
} else if (strcmp(entry->celname, "eventextra") == 0) { } else if (strcmp(entry->celname, "extra") == 0) {
ast_copy_string(colbuf, record.extra, sizeof(colbuf)); ast_copy_string(colbuf, record.extra, sizeof(colbuf));
} else { } else {
colbuf[0] = 0; colbuf[0] = 0;

2
cel/cel_pgsql.c
View File

@@ -234,7 +234,7 @@ static void pgsql_log(const struct ast_event *event, void *userdata)
value = record.user_field; value = record.user_field;
} else if (strcmp(cur->name, "peer") == 0) { } else if (strcmp(cur->name, "peer") == 0) {
value = record.peer; value = record.peer;
} else if (strcmp(cur->name, "eventextra") == 0) { } else if (strcmp(cur->name, "extra") == 0) {
value = record.extra; value = record.extra;
} else { } else {
value = NULL; value = NULL;

2
configs/cel_odbc.conf.sample
View File

@@ -47,7 +47,6 @@
; CEL_FORWARD = 25 ; CEL_FORWARD = 25
; eventtime (timeval, includes microseconds) ; eventtime (timeval, includes microseconds)
; userdeftype (set only if eventtype == USER_DEFINED) ; userdeftype (set only if eventtype == USER_DEFINED)
; eventextra
; cid_name ; cid_name
; cid_num ; cid_num
; cid_ani ; cid_ani
@@ -65,6 +64,7 @@
; amaflags (an int) ; amaflags (an int)
; userfield ; userfield
; peer ; peer
; extra
; The point of this module is to allow you log whatever you like in terms of the ; The point of this module is to allow you log whatever you like in terms of the
; CEL variables. Do you want to log uniqueid? Then simply ensure that your ; CEL variables. Do you want to log uniqueid? Then simply ensure that your

2
configs/cel_pgsql.conf.sample
View File

@@ -34,7 +34,6 @@
; CEL_FORWARD = 25 ; CEL_FORWARD = 25
; eventtime (timeval, includes microseconds) ; eventtime (timeval, includes microseconds)
; userdeftype (set only if eventtype == USER_DEFINED) ; userdeftype (set only if eventtype == USER_DEFINED)
; eventextra
; cid_name ; cid_name
; cid_num ; cid_num
; cid_ani ; cid_ani
@@ -52,6 +51,7 @@
; amaflags (an int) ; amaflags (an int)
; userfield ; userfield
; peer ; peer
; extra
[global] [global]