mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-11 12:07:06 +00:00
freetdm: rename mod_data to io_data since is data meant for I/O modules only
fix ftmod_isdn usage of mod_data, it should be call_data pointer
This commit is contained in:
1 parent
f3e55a26ef
commit
6cfce6f43d
5 files changed
+57
-53
No files matched your search
@@ -1077,8 +1077,8 @@ static L3INT ftdm_isdn_931_34(void *pvt, struct Q931_Call *call, Q931mes_Generic
|
||||
isdn_data->channels_remote_crv[gen->CRV] = ftdmchan;
|
||||
memset(&ftdmchan->caller_data, 0, sizeof(ftdmchan->caller_data));
|
||||
|
||||
if (ftdmchan->mod_data) {
|
||||
memset(ftdmchan->mod_data, 0, sizeof(ftdm_isdn_bchan_data_t));
|
||||
if (ftdmchan->call_data) {
|
||||
memset(ftdmchan->call_data, 0, sizeof(ftdm_isdn_bchan_data_t));
|
||||
}
|
||||
|
||||
/* copy number readd prefix as needed */
|
||||
@@ -1210,7 +1210,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, struct Q931_Call *call, Q931mes_Generic
|
||||
* overlap dial digit indication
|
||||
*/
|
||||
if (Q931IsIEPresent(gen->CalledNum)) {
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)ftdmchan->mod_data;
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)ftdmchan->call_data;
|
||||
Q931ie_CalledNum *callednum = Q931GetIEPtr(gen->CalledNum, gen->buf);
|
||||
int pos;
|
||||
|
||||
@@ -1365,7 +1365,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
|
||||
break;
|
||||
case FTDM_CHANNEL_STATE_DIALTONE:
|
||||
{
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)ftdmchan->mod_data;
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)ftdmchan->call_data;
|
||||
|
||||
if (data) {
|
||||
data->digit_timeout = ftdm_time_now() + isdn_data->digit_timeout;
|
||||
@@ -1858,7 +1858,7 @@ static void *ftdm_isdn_tones_run(ftdm_thread_t *me, void *obj)
|
||||
switch (ftdm_channel_get_state(chan)) {
|
||||
case FTDM_CHANNEL_STATE_DIALTONE:
|
||||
{
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)chan->mod_data;
|
||||
ftdm_isdn_bchan_data_t *data = (ftdm_isdn_bchan_data_t *)chan->call_data;
|
||||
ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
|
||||
|
||||
/* check overlap dial timeout first before generating tone */
|
||||
@@ -2738,7 +2738,7 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(isdn_configure_span)
|
||||
ftdm_channel_t *chan = ftdm_span_get_channel(span, i);
|
||||
|
||||
if (ftdm_channel_get_type(chan) == FTDM_CHAN_TYPE_B) {
|
||||
chan->mod_data = data;
|
||||
chan->call_data = data;
|
||||
memset(data, 0, sizeof(ftdm_isdn_bchan_data_t));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user