kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

freetdm: fixed ftmod_r2 r2conf function pointers

This commit is contained in:
Arnaldo Pereira 2010-11-15 21:10:39 -02:00
parent 9fa6fb5e02
commit b1e773e787
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
View File

@ -879,7 +879,7 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
ftdm_r2_call_t *r2call = NULL; ftdm_r2_call_t *r2call = NULL;
openr2_chan_t *r2chan = NULL; openr2_chan_t *r2chan = NULL;
openr2_log_level_t tmplevel; openr2_log_level_t tmplevel;
char *clevel; char *clevel = NULL;
char *logval = NULL; char *logval = NULL;
ft_r2_conf_t r2conf = ft_r2_conf_t r2conf =
@ -887,20 +887,21 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
/* .variant */ OR2_VAR_ITU, /* .variant */ OR2_VAR_ITU,
/* .category */ OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER, /* .category */ OR2_CALLING_PARTY_CATEGORY_NATIONAL_SUBSCRIBER,
/* .loglevel */ OR2_LOG_ERROR | OR2_LOG_WARNING, /* .loglevel */ OR2_LOG_ERROR | OR2_LOG_WARNING,
/* .logdir */ NULL,
/* .advanced_protocol_file */ NULL,
/* .max_ani */ 10, /* .max_ani */ 10,
/* .max_dnis */ 4, /* .max_dnis */ 4,
/* .mfback_timeout */ -1, /* .mfback_timeout */ -1,
/* .metering_pulse_timeout */ -1, /* .metering_pulse_timeout */ -1,
/* .allow_collect_calls */ -1,
/* .immediate_accept */ -1, /* .immediate_accept */ -1,
/* .skip_category */ -1, /* .skip_category */ -1,
/* .forced_release */ -1,
/* .charge_calls */ -1,
/* .get_ani_first */ -1, /* .get_ani_first */ -1,
/* .call_files */ 0, /* .call_files */ 0,
/* .mf_files */ 0, /* .mf_files */ 0,
/* .logdir */ NULL, /* .double_answer */ 0,
/* .advanced_protocol_file */ NULL /* .charge_calls */ -1,
/* .forced_release */ -1,
/* .allow_collect_calls */ -1
}; };
assert(sig_cb != NULL); assert(sig_cb != NULL);
@ -982,15 +983,6 @@ static FIO_SIG_CONFIGURE_FUNCTION(ftdm_r2_configure_span)
} }
if (ftdm_strlen_zero_buf(val)) { if (ftdm_strlen_zero_buf(val)) {
ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 advanced_protocol_file parameter\n"); ftdm_log(FTDM_LOG_NOTICE, "Ignoring empty R2 advanced_protocol_file parameter\n");
/*
* TODO: investigate this
*
* despite the fact advanced_protocol_file was initialized as NULL, it's now a bad
* pointer - hence, this workaround.
* this seems to happen only on windows.
*
*/
r2conf.advanced_protocol_file = NULL;
continue; continue;
} }
r2conf.advanced_protocol_file = val; r2conf.advanced_protocol_file = val;