sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge TDS cdr fixes (bug #5517, with slight mods) 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2005-10-29 18:49:25 +00:00
parent d6a963c476
commit a4c3f0ae61
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cdr/Makefile
View File

@ -40,6 +40,15 @@ endif
# FreeTDS stuff... # FreeTDS stuff...
# #
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),)
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1)
CFLAGS += -DFREETDS_0_63
else
ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1)
CFLAGS += -DFREETDS_0_62
else
CFLAGS += -DFREETDS_PRE_0_62
endif
endif
MODS+=cdr_tds.so MODS+=cdr_tds.so
endif endif

25
cdr/cdr_tds.c
View File

@ -77,8 +77,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h" #include "asterisk/module.h"
#include "asterisk/logger.h" #include "asterisk/logger.h"
#if !defined(TDS_INT_EXIT) #ifdef FREETDS_PRE_0_62
#define TDS_PRE_0_62
#warning "You have older TDS, you should upgrade!" #warning "You have older TDS, you should upgrade!"
#endif #endif
@ -111,7 +110,7 @@ static int tds_log(struct ast_cdr *cdr)
char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid; char *accountcode, *src, *dst, *dcontext, *clid, *channel, *dstchannel, *lastapp, *lastdata, *uniqueid;
int res = 0; int res = 0;
int retried = 0; int retried = 0;
#ifdef TDS_PRE_0_62 #ifdef FREETDS_PRE_0_62
TDS_INT result_type; TDS_INT result_type;
#endif #endif
@ -205,7 +204,7 @@ static int tds_log(struct ast_cdr *cdr)
retried = 1; /* note that we have now tried */ retried = 1; /* note that we have now tried */
} }
#ifdef TDS_PRE_0_62 #ifdef FREETDS_PRE_0_62
if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED))
#else #else
if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) if (!connected || (tds_submit_query(tds, sqlcmd) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED))
@ -434,7 +433,11 @@ static int mssql_disconnect(void)
static int mssql_connect(void) static int mssql_connect(void)
{ {
#ifdef FREETDS_0_63
TDSCONNECTION *connection = NULL;
#else
TDSCONNECTINFO *connection = NULL; TDSCONNECTINFO *connection = NULL;
#endif
char query[128]; char query[128];
/* Connect to M$SQL Server */ /* Connect to M$SQL Server */
@ -449,7 +452,7 @@ static int mssql_connect(void)
tds_set_passwd(login, password); tds_set_passwd(login, password);
tds_set_app(login, "TSQL"); tds_set_app(login, "TSQL");
tds_set_library(login, "TDS-Library"); tds_set_library(login, "TDS-Library");
#ifndef TDS_PRE_0_62 #ifndef FREETDS_PRE_0_62
tds_set_client_charset(login, charset); tds_set_client_charset(login, charset);
#endif #endif
tds_set_language(login, language); tds_set_language(login, language);
@ -479,15 +482,23 @@ static int mssql_connect(void)
{ {
ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n"); ast_log(LOG_ERROR, "Failed to connect to MSSQL server.\n");
tds = NULL; /* freed by tds_connect() on error */ tds = NULL; /* freed by tds_connect() on error */
#ifdef FREETDS_0_63
tds_free_connection(connection);
#else
tds_free_connect(connection); tds_free_connect(connection);
#endif
connection = NULL; connection = NULL;
goto connect_fail; goto connect_fail;
} }
#ifdef FREETDS_0_63
tds_free_connection(connection);
#else
tds_free_connect(connection); tds_free_connect(connection);
#endif
connection = NULL; connection = NULL;
sprintf(query, "USE %s", dbname); sprintf(query, "USE %s", dbname);
#ifdef TDS_PRE_0_62 #ifdef FREETDS_PRE_0_62
if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED)) if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds, &result_type) != TDS_SUCCEED || result_type != TDS_CMD_SUCCEED))
#else #else
if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED)) if ((tds_submit_query(tds, query) != TDS_SUCCEED) || (tds_process_simple_query(tds) != TDS_SUCCEED))
@ -527,7 +538,7 @@ static int tds_load_module(void)
struct ast_config *cfg; struct ast_config *cfg;
struct ast_variable *var; struct ast_variable *var;
char *ptr = NULL; char *ptr = NULL;
#ifdef TDS_PRE_0_62 #ifdef FREETDS_PRE_0_62
TDS_INT result_type; TDS_INT result_type;
#endif #endif