[Asterisk-code-review] cdr_mysql: Remove deprecated module. (asterisk[19])
Joshua Colp
asteriskteam at digium.com
Mon Aug 16 12:41:15 CDT 2021
Joshua Colp has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/16289 )
Change subject: cdr_mysql: Remove deprecated module.
......................................................................
cdr_mysql: Remove deprecated module.
ASTERISK-29584
Change-Id: I4bd3695d089121f810d692a82361d39d2f97ae39
---
M addons/Makefile
D addons/cdr_mysql.c
A doc/UPGRADE-staging/cdr_mysql_removal.txt
3 files changed, 6 insertions(+), 761 deletions(-)
git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/89/16289/1
diff --git a/addons/Makefile b/addons/Makefile
index 866d34b..02be9dc 100644
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -29,7 +29,6 @@
H323CFLAGS:=-Iooh323c/src -Iooh323c/src/h323
ALL_C_MODS:=app_mysql \
- cdr_mysql \
chan_mobile \
chan_ooh323 \
format_mp3 \
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
deleted file mode 100644
index 25f8762..0000000
--- a/addons/cdr_mysql.c
+++ /dev/null
@@ -1,760 +0,0 @@
-/*
- * Asterisk -- An open source telephony toolkit.
- *
- * James Sharp <jsharp at psychoses.org>
- *
- * Modified August 2003
- * Tilghman Lesher <asterisk__cdr__cdr_mysql__200308 at the-tilghman.com>
- *
- * Modified August 6, 2005
- * Joseph Benden <joe at thrallingpenguin.com>
- * Added mysql connection timeout parameter
- * Added an automatic reconnect as to not lose a cdr record
- * Cleaned up the original code to match the coding guidelines
- *
- * Modified Juli 2006
- * Martin Portmann <map at infinitum.ch>
- * Added mysql ssl support
- *
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
- */
-
-/*!
- * \file
- * \brief MySQL CDR backend
- * \ingroup cdr_drivers
- */
-
-/*** MODULEINFO
- <depend>mysqlclient</depend>
- <defaultenabled>no</defaultenabled>
- <support_level>deprecated</support_level>
- <replacement>cdr_adaptive_odbc</replacement>
- <deprecated_in>1.8</deprecated_in>
- <removed_in>19</removed_in>
- ***/
-
-#include "asterisk.h"
-
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
-
-#include "asterisk/config.h"
-#include "asterisk/options.h"
-#include "asterisk/channel.h"
-#include "asterisk/cdr.h"
-#include "asterisk/module.h"
-#include "asterisk/logger.h"
-#include "asterisk/cli.h"
-#include "asterisk/strings.h"
-#include "asterisk/linkedlists.h"
-#include "asterisk/threadstorage.h"
-
-#define DATE_FORMAT "%Y-%m-%d %T"
-
-#ifndef MYSQL_PORT
-# ifdef MARIADB_PORT
-# define MYSQL_PORT MARIADB_PORT
-# else
-# define MYSQL_PORT 3306
-# endif
-#endif
-
-AST_THREADSTORAGE(sql1_buf);
-AST_THREADSTORAGE(sql2_buf);
-AST_THREADSTORAGE(escape_buf);
-
-static const char desc[] = "MySQL CDR Backend";
-static const char name[] = "mysql";
-static const char config[] = "cdr_mysql.conf";
-
-static struct ast_str *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *dbsock = NULL, *dbtable = NULL, *dbcharset = NULL, *cdrzone = NULL;
-
-static struct ast_str *ssl_ca = NULL, *ssl_cert = NULL, *ssl_key = NULL;
-
-static int dbport = 0;
-static int connected = 0;
-static time_t connect_time = 0;
-static int records = 0;
-static int totalrecords = 0;
-static int timeout = 0;
-static int calldate_compat = 0;
-
-AST_MUTEX_DEFINE_STATIC(mysql_lock);
-
-struct unload_string {
- AST_LIST_ENTRY(unload_string) entry;
- struct ast_str *str;
-};
-
-static AST_LIST_HEAD_STATIC(unload_strings, unload_string);
-
-struct column {
- char *name;
- char *cdrname;
- char *staticvalue;
- char *type;
- AST_LIST_ENTRY(column) list;
-};
-
-/* Protected with mysql_lock */
-static AST_RWLIST_HEAD_STATIC(columns, column);
-
-static MYSQL mysql = { { NULL }, };
-
-static char *handle_cli_cdr_mysql_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "cdr mysql status";
- e->usage =
- "Usage: cdr mysql status\n"
- " Shows current connection status for cdr_mysql\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc != 3)
- return CLI_SHOWUSAGE;
-
- if (connected) {
- char status[256];
- char status2[100] = "";
- char buf[362]; /* 256+100+" for "+NULL */
- int ctime = time(NULL) - connect_time;
- if (dbport)
- snprintf(status, 255, "Connected to %s@%s, port %d", ast_str_buffer(dbname), ast_str_buffer(hostname), dbport);
- else if (dbsock)
- snprintf(status, 255, "Connected to %s on socket file %s", ast_str_buffer(dbname), S_OR(ast_str_buffer(dbsock), "default"));
- else
- snprintf(status, 255, "Connected to %s@%s", ast_str_buffer(dbname), ast_str_buffer(hostname));
-
- if (ast_str_strlen(dbuser))
- snprintf(status2, 99, " with username %s", ast_str_buffer(dbuser));
- if (ast_str_strlen(dbtable))
- snprintf(status2, 99, " using table %s", ast_str_buffer(dbtable));
-
- snprintf(buf, sizeof(buf), "%s%s for ", status, status2);
- ast_cli_print_timestr_fromseconds(a->fd, ctime, buf);
-
- if (records == totalrecords)
- ast_cli(a->fd, " Wrote %d records since last restart.\n", totalrecords);
- else
- ast_cli(a->fd, " Wrote %d records since last restart and %d records since last reconnect.\n", totalrecords, records);
- } else {
- ast_cli(a->fd, "Not currently connected to a MySQL server.\n");
- }
-
- return CLI_SUCCESS;
-}
-
-static struct ast_cli_entry cdr_mysql_status_cli[] = {
- AST_CLI_DEFINE(handle_cli_cdr_mysql_status, "Show connection status of cdr_mysql"),
-};
-
-static void configure_connection_charset(void)
-{
- if (ast_str_strlen(dbcharset)) {
- const char *charset = ast_str_buffer(dbcharset);
- if (mysql_options(&mysql, MYSQL_SET_CHARSET_NAME, charset)) {
- ast_log(LOG_WARNING, "Failed to set connection charset. Data inserted might be invalid.\n");
- }
- }
-}
-
-static int mysql_log(struct ast_cdr *cdr)
-{
- struct ast_str *sql1 = ast_str_thread_get(&sql1_buf, 1024), *sql2 = ast_str_thread_get(&sql2_buf, 1024);
- int retries = 5;
-#ifdef HAVE_MYSQLCLIENT_BOOL
- bool my_bool_true = 1;
-#elif HAVE_MYSQLCLIENT_MY_BOOL
- my_bool my_bool_true = 1;
-#endif
-
- if (!sql1 || !sql2) {
- ast_log(LOG_ERROR, "Memory error\n");
- return -1;
- }
-
- ast_mutex_lock(&mysql_lock);
-
-db_reconnect:
- if ((!connected) && (hostname || dbsock) && dbuser && password && dbname && dbtable ) {
- /* Attempt to connect */
- mysql_init(&mysql);
- /* Add option to quickly timeout the connection */
- if (timeout && mysql_options(&mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *)&timeout) != 0) {
- ast_log(LOG_ERROR, "mysql_options returned (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- }
-#if MYSQL_VERSION_ID >= 50013
- /* Add option for automatic reconnection */
- if (mysql_options(&mysql, MYSQL_OPT_RECONNECT, &my_bool_true) != 0) {
- ast_log(LOG_ERROR, "mysql_options returned (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- }
-#endif
- if (ssl_ca || ssl_cert || ssl_key) {
- mysql_ssl_set(&mysql, ssl_key ? ast_str_buffer(ssl_key) : NULL, ssl_cert ? ast_str_buffer(ssl_cert) : NULL, ssl_ca ? ast_str_buffer(ssl_ca) : NULL, NULL, NULL);
- }
-
- configure_connection_charset();
-
- if (mysql_real_connect(&mysql, ast_str_buffer(hostname), ast_str_buffer(dbuser), ast_str_buffer(password), ast_str_buffer(dbname), dbport, dbsock && ast_str_strlen(dbsock) ? ast_str_buffer(dbsock) : NULL, ssl_ca ? CLIENT_SSL : 0)) {
- connected = 1;
- connect_time = time(NULL);
- records = 0;
- } else {
- ast_log(LOG_ERROR, "Cannot connect to database server %s: (%d) %s\n", ast_str_buffer(hostname), mysql_errno(&mysql), mysql_error(&mysql));
- connected = 0;
- }
- } else {
- /* Long connection - ping the server */
- int error;
- if ((error = mysql_ping(&mysql))) {
- connected = 0;
- records = 0;
- switch (mysql_errno(&mysql)) {
- case CR_SERVER_GONE_ERROR:
- case CR_SERVER_LOST:
- ast_log(LOG_ERROR, "Server has gone away. Attempting to reconnect.\n");
- break;
- default:
- ast_log(LOG_ERROR, "Unknown connection error: (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- }
- retries--;
- if (retries) {
- goto db_reconnect;
- } else {
- ast_log(LOG_ERROR, "Retried to connect five times, giving up.\n");
- }
- }
- }
-
- if (connected) {
- int column_count = 0;
- char *cdrname;
- char workspace[2048], *value = NULL;
- struct column *entry;
- struct ast_str *escape = ast_str_thread_get(&escape_buf, 16);
-
- ast_str_set(&sql1, 0, "INSERT INTO %s (", AS_OR(dbtable, "cdr"));
- ast_str_set(&sql2, 0, ") VALUES (");
-
- AST_RWLIST_RDLOCK(&columns);
- AST_RWLIST_TRAVERSE(&columns, entry, list) {
- if (!strcmp(entry->name, "calldate")) {
- /*!\note
- * For some dumb reason, "calldate" used to be formulated using
- * the datetime the record was posted, rather than the start
- * time of the call. If someone really wants the old compatible
- * behavior, it's provided here.
- */
- if (calldate_compat) {
- struct timeval tv = ast_tvnow();
- struct ast_tm tm;
- char timestr[128];
- ast_localtime(&tv, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL);
- ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
- value = ast_strdupa(timestr);
- cdrname = "calldate";
- } else {
- cdrname = "start";
- }
- } else {
- cdrname = entry->cdrname;
- }
-
- /* Construct SQL */
-
- /* Need the type and value to determine if we want the raw value or not */
- if (entry->staticvalue) {
- value = ast_strdupa(entry->staticvalue);
- } else if ((!strcmp(cdrname, "disposition") ||
- !strcmp(cdrname, "amaflags")) &&
- (strstr(entry->type, "int") ||
- strstr(entry->type, "dec") ||
- strstr(entry->type, "float") ||
- strstr(entry->type, "double") ||
- strstr(entry->type, "real") ||
- strstr(entry->type, "numeric") ||
- strstr(entry->type, "fixed"))) {
- ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 1);
- } else if (!strcmp(cdrname, "start") || !strcmp(cdrname, "answer") ||
- !strcmp(cdrname, "end")) {
- struct ast_tm tm;
- char timestr[128];
- ast_localtime(&cdr->start, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL);
- ast_strftime(timestr, sizeof(timestr), DATE_FORMAT, &tm);
- value = ast_strdupa(timestr);
- } else if (!strcmp(cdrname, "calldate")) {
- /* Skip calldate - the value has already been dup'd */
- } else {
- ast_cdr_format_var(cdr, cdrname, &value, workspace, sizeof(workspace), 0);
- }
-
- if (value) {
- size_t valsz;
-
- if (column_count++) {
- ast_str_append(&sql1, 0, ",");
- ast_str_append(&sql2, 0, ",");
- }
-
- if (!strcasecmp(cdrname, "billsec") &&
- (strstr(entry->type, "float") ||
- strstr(entry->type, "double") ||
- strstr(entry->type, "decimal") ||
- strstr(entry->type, "numeric") ||
- strstr(entry->type, "real"))) {
-
- if (!ast_tvzero(cdr->answer)) {
- snprintf(workspace, sizeof(workspace), "%lf",
- (double) (ast_tvdiff_us(cdr->end, cdr->answer) / 1000000.0));
- } else {
- ast_copy_string(workspace, "0", sizeof(workspace));
- }
-
- if (!ast_strlen_zero(workspace)) {
- value = workspace;
- }
- }
-
- if (!strcasecmp(cdrname, "duration") &&
- (strstr(entry->type, "float") ||
- strstr(entry->type, "double") ||
- strstr(entry->type, "decimal") ||
- strstr(entry->type, "numeric") ||
- strstr(entry->type, "real"))) {
-
- snprintf(workspace, sizeof(workspace), "%lf",
- (double) (ast_tvdiff_us(cdr->end, cdr->start) / 1000000.0));
-
- if (!ast_strlen_zero(workspace)) {
- value = workspace;
- }
- }
-
- ast_str_make_space(&escape, (valsz = strlen(value)) * 2 + 1);
- mysql_real_escape_string(&mysql, ast_str_buffer(escape), value, valsz);
-
- ast_str_append(&sql1, 0, "`%s`", entry->name);
- ast_str_append(&sql2, 0, "'%s'", ast_str_buffer(escape));
- }
- }
- AST_RWLIST_UNLOCK(&columns);
-
- ast_debug(1, "Inserting a CDR record.\n");
- ast_str_append(&sql1, 0, "%s)", ast_str_buffer(sql2));
-
- ast_debug(1, "SQL command as follows: %s\n", ast_str_buffer(sql1));
-
- if (mysql_real_query(&mysql, ast_str_buffer(sql1), ast_str_strlen(sql1))) {
- ast_log(LOG_ERROR, "Failed to insert into database: (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- mysql_close(&mysql);
- connected = 0;
- } else {
- records++;
- totalrecords++;
- }
- }
- ast_mutex_unlock(&mysql_lock);
- return 0;
-}
-
-static void free_strings(void)
-{
- struct unload_string *us;
-
- AST_LIST_LOCK(&unload_strings);
- while ((us = AST_LIST_REMOVE_HEAD(&unload_strings, entry))) {
- ast_free(us->str);
- ast_free(us);
- }
- AST_LIST_UNLOCK(&unload_strings);
-}
-
-static int my_unload_module(int reload)
-{
- struct column *entry;
-
- if (!reload) {
- if (ast_cdr_unregister(name)) {
- /* If we can't unregister the backend, we can't unload the module */
- return -1;
- }
- }
-
- ast_cli_unregister_multiple(cdr_mysql_status_cli, sizeof(cdr_mysql_status_cli) / sizeof(struct ast_cli_entry));
-
- if (connected) {
- mysql_close(&mysql);
- connected = 0;
- records = 0;
- }
-
- free_strings();
-
- if (!reload) {
- AST_RWLIST_WRLOCK(&columns);
- }
- while ((entry = AST_RWLIST_REMOVE_HEAD(&columns, list))) {
- ast_free(entry);
- }
- if (!reload) {
- AST_RWLIST_UNLOCK(&columns);
- }
-
- dbport = 0;
- if (reload) {
- return ast_cdr_backend_suspend(name);
- } else {
- /* We unregistered earlier */
- return 0;
- }
-}
-
-static int my_load_config_string(struct ast_config *cfg, const char *category, const char *variable, struct ast_str **field, const char *def)
-{
- struct unload_string *us;
- const char *tmp;
-
- if (!(us = ast_calloc(1, sizeof(*us))))
- return -1;
-
- if (!(*field = ast_str_create(16))) {
- ast_free(us);
- return -1;
- }
-
- tmp = ast_variable_retrieve(cfg, category, variable);
-
- ast_str_set(field, 0, "%s", tmp ? tmp : def);
-
- us->str = *field;
-
- AST_LIST_LOCK(&unload_strings);
- AST_LIST_INSERT_HEAD(&unload_strings, us, entry);
- AST_LIST_UNLOCK(&unload_strings);
-
- return 0;
-}
-
-static int my_load_config_number(struct ast_config *cfg, const char *category, const char *variable, int *field, int def)
-{
- const char *tmp;
-
- tmp = ast_variable_retrieve(cfg, category, variable);
-
- if (!tmp || sscanf(tmp, "%30d", field) < 1)
- *field = def;
-
- return 0;
-}
-
-/** Connect to MySQL. Initializes the connection.
- *
- * * Assumes the read-write lock for columns is held.
- * * Caller should allocate and free cfg
- * */
-static int my_connect_db(struct ast_config *cfg)
-{
- struct ast_variable *var;
- char *temp;
- MYSQL_ROW row;
- MYSQL_RES *result;
- char sqldesc[128];
-#ifdef HAVE_MYSQLCLIENT_BOOL
- bool my_bool_true = 1;
-#elif HAVE_MYSQLCLIENT_MY_BOOL
- my_bool my_bool_true = 1;
-#endif
-
- mysql_init(&mysql);
-
- if (timeout && mysql_options(&mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *)&timeout) != 0) {
- ast_log(LOG_ERROR, "cdr_mysql: mysql_options returned (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- }
-
-#if MYSQL_VERSION_ID >= 50013
- /* Add option for automatic reconnection */
- if (mysql_options(&mysql, MYSQL_OPT_RECONNECT, &my_bool_true) != 0) {
- ast_log(LOG_ERROR, "cdr_mysql: mysql_options returned (%d) %s\n", mysql_errno(&mysql), mysql_error(&mysql));
- }
-#endif
-
- if ((ssl_ca && ast_str_strlen(ssl_ca)) || (ssl_cert && ast_str_strlen(ssl_cert)) || (ssl_key && ast_str_strlen(ssl_key))) {
- mysql_ssl_set(&mysql,
- ssl_key ? ast_str_buffer(ssl_key) : NULL,
- ssl_cert ? ast_str_buffer(ssl_cert) : NULL,
- ssl_ca ? ast_str_buffer(ssl_ca) : NULL,
- NULL, NULL);
- }
- temp = dbsock && ast_str_strlen(dbsock) ? ast_str_buffer(dbsock) : NULL;
-
- configure_connection_charset();
-
- if (!mysql_real_connect(&mysql, ast_str_buffer(hostname), ast_str_buffer(dbuser), ast_str_buffer(password), ast_str_buffer(dbname), dbport, temp, ssl_ca && ast_str_strlen(ssl_ca) ? CLIENT_SSL : 0)) {
- ast_log(LOG_ERROR, "Failed to connect to mysql database %s on %s.\n", ast_str_buffer(dbname), ast_str_buffer(hostname));
- connected = 0;
- records = 0;
-
- return AST_MODULE_LOAD_SUCCESS; /* May be reconnected later */
- }
-
- ast_debug(1, "Successfully connected to MySQL database.\n");
- connected = 1;
- records = 0;
- connect_time = time(NULL);
-
- /* Get table description */
- snprintf(sqldesc, sizeof(sqldesc), "DESC %s", dbtable ? ast_str_buffer(dbtable) : "cdr");
- if (mysql_query(&mysql, sqldesc)) {
- ast_log(LOG_ERROR, "Unable to query table description!! Logging disabled.\n");
- mysql_close(&mysql);
- connected = 0;
-
- return AST_MODULE_LOAD_DECLINE;
- }
-
- if (!(result = mysql_store_result(&mysql))) {
- ast_log(LOG_ERROR, "Unable to query table description!! Logging disabled.\n");
- mysql_close(&mysql);
- connected = 0;
-
- return AST_MODULE_LOAD_DECLINE;
- }
-
- while ((row = mysql_fetch_row(result))) {
- struct column *entry;
- char *cdrvar = "", *staticvalue = "";
-
- ast_debug(1, "Got a field '%s' of type '%s'\n", row[0], row[1]);
- /* Check for an alias or a static value */
- for (var = ast_variable_browse(cfg, "columns"); var; var = var->next) {
- if (strncmp(var->name, "alias", 5) == 0 && strcasecmp(var->value, row[0]) == 0 ) {
- char *alias = ast_strdupa(var->name + 5);
- cdrvar = ast_strip(alias);
- ast_verb(3, "Found alias %s for column %s\n", cdrvar, row[0]);
- break;
- } else if (strncmp(var->name, "static", 6) == 0 && strcasecmp(var->value, row[0]) == 0) {
- char *item = ast_strdupa(var->name + 6);
- item = ast_strip(item);
- if (item[0] == '"' && item[strlen(item) - 1] == '"') {
- /* Remove surrounding quotes */
- item[strlen(item) - 1] = '\0';
- item++;
- }
- staticvalue = item;
- }
- }
-
- entry = ast_calloc(sizeof(char), sizeof(*entry) + strlen(row[0]) + 1 + strlen(cdrvar) + 1 + strlen(staticvalue) + 1 + strlen(row[1]) + 1);
- if (!entry) {
- ast_log(LOG_ERROR, "Out of memory creating entry for column '%s'\n", row[0]);
- mysql_free_result(result);
- return AST_MODULE_LOAD_DECLINE;
- }
-
- entry->name = (char *)entry + sizeof(*entry);
- strcpy(entry->name, row[0]);
-
- if (!ast_strlen_zero(cdrvar)) {
- entry->cdrname = entry->name + strlen(row[0]) + 1;
- strcpy(entry->cdrname, cdrvar);
- } else { /* Point to same place as the column name */
- entry->cdrname = (char *)entry + sizeof(*entry);
- }
-
- if (!ast_strlen_zero(staticvalue)) {
- entry->staticvalue = entry->cdrname + strlen(entry->cdrname) + 1;
- strcpy(entry->staticvalue, staticvalue);
- ast_debug(1, "staticvalue length: %d\n", (int) strlen(staticvalue) );
- entry->type = entry->staticvalue + strlen(entry->staticvalue) + 1;
- } else {
- entry->type = entry->cdrname + strlen(entry->cdrname) + 1;
- }
- strcpy(entry->type, row[1]);
-
- ast_debug(1, "Entry name '%s'\n", entry->name);
- ast_debug(1, " cdrname '%s'\n", entry->cdrname);
- ast_debug(1, " static '%s'\n", entry->staticvalue);
- ast_debug(1, " type '%s'\n", entry->type);
-
- AST_LIST_INSERT_TAIL(&columns, entry, list);
- }
- mysql_free_result(result);
-
- return AST_MODULE_LOAD_SUCCESS;
-}
-
-static int my_load_module(int reload)
-{
- int res;
- struct ast_config *cfg;
- struct ast_variable *var;
- /* CONFIG_STATUS_FILEUNCHANGED is impossible when config_flags is always 0,
- * and it has to be zero, so a reload can be sent to tell the driver to
- * rescan the table layout. */
- struct ast_flags config_flags = { 0 };
- struct column *entry;
- struct ast_str *compat;
-
- /* Cannot use a conditionally different flag, because the table layout may
- * have changed, which is not detectable by config file change detection,
- * but should still cause the configuration to be re-parsed. */
- cfg = ast_config_load(config, config_flags);
- if (cfg == CONFIG_STATUS_FILEMISSING) {
- ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
- return AST_MODULE_LOAD_SUCCESS;
- } else if (cfg == CONFIG_STATUS_FILEINVALID) {
- ast_log(LOG_ERROR, "Unable to load configuration file '%s'\n", config);
- return AST_MODULE_LOAD_DECLINE;
- }
-
- if (reload) {
- AST_RWLIST_WRLOCK(&columns);
- my_unload_module(1);
- }
-
- var = ast_variable_browse(cfg, "global");
- if (!var) {
- /* nothing configured */
- if (reload) {
- AST_RWLIST_UNLOCK(&columns);
- }
- ast_config_destroy(cfg);
- return AST_MODULE_LOAD_SUCCESS;
- }
-
- res = 0;
-
- res |= my_load_config_string(cfg, "global", "hostname", &hostname, "localhost");
- res |= my_load_config_string(cfg, "global", "dbname", &dbname, "astriskcdrdb");
- res |= my_load_config_string(cfg, "global", "user", &dbuser, "root");
- res |= my_load_config_string(cfg, "global", "sock", &dbsock, "");
- res |= my_load_config_string(cfg, "global", "table", &dbtable, "cdr");
- res |= my_load_config_string(cfg, "global", "password", &password, "");
-
- res |= my_load_config_string(cfg, "global", "charset", &dbcharset, "");
-
- res |= my_load_config_string(cfg, "global", "ssl_ca", &ssl_ca, "");
- res |= my_load_config_string(cfg, "global", "ssl_cert", &ssl_cert, "");
- res |= my_load_config_string(cfg, "global", "ssl_key", &ssl_key, "");
-
- res |= my_load_config_number(cfg, "global", "port", &dbport, MYSQL_PORT);
- res |= my_load_config_number(cfg, "global", "timeout", &timeout, 0);
- res |= my_load_config_string(cfg, "global", "compat", &compat, "no");
- res |= my_load_config_string(cfg, "global", "cdrzone", &cdrzone, "");
- if (ast_str_strlen(cdrzone) == 0) {
- for (; var; var = var->next) {
- if (!strcasecmp(var->name, "usegmtime") && ast_true(var->value)) {
- ast_str_set(&cdrzone, 0, "UTC");
- }
- }
- }
-
- if (ast_true(ast_str_buffer(compat))) {
- calldate_compat = 1;
- } else {
- calldate_compat = 0;
- }
-
- if (res < 0) {
- if (reload) {
- AST_RWLIST_UNLOCK(&columns);
- }
- ast_config_destroy(cfg);
- free_strings();
-
- return AST_MODULE_LOAD_DECLINE;
- }
-
- /* Check for any aliases */
- if (!reload) {
- /* Lock, if not already */
- AST_RWLIST_WRLOCK(&columns);
- }
- while ((entry = AST_LIST_REMOVE_HEAD(&columns, list))) {
- ast_free(entry);
- }
-
- ast_debug(1, "Got hostname of %s\n", ast_str_buffer(hostname));
- ast_debug(1, "Got port of %d\n", dbport);
- ast_debug(1, "Got a timeout of %d\n", timeout);
- if (ast_str_strlen(dbsock)) {
- ast_debug(1, "Got sock file of %s\n", ast_str_buffer(dbsock));
- }
- ast_debug(1, "Got user of %s\n", ast_str_buffer(dbuser));
- ast_debug(1, "Got dbname of %s\n", ast_str_buffer(dbname));
- ast_debug(1, "Got password of %s\n", ast_str_buffer(password));
- ast_debug(1, "%sunning in calldate compatibility mode\n", calldate_compat ? "R" : "Not r");
- ast_debug(1, "Dates and times are localized to %s\n", S_OR(ast_str_buffer(cdrzone), "local timezone"));
-
- if (ast_str_strlen(dbcharset)) {
- ast_debug(1, "Got DB charset of %s\n", ast_str_buffer(dbcharset));
- }
-
- res = my_connect_db(cfg);
- AST_RWLIST_UNLOCK(&columns);
- ast_config_destroy(cfg);
- if (res != AST_MODULE_LOAD_SUCCESS) {
- my_unload_module(0);
- return res;
- }
-
- if (!reload) {
- res = ast_cdr_register(name, desc, mysql_log);
- } else {
- res = ast_cdr_backend_unsuspend(name);
- }
- if (res) {
- ast_log(LOG_ERROR, "Unable to register MySQL CDR handling\n");
- } else {
- res = ast_cli_register_multiple(cdr_mysql_status_cli, sizeof(cdr_mysql_status_cli) / sizeof(struct ast_cli_entry));
- }
-
- if (res) {
- my_unload_module(0);
- return AST_MODULE_LOAD_DECLINE;
- }
-
- return AST_MODULE_LOAD_SUCCESS;
-}
-
-static int load_module(void)
-{
- return my_load_module(0);
-}
-
-static int unload_module(void)
-{
- return my_unload_module(0);
-}
-
-static int reload(void)
-{
- int ret;
-
- ast_mutex_lock(&mysql_lock);
- ret = my_load_module(1);
- ast_mutex_unlock(&mysql_lock);
-
- return ret;
-}
-
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL CDR Backend",
- .support_level = AST_MODULE_SUPPORT_DEPRECATED,
- .load = load_module,
- .unload = unload_module,
- .reload = reload,
- .requires = "cdr",
-);
diff --git a/doc/UPGRADE-staging/cdr_mysql_removal.txt b/doc/UPGRADE-staging/cdr_mysql_removal.txt
new file mode 100644
index 0000000..a90690e
--- /dev/null
+++ b/doc/UPGRADE-staging/cdr_mysql_removal.txt
@@ -0,0 +1,6 @@
+Subject: cdr_mysql
+Master-Only: True
+
+This module was deprecated in Asterisk 1.8
+and is now being removed in accordance with
+the Asterisk Module Deprecation policy.
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16289
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: 19
Gerrit-Change-Id: I4bd3695d089121f810d692a82361d39d2f97ae39
Gerrit-Change-Number: 16289
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210816/19bc0387/attachment-0001.html>
More information about the asterisk-code-review
mailing list