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

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:
Moises Silva 2010-11-15 15:39:44 -05:00
parent f3e55a26ef
commit 6cfce6f43d
5 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/freetdm/src/ftdm_m3ua.c
View File

@ -484,7 +484,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(m3ua_next_event)
static FIO_SPAN_DESTROY_FUNCTION(m3ua_span_destroy) static FIO_SPAN_DESTROY_FUNCTION(m3ua_span_destroy)
{ {
m3ua_span_data_t *span_data = (m3ua_span_data_t *) span->mod_data; m3ua_span_data_t *span_data = (m3ua_span_data_t *) span->io_data;
if (span_data) { if (span_data) {
ftdm_safe_free(span_data); ftdm_safe_free(span_data);
@ -494,8 +494,8 @@ static FIO_SPAN_DESTROY_FUNCTION(m3ua_span_destroy)
} }
static FIO_CHANNEL_DESTROY_FUNCTION(m3ua_channel_destroy) static FIO_CHANNEL_DESTROY_FUNCTION(m3ua_channel_destroy)
{ {
m3ua_chan_data_t *chan_data = (m3ua_chan_data_t *) ftdmchan->mod_data; m3ua_chan_data_t *chan_data = (m3ua_chan_data_t *) ftdmchan->io_data;
m3ua_span_data_t *span_data = (m3ua_span_data_t *) ftdmchan->span->mod_data; m3ua_span_data_t *span_data = (m3ua_span_data_t *) ftdmchan->span->io_data;
if (!chan_data) { if (!chan_data) {
return FTDM_FAIL; return FTDM_FAIL;

12
libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.c
View File

@ -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; isdn_data->channels_remote_crv[gen->CRV] = ftdmchan;
memset(&ftdmchan->caller_data, 0, sizeof(ftdmchan->caller_data)); memset(&ftdmchan->caller_data, 0, sizeof(ftdmchan->caller_data));
if (ftdmchan->mod_data) { if (ftdmchan->call_data) {
memset(ftdmchan->mod_data, 0, sizeof(ftdm_isdn_bchan_data_t)); memset(ftdmchan->call_data, 0, sizeof(ftdm_isdn_bchan_data_t));
} }
/* copy number readd prefix as needed */ /* 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 * overlap dial digit indication
*/ */
if (Q931IsIEPresent(gen->CalledNum)) { 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); Q931ie_CalledNum *callednum = Q931GetIEPtr(gen->CalledNum, gen->buf);
int pos; int pos;
@ -1365,7 +1365,7 @@ static __inline__ void state_advance(ftdm_channel_t *ftdmchan)
break; break;
case FTDM_CHANNEL_STATE_DIALTONE: 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) { if (data) {
data->digit_timeout = ftdm_time_now() + isdn_data->digit_timeout; 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)) { switch (ftdm_channel_get_state(chan)) {
case FTDM_CHANNEL_STATE_DIALTONE: 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); ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
/* check overlap dial timeout first before generating tone */ /* 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); ftdm_channel_t *chan = ftdm_span_get_channel(span, i);
if (ftdm_channel_get_type(chan) == FTDM_CHAN_TYPE_B) { 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)); memset(data, 0, sizeof(ftdm_isdn_bchan_data_t));
} }
} }

36
libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.c
View File

@ -266,7 +266,7 @@ PK_VOID PK_CALLBACK media_out_callback(PKH_TPikaEvent *event)
{ {
PK_STATUS pk_status; PK_STATUS pk_status;
ftdm_channel_t *ftdmchan = event->userData; ftdm_channel_t *ftdmchan = event->userData;
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
//PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH]; //PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
//PKH_EVENT_GetText(event->id, event_text, sizeof(event_text)); //PKH_EVENT_GetText(event->id, event_text, sizeof(event_text));
@ -345,8 +345,8 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
} }
if (span->mod_data) { if (span->io_data) {
span_data = span->mod_data; span_data = span->io_data;
} else { } else {
span_data = ftdm_malloc(sizeof(*span_data)); span_data = ftdm_malloc(sizeof(*span_data));
assert(span_data != NULL); assert(span_data != NULL);
@ -364,7 +364,7 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
//PKH_QUEUE_Attach(span_data->event_queue, globals.open_boards[boardno], NULL); //PKH_QUEUE_Attach(span_data->event_queue, globals.open_boards[boardno], NULL);
span->mod_data = span_data; span->io_data = span_data;
} }
if (type == FTDM_CHAN_TYPE_FXS || type == FTDM_CHAN_TYPE_FXO) { if (type == FTDM_CHAN_TYPE_FXS || type == FTDM_CHAN_TYPE_FXO) {
@ -380,7 +380,7 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
assert(chan_data); assert(chan_data);
memset(chan_data, 0, sizeof(*chan_data)); memset(chan_data, 0, sizeof(*chan_data));
ftdm_span_add_channel(span, 0, type, &chan); ftdm_span_add_channel(span, 0, type, &chan);
chan->mod_data = chan_data; chan->io_data = chan_data;
if ((type == FTDM_CHAN_TYPE_B || type == FTDM_CHAN_TYPE_DQ921) && !span_data->handle) { if ((type == FTDM_CHAN_TYPE_B || type == FTDM_CHAN_TYPE_DQ921) && !span_data->handle) {
PKH_TBoardConfig boardConfig; PKH_TBoardConfig boardConfig;
@ -680,7 +680,7 @@ static FIO_CONFIGURE_SPAN_FUNCTION(pika_configure_span)
*/ */
static FIO_OPEN_FUNCTION(pika_open) static FIO_OPEN_FUNCTION(pika_open)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
if (!chan_data && !ftdm_test_flag(chan_data, PK_FLAG_READY)) { if (!chan_data && !ftdm_test_flag(chan_data, PK_FLAG_READY)) {
return FTDM_FAIL; return FTDM_FAIL;
@ -715,7 +715,7 @@ static FIO_CLOSE_FUNCTION(pika_close)
*/ */
static FIO_WAIT_FUNCTION(pika_wait) static FIO_WAIT_FUNCTION(pika_wait)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
PK_STATUS status; PK_STATUS status;
ftdm_wait_flag_t myflags = *flags; ftdm_wait_flag_t myflags = *flags;
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH]; PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
@ -754,7 +754,7 @@ static FIO_WAIT_FUNCTION(pika_wait)
*/ */
static FIO_READ_FUNCTION(pika_read) static FIO_READ_FUNCTION(pika_read)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
PK_STATUS status; PK_STATUS status;
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH]; PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
uint32_t len; uint32_t len;
@ -795,7 +795,7 @@ static FIO_READ_FUNCTION(pika_read)
*/ */
static FIO_WRITE_FUNCTION(pika_write) static FIO_WRITE_FUNCTION(pika_write)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
PK_STATUS status; PK_STATUS status;
if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) { if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
@ -821,8 +821,8 @@ static FIO_WRITE_FUNCTION(pika_write)
*/ */
static FIO_COMMAND_FUNCTION(pika_command) static FIO_COMMAND_FUNCTION(pika_command)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
//pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->mod_data; //pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->io_data;
PK_STATUS pk_status; PK_STATUS pk_status;
ftdm_status_t status = FTDM_SUCCESS; ftdm_status_t status = FTDM_SUCCESS;
@ -956,7 +956,7 @@ static FIO_COMMAND_FUNCTION(pika_command)
*/ */
static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event) static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
{ {
pika_span_data_t *span_data = (pika_span_data_t *) span->mod_data; pika_span_data_t *span_data = (pika_span_data_t *) span->io_data;
PK_STATUS status; PK_STATUS status;
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH]; PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
@ -1025,7 +1025,7 @@ static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
for(x = 1; x <= span->chan_count; x++) { for(x = 1; x <= span->chan_count; x++) {
ftdmchan = span->channels[x]; ftdmchan = span->channels[x];
assert(ftdmchan != NULL); assert(ftdmchan != NULL);
chan_data = (pika_chan_data_t *) ftdmchan->mod_data; chan_data = (pika_chan_data_t *) ftdmchan->io_data;
assert(chan_data != NULL); assert(chan_data != NULL);
@ -1042,7 +1042,7 @@ static FIO_SPAN_POLL_EVENT_FUNCTION(pika_poll_event)
//ftdm_log(FTDM_LOG_DEBUG, "Event: %s\n", event_text); //ftdm_log(FTDM_LOG_DEBUG, "Event: %s\n", event_text);
if (ftdmchan) { if (ftdmchan) {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
assert(chan_data != NULL); assert(chan_data != NULL);
ftdm_set_flag(ftdmchan, FTDM_CHANNEL_EVENT); ftdm_set_flag(ftdmchan, FTDM_CHANNEL_EVENT);
@ -1068,7 +1068,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
for(i = 1; i <= span->chan_count; i++) { for(i = 1; i <= span->chan_count; i++) {
if (ftdm_test_flag(span->channels[i], FTDM_CHANNEL_EVENT)) { if (ftdm_test_flag(span->channels[i], FTDM_CHANNEL_EVENT)) {
pika_chan_data_t *chan_data = (pika_chan_data_t *) span->channels[i]->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) span->channels[i]->io_data;
PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH]; PK_CHAR event_text[PKH_EVENT_MAX_NAME_LENGTH];
ftdm_clear_flag(span->channels[i], FTDM_CHANNEL_EVENT); ftdm_clear_flag(span->channels[i], FTDM_CHANNEL_EVENT);
@ -1207,7 +1207,7 @@ static FIO_SPAN_NEXT_EVENT_FUNCTION(pika_next_event)
*/ */
static FIO_SPAN_DESTROY_FUNCTION(pika_span_destroy) static FIO_SPAN_DESTROY_FUNCTION(pika_span_destroy)
{ {
pika_span_data_t *span_data = (pika_span_data_t *) span->mod_data; pika_span_data_t *span_data = (pika_span_data_t *) span->io_data;
if (span_data) { if (span_data) {
PKH_QUEUE_Destroy(span_data->event_queue); PKH_QUEUE_Destroy(span_data->event_queue);
@ -1224,8 +1224,8 @@ static FIO_SPAN_DESTROY_FUNCTION(pika_span_destroy)
*/ */
static FIO_CHANNEL_DESTROY_FUNCTION(pika_channel_destroy) static FIO_CHANNEL_DESTROY_FUNCTION(pika_channel_destroy)
{ {
pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->mod_data; pika_chan_data_t *chan_data = (pika_chan_data_t *) ftdmchan->io_data;
pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->mod_data; pika_span_data_t *span_data = (pika_span_data_t *) ftdmchan->span->io_data;
if (!chan_data) { if (!chan_data) {
return FTDM_FAIL; return FTDM_FAIL;

16
libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
View File

@ -119,7 +119,7 @@ static __inline__ int tdmv_api_wait_socket(ftdm_channel_t *ftdmchan, int timeout
int err; int err;
uint32_t inflags = *flags; uint32_t inflags = *flags;
uint32_t outflags = 0; uint32_t outflags = 0;
sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->mod_data; sangoma_wait_obj_t *sangoma_wait_obj = ftdmchan->io_data;
err = sangoma_waitfor(sangoma_wait_obj, inflags, &outflags, timeout); err = sangoma_waitfor(sangoma_wait_obj, inflags, &outflags, timeout);
*flags = 0; *flags = 0;
@ -252,7 +252,7 @@ static unsigned wp_open_range(ftdm_span_t *span, unsigned spanno, unsigned start
ftdm_log(FTDM_LOG_ERROR, "failure create waitable object for s%dc%d\n", spanno, x); ftdm_log(FTDM_LOG_ERROR, "failure create waitable object for s%dc%d\n", spanno, x);
continue; continue;
} }
chan->mod_data = sangoma_wait_obj; chan->io_data = sangoma_wait_obj;
#endif #endif
chan->physical_span_id = spanno; chan->physical_span_id = spanno;
@ -541,7 +541,7 @@ static FIO_OPEN_FUNCTION(wanpipe_open)
static FIO_CLOSE_FUNCTION(wanpipe_close) static FIO_CLOSE_FUNCTION(wanpipe_close)
{ {
#ifdef LIBSANGOMA_VERSION #ifdef LIBSANGOMA_VERSION
sangoma_wait_obj_t *waitobj = ftdmchan->mod_data; sangoma_wait_obj_t *waitobj = ftdmchan->io_data;
/* kick any I/O waiters */ /* kick any I/O waiters */
sangoma_wait_obj_signal(waitobj); sangoma_wait_obj_signal(waitobj);
#endif #endif
@ -895,10 +895,10 @@ FIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event)
for(i = 1; i <= span->chan_count; i++) { for(i = 1; i <= span->chan_count; i++) {
ftdm_channel_t *ftdmchan = span->channels[i]; ftdm_channel_t *ftdmchan = span->channels[i];
#ifdef LIBSANGOMA_VERSION #ifdef LIBSANGOMA_VERSION
if (!ftdmchan->mod_data) { if (!ftdmchan->io_data) {
continue; /* should never happen but happens when shutting down */ continue; /* should never happen but happens when shutting down */
} }
pfds[j] = ftdmchan->mod_data; pfds[j] = ftdmchan->io_data;
inflags[j] = poll_events ? poll_events[j] : POLLPRI; inflags[j] = poll_events ? poll_events[j] : POLLPRI;
#else #else
memset(&pfds[j], 0, sizeof(pfds[j])); memset(&pfds[j], 0, sizeof(pfds[j]));
@ -1234,10 +1234,10 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
static FIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy) static FIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy)
{ {
#ifdef LIBSANGOMA_VERSION #ifdef LIBSANGOMA_VERSION
if (ftdmchan->mod_data) { if (ftdmchan->io_data) {
sangoma_wait_obj_t *sangoma_wait_obj; sangoma_wait_obj_t *sangoma_wait_obj;
sangoma_wait_obj = ftdmchan->mod_data; sangoma_wait_obj = ftdmchan->io_data;
ftdmchan->mod_data = NULL; ftdmchan->io_data = NULL;
sangoma_wait_obj_delete(&sangoma_wait_obj); sangoma_wait_obj_delete(&sangoma_wait_obj);
} }
#endif #endif

8
libs/freetdm/src/include/private/ftdm_core.h
View File

@ -424,7 +424,9 @@ struct ftdm_channel {
ftdm_fsk_data_state_t fsk; ftdm_fsk_data_state_t fsk;
uint8_t fsk_buf[80]; uint8_t fsk_buf[80];
uint32_t ring_count; uint32_t ring_count;
void *mod_data; /* Private I/O data. Do not touch unless you are an I/O module */
void *io_data;
/* Private signaling data. Do not touch unless you are a signaling module */
void *call_data; void *call_data;
struct ftdm_caller_data caller_data; struct ftdm_caller_data caller_data;
struct ftdm_span *span; struct ftdm_span *span;
@ -456,6 +458,7 @@ struct ftdm_span {
ftdm_trunk_type_t trunk_type; ftdm_trunk_type_t trunk_type;
ftdm_analog_start_type_t start_type; ftdm_analog_start_type_t start_type;
ftdm_signal_type_t signal_type; ftdm_signal_type_t signal_type;
/* Private signaling data. Do not touch unless you are a signaling module */
void *signal_data; void *signal_data;
fio_signal_cb_t signal_cb; fio_signal_cb_t signal_cb;
ftdm_event_t event_header; ftdm_event_t event_header;
@ -473,7 +476,8 @@ struct ftdm_span {
ftdm_span_start_t start; ftdm_span_start_t start;
ftdm_span_stop_t stop; ftdm_span_stop_t stop;
ftdm_channel_sig_read_t sig_read; ftdm_channel_sig_read_t sig_read;
void *mod_data; /* Private I/O data per span. Do not touch unless you are an I/O module */
void *io_data;
char *type; char *type;
char *dtmf_hangup; char *dtmf_hangup;
size_t dtmf_hangup_len; size_t dtmf_hangup_len;