Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Automerge script 19 years ago
parent 24279ed40d
commit bb63a367e3
3 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File

91
apps/app_rpt.c
Unescape View File

@ -897,53 +897,52 @@ static int telem_lookup(struct ast_channel *chan, char *node, char *name)
static int get_wait_interval(struct rpt *myrpt, int type) static int get_wait_interval(struct rpt *myrpt, int type)
{ {
int interval; int interval;
char *wait_times; char *wait_times;
char *wait_times_save; char *wait_times_save = NULL;
wait_times_save = NULL;
wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
if(wait_times){
wait_times_save = ast_strdupa(wait_times);
if(!wait_times_save){
ast_log(LOG_WARNING, "Out of memory in wait_interval()\n");
wait_times = NULL;
}
}
switch(type){ wait_times = ast_variable_retrieve(cfg, myrpt->name, "wait_times");
case DLY_TELEM:
if(wait_times) if (wait_times) {
interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000); wait_times_save = ast_strdupa(wait_times);
else if (!wait_times_save) {
interval = 1000; ast_log(LOG_WARNING, "Out of memory in wait_interval()\n");
break; wait_times = NULL;
}
case DLY_ID: }
if(wait_times)
interval = retrieve_astcfgint(wait_times_save, "idwait",250,5000,500); switch (type) {
else case DLY_TELEM:
interval = 500; if (wait_times)
break; interval = retrieve_astcfgint(wait_times_save, "telemwait", 500, 5000, 1000);
else
case DLY_UNKEY: interval = 1000;
if(wait_times) break;
interval = retrieve_astcfgint(wait_times_save, "unkeywait",500,5000,1000);
else case DLY_ID:
interval = 1000; if (wait_times)
break; interval = retrieve_astcfgint(wait_times_save, "idwait", 250, 5000, 500);
else
case DLY_CALLTERM: interval = 500;
if(wait_times) break;
interval = retrieve_astcfgint(wait_times_save, "calltermwait",500,5000,1500);
else case DLY_UNKEY:
interval = 1500; if (wait_times)
break; interval = retrieve_astcfgint(wait_times_save, "unkeywait", 500, 5000, 1000);
else
default: interval = 1000;
return 0; break;
}
case DLY_CALLTERM:
if (wait_times)
interval = retrieve_astcfgint(wait_times_save, "calltermwait", 500, 5000, 1500);
else
interval = 1500;
break;
default:
return 0;
}
return interval; return interval;
} }

14
cdr/Makefile
Unescape View File

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

10
cdr/cdr_tds.c
Unescape View File

@ -320,7 +320,7 @@ static int mssql_disconnect(void)
static int mssql_connect(void) static int mssql_connect(void)
{ {
#ifdef FREETDS_0_63 #if (defined(FREETDS_0_63) || defined(FREETDS_0_64))
TDSCONNECTION *connection = NULL; TDSCONNECTION *connection = NULL;
#else #else
TDSCONNECTINFO *connection = NULL; TDSCONNECTINFO *connection = NULL;
@ -346,7 +346,11 @@ static int mssql_connect(void)
tds_set_packet(login, 512); tds_set_packet(login, 512);
tds_set_version(login, 7, 0); tds_set_version(login, 7, 0);
#ifdef FREETDS_0_64
if (!(context = tds_alloc_context(NULL)))
#else
if (!(context = tds_alloc_context())) if (!(context = tds_alloc_context()))
#endif
{ {
ast_log(LOG_ERROR, "tds_alloc_context() failed.\n"); ast_log(LOG_ERROR, "tds_alloc_context() failed.\n");
goto connect_fail; goto connect_fail;
@ -369,7 +373,7 @@ 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 #if (defined(FREETDS_0_63) || defined(FREETDS_0_64))
tds_free_connection(connection); tds_free_connection(connection);
#else #else
tds_free_connect(connection); tds_free_connect(connection);
@ -377,7 +381,7 @@ static int mssql_connect(void)
connection = NULL; connection = NULL;
goto connect_fail; goto connect_fail;
} }
#ifdef FREETDS_0_63 #if (defined(FREETDS_0_63) || defined(FREETDS_0_64))
tds_free_connection(connection); tds_free_connection(connection);
#else #else
tds_free_connect(connection); tds_free_connect(connection);

Write Preview
Loading…
Cancel
Save