kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support negative filters.

Browse Source 
(closes issue #17979)
 Reported by: tilghman
 Patches: 
       20100911__for_blitzrage.diff.txt uploaded by tilghman (license 14)
 Tested by: lmadsen


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-12-31 09:29:10 +00:00
parent 793b68b082
commit 96b7a9950c
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cdr/cdr_adaptive_odbc.c
View File

@@ -65,6 +65,7 @@ struct columns {
SQLSMALLINT nullable;
SQLINTEGER octetlen;
AST_LIST_ENTRY(columns) list;
unsigned int negatefiltervalue:1;
};
struct tables {
@@ -163,9 +164,16 @@ static int load_config(void)
/* Check for filters first */
for (var = ast_variable_browse(cfg, catg); var; var = var->next) {
if (strncmp(var->name, "filter", 6) == 0) {
int negate = 0;
char *cdrvar = ast_strdupa(var->name + 6);
cdrvar = ast_strip(cdrvar);
ast_verb(3, "Found filter %s for cdr variable %s in %s@%s\n", var->value, cdrvar, tableptr->table, tableptr->connection);
if (cdrvar[strlen(cdrvar) - 1] == '!') {
negate = 1;
cdrvar[strlen(cdrvar) - 1] = '\0';
ast_trim_blanks(cdrvar);
}
ast_verb(3, "Found filter %s'%s' for cdr variable %s in %s@%s\n", negate ? "!" : "", var->value, cdrvar, tableptr->table, tableptr->connection);
entry = ast_calloc(sizeof(char), sizeof(*entry) + strlen(cdrvar) + 1 + strlen(var->value) + 1);
if (!entry) {
@@ -180,6 +188,7 @@ static int load_config(void)
entry->filtervalue = (char *)entry + sizeof(*entry) + strlen(cdrvar) + 1;
strcpy(entry->cdrname, cdrvar);
strcpy(entry->filtervalue, var->value);
entry->negatefiltervalue = negate;
AST_LIST_INSERT_TAIL(&(tableptr->columns), entry, list);
}
@@ -403,10 +412,11 @@ static int odbc_log(struct ast_cdr *cdr)
* is very specifically NOT ast_strlen_zero(), because the filter
* could legitimately specify that the field is blank, which is
* different from the field being unspecified (NULL). */
if (entry->filtervalue && strcasecmp(colptr, entry->filtervalue) != 0) {
if ((entry->filtervalue && !entry->negatefiltervalue && strcasecmp(colptr, entry->filtervalue) != 0) ||
(entry->filtervalue && entry->negatefiltervalue && strcasecmp(colptr, entry->filtervalue) == 0)) {
ast_verb(4, "CDR column '%s' with value '%s' does not match filter of"
" '%s'. Cancelling this CDR.\n",
entry->cdrname, colptr, entry->filtervalue);
" %s'%s'. Cancelling this CDR.\n",
entry->cdrname, colptr, entry->negatefiltervalue ? "!" : "", entry->filtervalue);
goto early_release;
}