CDR Mysql fixes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Mark Spencer 22 years ago
parent 5a0a0ff8dd
commit be647641bb

@ -27,214 +27,212 @@
#include <time.h> #include <time.h>
#include <mysql.h> #include <mysql.h>
#include <mysql/errmsg.h>
#define DATE_FORMAT "%Y-%m-%d %T" #define DATE_FORMAT "%Y-%m-%d %T"
static char *desc = "MySQL CDR Backend"; static char *desc = "MySQL CDR Backend";
static char *name = "mysql"; static char *name = "mysql";
static char *config = "cdr_mysql.conf"; static char *config = "cdr_mysql.conf";
static char *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL;
static int connected = 0;
static MYSQL *mysql; static pthread_mutex_t mysql_lock = AST_MUTEX_INITIALIZER;
static MYSQL mysql;
static int mysql_log(struct ast_cdr *cdr) static int mysql_log(struct ast_cdr *cdr)
{ {
struct tm tm; struct tm tm;
struct timeval tv; struct timeval tv;
struct timezone tz; char sqlcmd[2048], timestr[128];
char *sqlcmd, timestr[128]; time_t t;
time_t t;
ast_pthread_mutex_lock(&mysql_lock);
sqlcmd = (char *)malloc(2048); memset(sqlcmd,0,2048);
memset(sqlcmd,0,2048);
gettimeofday(&tv,NULL);
t = tv.tv_sec;
gettimeofday(&tv,&tz); localtime_r(&t,&tm);
t = tv.tv_sec; strftime(timestr,128,DATE_FORMAT,&tm);
localtime_r(&t,&tm);
strftime(timestr,128,DATE_FORMAT,&tm); if ((!connected) && hostname && dbuser && password && dbname) {
/* Attempt to connect */
mysql_init(&mysql);
ast_log(LOG_DEBUG,"cdr_mysql: inserting a CDR record.\n"); if (mysql_real_connect(&mysql, hostname, dbuser, password, dbname, 0, NULL, 0)) {
connected = 1;
} else {
ast_log(LOG_ERROR, "cdr_mysql: cannot connect to database %s. Call will not be logged\n", hostname);
}
} else {
/* Long connection - ping the server */
int error;
if ((error = mysql_ping(&mysql))) {
connected = 0;
switch (error) {
case CR_SERVER_GONE_ERROR:
ast_log(LOG_ERROR, "cdr_mysql: Server has gone away\n");
break;
default:
ast_log(LOG_ERROR, "cdr_mysql: Unknown connection error\n");
}
}
}
if (connected) {
ast_log(LOG_DEBUG,"cdr_mysql: inserting a CDR record.\n");
#ifdef MYSQL_LOGUNIQUEID #ifdef MYSQL_LOGUNIQUEID
sprintf(sqlcmd,"INSERT INTO cdr (calldate,clid,src,dst,dcontext,channel,dstchannel,lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid) VALUES ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%i,%i,'%s',%i,'%s','%s')",timestr,cdr->clid,cdr->src, cdr->dst, cdr->dcontext,cdr->channel, cdr->dstchannel, cdr->lastapp, cdr->lastdata,cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, cdr->uniqueid); sprintf(sqlcmd,"INSERT INTO cdr (calldate,clid,src,dst,dcontext,channel,dstchannel,lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode,uniqueid) VALUES ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%i,%i,'%s',%i,'%s','%s')",timestr,cdr->clid,cdr->src, cdr->dst, cdr->dcontext,cdr->channel, cdr->dstchannel, cdr->lastapp, cdr->lastdata,cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode, cdr->uniqueid);
#else #else
sprintf(sqlcmd,"INSERT INTO cdr (calldate,clid,src,dst,dcontext,channel,dstchannel,lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode) VALUES ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%i,%i,'%s',%i,'%s')",timestr,cdr->clid,cdr->src, cdr->dst, cdr->dcontext,cdr->channel, cdr->dstchannel, cdr->lastapp, cdr->lastdata,cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode); sprintf(sqlcmd,"INSERT INTO cdr (calldate,clid,src,dst,dcontext,channel,dstchannel,lastapp,lastdata,duration,billsec,disposition,amaflags,accountcode) VALUES ('%s','%s','%s','%s','%s', '%s','%s','%s','%s',%i,%i,'%s',%i,'%s')",timestr,cdr->clid,cdr->src, cdr->dst, cdr->dcontext,cdr->channel, cdr->dstchannel, cdr->lastapp, cdr->lastdata,cdr->duration,cdr->billsec,ast_cdr_disp2str(cdr->disposition),cdr->amaflags, cdr->accountcode);
#endif #endif
ast_log(LOG_DEBUG,"cdr_mysql: SQL command as follows: %s\n",sqlcmd); ast_log(LOG_DEBUG,"cdr_mysql: SQL command as follows: %s\n",sqlcmd);
if (mysql_real_query(mysql,sqlcmd,strlen(sqlcmd))) if (mysql_real_query(&mysql,sqlcmd,strlen(sqlcmd))) {
{ ast_log(LOG_ERROR,"Failed to insert into database.");
ast_log(LOG_ERROR,"Failed to insert into database."); ast_pthread_mutex_unlock(&mysql_lock);
free(sqlcmd); return -1;
return -1; }
} }
free(sqlcmd); ast_pthread_mutex_unlock(&mysql_lock);
return 0; return 0;
} }
char *description(void) char *description(void)
{ {
return desc; return desc;
} }
int unload_module(void) int unload_module(void)
{ {
if (connected) {
mysql_close(mysql); mysql_close(&mysql);
ast_cdr_unregister(name); connected = 0;
return 0; }
if (hostname) {
free(hostname);
hostname = NULL;
}
if (dbname) {
free(dbname);
dbname = NULL;
}
if (dbuser) {
free(dbuser);
dbuser = NULL;
}
if (password) {
free(password);
password = NULL;
}
ast_cdr_unregister(name);
return 0;
} }
int load_module(void) int load_module(void)
{ {
int res; int res;
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *tmp;
char *hostname, *dbname, *dbuser, *password;
cfg = ast_load(config);
cfg = ast_load(config); if (!cfg) {
if (!cfg) { ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config); return 0;
return 0; }
}
var = ast_variable_browse(cfg, "global");
var = ast_variable_browse(cfg, "global"); if (!var) {
if (!var) { /* nothing configured */
/* nothing configured */ return 0;
return 0; }
}
tmp = ast_variable_retrieve(cfg,"global","hostname");
hostname = ast_variable_retrieve(cfg,"global","hostname"); hostname = malloc(strlen(tmp) + 1);
dbname = ast_variable_retrieve(cfg,"global","dbname"); if ((tmp != NULL) && (hostname != NULL)) {
dbuser = ast_variable_retrieve(cfg,"global","user"); strcpy(hostname,tmp);
password = ast_variable_retrieve(cfg,"global","password"); } else if (tmp == NULL) {
ast_log(LOG_DEBUG,"cdr_mysql: got hostname of %s\n",hostname); ast_log(LOG_ERROR,"Database server hostname not specified.\n");
ast_log(LOG_DEBUG,"cdr_mysql: got user of %s\n",dbuser); return -1;
ast_log(LOG_DEBUG,"cdr_mysql: got dbname of %s\n",dbname); } else {
ast_log(LOG_DEBUG,"cdr_mysql: got password of %s\n",password); ast_log(LOG_ERROR,"Out of memory error.\n");
return -1;
if (hostname == NULL) }
{
ast_log(LOG_ERROR,"Database server hostname not specified.\n"); tmp = ast_variable_retrieve(cfg,"global","dbname");
return -1; dbname = malloc(strlen(tmp) + 1);
} if ((tmp != NULL) && (dbname != NULL)) {
if (dbuser == NULL) strcpy(dbname,tmp);
{ } else if (tmp == NULL) {
ast_log(LOG_ERROR,"Database dbuser not specified.\n"); ast_log(LOG_ERROR,"Database dbname not specified.\n");
return -1; return -1;
} } else {
if (dbname == NULL) ast_log(LOG_ERROR,"Out of memory error.\n");
{ return -1;
ast_log(LOG_ERROR,"Database dbname not specified.\n"); }
return -1;
} tmp = ast_variable_retrieve(cfg,"global","user");
if (password == NULL) dbuser = malloc(strlen(tmp) + 1);
{ if ((tmp != NULL) && (dbuser != NULL)) {
ast_log(LOG_ERROR,"Database password not specified.\n"); strcpy(dbuser,tmp);
return -1; } else if (tmp == NULL) {
} ast_log(LOG_ERROR,"Database dbuser not specified.\n");
return -1;
} else {
mysql = mysql_init(NULL); ast_log(LOG_ERROR,"Out of memory error.\n");
return -1;
mysql = mysql_real_connect(mysql, hostname, dbuser, password, dbname, 0, NULL, 0); }
if (mysql == NULL) { tmp = ast_variable_retrieve(cfg,"global","password");
ast_log(LOG_ERROR, "Failed to connect to mysql database.\n"); password = malloc(strlen(tmp) + 1);
return -1; if ((tmp != NULL) && (password != NULL)) {
} else { strcpy(password,tmp);
ast_log(LOG_DEBUG,"Successfully connected to MySQL database.\n"); } else if (tmp == NULL) {
} ast_log(LOG_ERROR,"Database password not specified.\n");
return -1;
} else {
res = ast_cdr_register(name, desc, mysql_log); ast_log(LOG_ERROR,"Out of memory error.\n");
if (res) { return -1;
ast_log(LOG_ERROR, "Unable to register MySQL CDR handling\n"); }
}
return res; ast_destroy(cfg);
ast_log(LOG_DEBUG,"cdr_mysql: got hostname of %s\n",hostname);
ast_log(LOG_DEBUG,"cdr_mysql: got user of %s\n",dbuser);
ast_log(LOG_DEBUG,"cdr_mysql: got dbname of %s\n",dbname);
ast_log(LOG_DEBUG,"cdr_mysql: got password of %s\n",password);
mysql_init(&mysql);
if (!mysql_real_connect(&mysql, hostname, dbuser, password, dbname, 0, NULL, 0)) {
ast_log(LOG_ERROR, "Failed to connect to mysql database %s on %s.\n", dbname, hostname);
connected = 0;
} else {
ast_log(LOG_DEBUG,"Successfully connected to MySQL database.\n");
connected = 1;
}
res = ast_cdr_register(name, desc, mysql_log);
if (res) {
ast_log(LOG_ERROR, "Unable to register MySQL CDR handling\n");
}
return res;
} }
int reload(void) int reload(void)
{ {
unload_module();
struct ast_config *cfg; return load_module();
struct ast_variable *var;
char *hostname, *dbname, *password, *dbuser;
mysql_close(mysql);
cfg = ast_load(config);
if (!cfg) {
ast_log(LOG_WARNING, "Unable to load MySQL CDR config %s\n", config);
return 0;
}
var = ast_variable_browse(cfg, "global");
if (!var) {
/* nothing configured */
return 0;
}
hostname = ast_variable_retrieve(cfg,"global","hostname");
dbname = ast_variable_retrieve(cfg,"global","dbname");
dbuser = ast_variable_retrieve(cfg,"global","user");
password = ast_variable_retrieve(cfg,"global","password");
ast_log(LOG_DEBUG,"cdr_mysql: got hostname of %s\n",hostname);
ast_log(LOG_DEBUG,"cdr_mysql: got dbname of %s\n",dbname);
ast_log(LOG_DEBUG,"cdr_mysql: got dbuser of %s\n",dbuser);
ast_log(LOG_DEBUG,"cdr_mysql: got password of %s\n",password);
if (hostname == NULL)
{
ast_log(LOG_ERROR,"Database server hostname not specified.\n");
return -1;
}
if (dbname == NULL)
{
ast_log(LOG_ERROR,"Database dbname not specified.\n");
return -1;
}
if (dbuser == NULL)
{
ast_log(LOG_ERROR,"Database dbuser not specified.\n");
return -1;
}
if (password == NULL)
{
ast_log(LOG_ERROR,"Database password not specified.\n");
return -1;
}
mysql = mysql_init(NULL);
mysql = mysql_real_connect(mysql, hostname, dbuser, password, dbname, 0, NULL, 0);
if (mysql == NULL) {
ast_log(LOG_ERROR, "Failed to connect to mysql database.\n");
return -1;
} else {
ast_log(LOG_DEBUG,"Successfully connected to MySQL database.\n");
}
return 0;
} }
int usecount(void) int usecount(void)
{ {
return 0; return connected;
} }
char *key() char *key()
{ {
return ASTERISK_GPL_KEY; return ASTERISK_GPL_KEY;
} }

Loading…
Cancel
Save