diff options
| -rw-r--r-- | cdr/Makefile | 2 | ||||
| -rw-r--r-- | cdr/cdr_adaptive_odbc.c | 2 | ||||
| -rw-r--r-- | cdr/cdr_csv.c | 42 | ||||
| -rw-r--r-- | cdr/cdr_custom.c | 8 | ||||
| -rw-r--r-- | cdr/cdr_manager.c | 12 | ||||
| -rw-r--r-- | cdr/cdr_odbc.c | 6 | ||||
| -rw-r--r-- | cdr/cdr_pgsql.c | 18 | ||||
| -rw-r--r-- | cdr/cdr_radius.c | 20 | ||||
| -rw-r--r-- | cdr/cdr_sqlite.c | 8 | ||||
| -rw-r--r-- | cdr/cdr_sqlite3_custom.c | 6 |
10 files changed, 62 insertions, 62 deletions
diff --git a/cdr/Makefile b/cdr/Makefile index a2767b31e..8ea490ae3 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -1,6 +1,6 @@ # # Asterisk -- A telephony toolkit for Linux. -# +# # Makefile for CDR backends # # Copyright (C) 1999-2006, Digium, Inc. diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c index 67c6043c3..12c150a39 100644 --- a/cdr/cdr_adaptive_odbc.c +++ b/cdr/cdr_adaptive_odbc.c @@ -19,7 +19,7 @@ /*! \file * * \brief Adaptive ODBC CDR backend - * + * * \author Tilghman Lesher <cdr_adaptive_odbc__v1@the-tilghman.com> * \ingroup cdr_drivers */ diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index 10fa0c1ac..4367ce25a 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -23,7 +23,7 @@ * \brief Comma Separated Value CDR records. * * \author Mark Spencer <markster@digium.com> - * + * * \arg See also \ref AstCDR * \ingroup cdr_drivers */ @@ -62,26 +62,26 @@ static char *config = "cdr.conf"; "accountcode", accountcode is the account name of detail records, Master.csv contains all records * Detail records are configured on a channel basis, IAX and SIP are determined by user * - DAHDI is determined by channel in dahdi.conf + DAHDI is determined by channel in dahdi.conf "source", "destination", - "destination context", + "destination context", "callerid", "channel", "destination channel", (if applicable) - "last application", Last application run on the channel - "last app argument", argument to the last channel - "start time", - "answer time", - "end time", - duration, Duration is the whole length that the entire call lasted. ie. call rx'd to hangup - "end time" minus "start time" - billable seconds, the duration that a call was up after other end answered which will be <= to duration - "end time" minus "answer time" - "disposition", ANSWERED, NO ANSWER, BUSY - "amaflags", DOCUMENTATION, BILL, IGNORE etc, specified on a per channel basis like accountcode. - "uniqueid", unique call identifier - "userfield" user field set via SetCDRUserField + "last application", Last application run on the channel + "last app argument", argument to the last channel + "start time", + "answer time", + "end time", + duration, Duration is the whole length that the entire call lasted. ie. call rx'd to hangup + "end time" minus "start time" + billable seconds, the duration that a call was up after other end answered which will be <= to duration + "end time" minus "answer time" + "disposition", ANSWERED, NO ANSWER, BUSY + "amaflags", DOCUMENTATION, BILL, IGNORE etc, specified on a per channel basis like accountcode. + "uniqueid", unique call identifier + "userfield" user field set via SetCDRUserField ----------------------------------------------------------*/ static char *name = "csv"; @@ -110,7 +110,7 @@ static int load_config(int reload) ast_config_destroy(cfg); return 0; } - + if ((tmp = ast_variable_retrieve(cfg, "csv", "usegmtime"))) { usegmtime = ast_true(tmp); if (usegmtime) @@ -238,7 +238,7 @@ static int build_csv_record(char *buf, size_t bufsize, struct ast_cdr *cdr) append_string(buf, cdr->uniqueid, bufsize); /* append the user field */ if(loguserfield) - append_string(buf, cdr->userfield,bufsize); + append_string(buf, cdr->userfield,bufsize); /* If we hit the end of our buffer, log an error */ if (strlen(buf) < bufsize - 5) { /* Trim off trailing comma */ @@ -290,7 +290,7 @@ static int csv_log(struct ast_cdr *cdr) ast_log(LOG_WARNING, "Unable to create CSV record in %d bytes. CDR not recorded!\n", (int)sizeof(buf)); return 0; } - + /* because of the absolutely unconditional need for the highest reliability possible in writing billing records, we open write and close the log file each time */ @@ -305,7 +305,7 @@ static int csv_log(struct ast_cdr *cdr) ast_mutex_unlock(&mf_lock); ast_log(LOG_ERROR, "Unable to re-open master file %s : %s\n", csvmaster, strerror(errno)); } - + if (!ast_strlen_zero(cdr->accountcode)) { if (writefile(buf, cdr->accountcode)) ast_log(LOG_WARNING, "Unable to write CSV record to account file '%s' : %s\n", cdr->accountcode, strerror(errno)); @@ -324,7 +324,7 @@ static int unload_module(void) static int load_module(void) { int res; - + if(!load_config(0)) return AST_MODULE_LOAD_DECLINE; diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c index 6ecef8af4..5eff9f9ac 100644 --- a/cdr/cdr_custom.c +++ b/cdr/cdr_custom.c @@ -57,7 +57,7 @@ static char *name = "cdr-custom"; static char master[PATH_MAX]; static char format[1024]=""; -static int load_config(int reload) +static int load_config(int reload) { struct ast_config *cfg; struct ast_variable *var; @@ -80,7 +80,7 @@ static int load_config(int reload) strcat(format,"\n"); snprintf(master, sizeof(master),"%s/%s/%s", ast_config_AST_LOG_DIR, name, var->name); if (var->next) { - ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno); + ast_log(LOG_NOTICE, "Sorry, only one mapping is supported at this time, mapping '%s' will be ignored at line %d.\n", var->next->name, var->next->lineno); break; } } else @@ -96,7 +96,7 @@ static int load_config(int reload) ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n"); } ast_mutex_unlock(&lock); - + return res; } @@ -153,7 +153,7 @@ static int load_module(void) if (res) ast_log(LOG_ERROR, "Unable to register custom CDR handling\n"); return res; - } else + } else return AST_MODULE_LOAD_DECLINE; } diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c index 8b2ab215d..7a768632c 100644 --- a/cdr/cdr_manager.c +++ b/cdr/cdr_manager.c @@ -17,7 +17,7 @@ /*! \file * * \brief Asterisk Call Manager CDR records. - * + * * See also * \arg \ref AstCDR * \arg \ref AstAMI @@ -75,14 +75,14 @@ static int load_config(int reload) enablecdr = 0; return 0; } - + while ( (cat = ast_category_browse(cfg, cat)) ) { if (!strcasecmp(cat, "general")) { v = ast_variable_browse(cfg, cat); while (v) { if (!strcasecmp(v->name, "enabled")) newenablecdr = ast_true(v->value); - + v = v->next; } } else if (!strcasecmp(cat, "mappings")) { @@ -97,13 +97,13 @@ static int load_config(int reload) ast_log(LOG_WARNING, "No more buffer space to add other custom fields\n"); break; } - + } v = v->next; } } } - + ast_config_destroy(cfg); if (enablecdr && !newenablecdr) @@ -129,7 +129,7 @@ static int manager_log(struct ast_cdr *cdr) ast_localtime(&cdr->start, &timeresult, NULL); ast_strftime(strStartTime, sizeof(strStartTime), DATE_FORMAT, &timeresult); - + if (cdr->answer.tv_sec) { ast_localtime(&cdr->answer, &timeresult, NULL); ast_strftime(strAnswerTime, sizeof(strAnswerTime), DATE_FORMAT, &timeresult); diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index 6b5b1b77b..82f56deda 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -19,7 +19,7 @@ /*! \file * * \brief ODBC CDR Backend - * + * * \author Brian K. West <brian@bkw.org> * * See also: @@ -113,7 +113,7 @@ static SQLHSTMT execute_cb(struct odbc_obj *obj, void *data) } ODBC_res = SQLExecDirect(stmt, (unsigned char *)sqlcmd, SQL_NTS); - + if ((ODBC_res != SQL_SUCCESS) && (ODBC_res != SQL_SUCCESS_WITH_INFO)) { ast_verb(11, "cdr_odbc: Error in ExecDirect: %d\n", ODBC_res); SQLFreeHandle(SQL_HANDLE_STMT, stmt); @@ -165,7 +165,7 @@ static int odbc_load_module(int reload) break; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) break; - + var = ast_variable_browse(cfg, "global"); if (!var) { /* nothing configured */ diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index 40c64bc9c..a5733a8dd 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -3,8 +3,8 @@ * * Copyright (C) 2003 - 2006 * - * Matthew D. Hardeman <mhardemn@papersoft.com> - * Adapted from the MySQL CDR logger originally by James Sharp + * Matthew D. Hardeman <mhardemn@papersoft.com> + * Adapted from the MySQL CDR logger originally by James Sharp * * Modified September 2003 * Matthew D. Hardeman <mhardemn@papersoft.com> @@ -22,9 +22,9 @@ /*! \file * - * \brief PostgreSQL CDR logger - * - * \author Matthew D. Hardeman <mhardemn@papersoft.com> + * \brief PostgreSQL CDR logger + * + * \author Matthew D. Hardeman <mhardemn@papersoft.com> * \extref PostgreSQL http://www.postgresql.org/ * * See also @@ -132,7 +132,7 @@ static int pgsql_log(struct ast_cdr *cdr) int lensql, lensql2, sizesql = maxsize, sizesql2 = maxsize2, newsize; char *sql = ast_calloc(sizeof(char), sizesql), *sql2 = ast_calloc(sizeof(char), sizesql2), *tmp, *value; char buf[257], escapebuf[513]; - + if (!sql || !sql2) { if (sql) { ast_free(sql); @@ -142,10 +142,10 @@ static int pgsql_log(struct ast_cdr *cdr) } return -1; } - + lensql = snprintf(sql, sizesql, "INSERT INTO %s (", table); lensql2 = snprintf(sql2, sizesql2, " VALUES ("); - + AST_RWLIST_RDLOCK(&psql_columns); AST_RWLIST_TRAVERSE(&psql_columns, cur, list) { /* For fields not set, simply skip them */ @@ -164,7 +164,7 @@ static int pgsql_log(struct ast_cdr *cdr) } continue; } - + LENGTHEN_BUF1(strlen(cur->name) + 2); lensql += snprintf(sql + lensql, sizesql - lensql, "\"%s\",", cur->name); diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index d326eba64..67910ce0e 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -21,7 +21,7 @@ * \brief RADIUS CDR Support * \author Philippe Sultan * \extref The Radius Client Library - http://developer.berlios.de/projects/radiusclient-ng/ - * + * * \arg See also \ref AstCDR * \ingroup cdr_drivers */ @@ -135,27 +135,27 @@ static int build_radius_record(VALUE_PAIR **tosend, struct ast_cdr *cdr) /* Start Time */ - ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, + ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, ast_localtime(&cdr->start, &tm, ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME) ? "GMT" : NULL)); if (!rc_avpair_add(rh, tosend, PW_AST_START_TIME, timestr, strlen(timestr), VENDOR_CODE)) return -1; /* Answer Time */ - ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, + ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, ast_localtime(&cdr->answer, &tm, ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME) ? "GMT" : NULL)); if (!rc_avpair_add(rh, tosend, PW_AST_ANSWER_TIME, timestr, strlen(timestr), VENDOR_CODE)) return -1; /* End Time */ - ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, + ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, ast_localtime(&cdr->end, &tm, ast_test_flag(&global_flags, RADIUS_FLAG_USEGMTIME) ? "GMT" : NULL)); if (!rc_avpair_add(rh, tosend, PW_AST_END_TIME, timestr, strlen(timestr), VENDOR_CODE)) return -1; - /* Duration */ + /* Duration */ if (!rc_avpair_add(rh, tosend, PW_AST_DURATION, &cdr->duration, 0, VENDOR_CODE)) return -1; @@ -186,7 +186,7 @@ static int build_radius_record(VALUE_PAIR **tosend, struct ast_cdr *cdr) } /* Setting Acct-Session-Id & User-Name attributes for proper generation - of Acct-Unique-Session-Id on server side */ + of Acct-Unique-Session-Id on server side */ /* Channel */ if (!rc_avpair_add(rh, tosend, PW_USER_NAME, &cdr->channel, strlen(cdr->channel), 0)) return -1; @@ -207,7 +207,7 @@ static int radius_log(struct ast_cdr *cdr) ast_debug(1, "Unable to create RADIUS record. CDR not recorded!\n"); return result; } - + result = rc_acct(rh, 0, tosend); if (result != OK_RC) ast_log(LOG_ERROR, "Failed to record Radius CDR record!\n"); @@ -235,9 +235,9 @@ static int load_module(void) if ((tmp = ast_variable_retrieve(cfg, "radius", "radiuscfg"))) ast_copy_string(radiuscfg, tmp, sizeof(radiuscfg)); ast_config_destroy(cfg); - } else + } else return AST_MODULE_LOAD_DECLINE; - + /* start logging */ rc_openlog("asterisk"); @@ -252,7 +252,7 @@ static int load_module(void) ast_log(LOG_NOTICE, "Cannot load radiusclient-ng dictionary file.\n"); return AST_MODULE_LOAD_DECLINE; } - + res = ast_cdr_register(name, desc, radius_log); return AST_MODULE_LOAD_SUCCESS; } diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index 601e5b245..30eb25612 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -20,14 +20,14 @@ /*! \file * * \brief Store CDR records in a SQLite database. - * + * * \author Holger Schurig <hs4233@mail.mn-solutions.de> * \extref SQLite http://www.sqlite.org/ * * See also * \arg \ref Config_cdr * \arg http://www.sqlite.org/ - * + * * Creates the database and table on-the-fly * \ingroup cdr_drivers * @@ -149,7 +149,7 @@ static int sqlite_log(struct ast_cdr *cdr) break; usleep(200); } - + if (zErr) { ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr); ast_free(zErr); @@ -197,7 +197,7 @@ static int load_module(void) /* TODO: here we should probably create an index */ } - + res = ast_cdr_register(name, ast_module_info->description, sqlite_log); if (res) { ast_log(LOG_ERROR, "Unable to register SQLite CDR handling\n"); diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c index b617ab579..afb4774db 100644 --- a/cdr/cdr_sqlite3_custom.c +++ b/cdr/cdr_sqlite3_custom.c @@ -21,10 +21,10 @@ * \brief Custom SQLite3 CDR records. * * \author Adapted by Alejandro Rios <alejandro.rios@avatar.com.co> and - * Russell Bryant <russell@digium.com> from + * Russell Bryant <russell@digium.com> from * cdr_mysql_custom by Edward Eastman <ed@dm3.co.uk>, * and cdr_sqlite by Holger Schurig <hs4233@mail.mn-solutions.de> - * + * * * \arg See also \ref AstCDR * @@ -178,7 +178,7 @@ static int load_config(int reload) ast_config_destroy(cfg); return 0; } - + /* Mapping must have a table name */ tmp = ast_variable_retrieve(cfg, "master", "table"); if (!ast_strlen_zero(tmp)) |