static const char *ftdm_span_get_trunk_type_str(const ftdm_span_t *span)
{
+ assert(span);
return ftdm_trunk_type2str(span->trunk_type);
}
+static int ftdm_channel_get_state(const ftdm_channel_t *chan)
+{
+ assert(chan);
+ return chan->state;
+}
+
+static int ftdm_channel_get_last_state(const ftdm_channel_t *chan)
+{
+ assert(chan);
+ return chan->last_state;
+}
+
/*****************************************************************************************
* PCAP
* Based on Helmut Kuper's (<helmut.kuper@ewetel.de>) implementation,
{
struct pcap_context *pcap = NULL;
- if (!isdn) {
- return FTDM_FAIL;
- }
-
- if (ftdm_strlen_zero(filename)) {
+ if (!isdn || ftdm_strlen_zero(filename))
return FTDM_FAIL;
- }
pcap = malloc(sizeof(struct pcap_context));
if (!pcap) {
pcap->dump = pcap_dump_open(pcap->handle, pcap->filename);
if (!pcap->dump) {
- ftdm_log(FTDM_LOG_ERROR, "Failed to open capture file: %s\n", pcap_geterr(pcap->handle));
+ ftdm_log(FTDM_LOG_ERROR, "Failed to open capture file: '%s'\n", pcap_geterr(pcap->handle));
goto error;
}
- ftdm_log(FTDM_LOG_INFO, "Capture file \"%s\" opened\n", pcap->filename);
+ ftdm_log(FTDM_LOG_INFO, "Capture file '%s' opened\n", pcap->filename);
isdn->pcap = pcap;
return FTDM_SUCCESS;
-
error:
- if (pcap->handle) {
+ if (pcap->handle)
pcap_close(pcap->handle);
- }
- if (pcap->filename) {
+ if (pcap->filename)
free(pcap->filename);
- }
free(pcap);
struct pcap_context *pcap = NULL;
long size;
- if (!isdn || !isdn->pcap) {
+ if (!isdn || !isdn->pcap)
return FTDM_FAIL;
- }
+
pcap = isdn->pcap;
isdn->flags &= ~(FTDM_ISDN_CAPTURE | FTDM_ISDN_CAPTURE_L3ONLY);
pcap_dump_flush(pcap->dump);
size = pcap_dump_ftell(pcap->dump);
- ftdm_log(FTDM_LOG_INFO, "File \"%s\" captured %ld bytes of data\n", pcap->filename, size);
+ ftdm_log(FTDM_LOG_INFO, "File '%s' captured %ld bytes of data\n", pcap->filename, size);
pcap_dump_close(pcap->dump);
pcap_close(pcap->handle);
int offset = sizeof(struct isdn_sll_hdr);
int nbytes;
- if (!isdn || !isdn->pcap || !buf || !len) {
+ if (!isdn || !isdn->pcap || !buf || !len)
return FTDM_FAIL;
- }
pcap = isdn->pcap;
isdn_data->outbound_crv[gen->CRV] = caller_data;
//isdn_data->channels_local_crv[gen->CRV] = ftdmchan;
- while(ftdm_running() && caller_data->call_state == FTDM_CALLER_STATE_DIALING) {
+ while (ftdm_running() && caller_data->call_state == FTDM_CALLER_STATE_DIALING) {
ftdm_sleep(1);
if (!--sanity) {
int fail = 1;
new_chan = NULL;
- if (caller_data->chan_id < FTDM_MAX_CHANNELS_SPAN && caller_data->chan_id <= span->chan_count) {
- new_chan = span->channels[caller_data->chan_id];
+ if (caller_data->chan_id > 0 && caller_data->chan_id <= ftdm_span_get_chan_count(span)) {
+ new_chan = ftdm_span_get_channel(span, caller_data->chan_id);
}
if (new_chan && (status = ftdm_channel_open_chan(new_chan) == FTDM_SUCCESS)) {
/*
* Global event
*/
-
ftdm_log(FTDM_LOG_DEBUG, "Received global event from Q.931\n");
- }
- else {
+ } else {
ftdm_channel_t *ftdmchan = NULL;
ftdm_sigmsg_t sig;
int call_crv = Q931CallGetCRV(call);
{
int offset = 0;
- if (!digits || !buf || size <= 0) {
+ if (!digits || !buf || size <= 0)
return;
- }
switch (ton) {
case Q931_TON_NATIONAL:
*/
static L3INT ftdm_isdn_931_34(void *pvt, struct Q931_Call *call, Q931mes_Generic *msg, int mlen)
{
+ Q931mes_Generic *gen = (Q931mes_Generic *) msg;
ftdm_span_t *span = (ftdm_span_t *) pvt;
ftdm_isdn_data_t *isdn_data = span->signal_data;
- Q931mes_Generic *gen = (Q931mes_Generic *) msg;
+ ftdm_channel_t *ftdmchan = NULL;
int chan_id = 0;
int chan_hunt = 0;
- ftdm_channel_t *ftdmchan = NULL;
-// ftdm_caller_data_t *caller_data = NULL;
if (Q931IsIEPresent(gen->ChanID)) {
Q931ie_ChanID *chanid = Q931GetIEPtr(gen->ChanID, gen->buf);
- if(chanid->IntType)
+ if (chanid->IntType)
chan_id = chanid->ChanSlot;
else
chan_id = chanid->InfoChanSel;
/* "any" channel specified */
- if(chanid->InfoChanSel == 3) {
+ if (chanid->InfoChanSel == 3) {
chan_hunt++;
}
} else if (FTDM_SPAN_IS_NT(span)) {
case Q931mes_ALERTING:
case Q931mes_PROGRESS:
case Q931mes_CONNECT:
- {
- caller_data->call_state = FTDM_CALLER_STATE_SUCCESS;
- }
+ caller_data->call_state = FTDM_CALLER_STATE_SUCCESS;
break;
default:
caller_data->call_state = FTDM_CALLER_STATE_FAIL;
ftdmchan = isdn_data->channels_remote_crv[gen->CRV];
}
- ftdm_log(FTDM_LOG_DEBUG, "ftdmchan %x (%d:%d) source isdn_data->channels_%s_crv[%#hx]\n", ftdmchan, ftdmchan ? ftdmchan->span_id : -1, ftdmchan ? ftdmchan->chan_id : -1, gen->CRVFlag ? "local" : "remote", gen->CRV);
-
+ ftdm_log(FTDM_LOG_DEBUG, "ftdmchan %x (%d:%d) source isdn_data->channels_%s_crv[%#hx]\n",
+ ftdmchan,
+ ((ftdmchan) ? ftdm_channel_get_span_id(ftdmchan) : -1),
+ ((ftdmchan) ? ftdm_channel_get_id(ftdmchan) : -1),
+ ((gen->CRVFlag) ? "local" : "remote"),
+ gen->CRV);
if (gen->ProtDisc == 3) {
switch(gen->MesType) {
case 0: /* change status to "in service" */
{
ftdm_clear_flag_locked(ftdmchan, FTDM_CHANNEL_SUSPENDED);
- ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d in service\n", ftdmchan->span_id, ftdmchan->chan_id);
+ ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d in service\n",
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan));
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
}
break;
case Q931mes_RESTART:
{
if (chan_id) {
- ftdmchan = span->channels[chan_id];
+ ftdmchan = ftdm_span_get_channel(span, chan_id);
}
if (ftdmchan) {
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
} else {
uint32_t i;
- for (i = 1; i < span->chan_count; i++) {
+ for (i = 1; i < ftdm_span_get_chan_count(span); i++) {
/* Skip channels that are down and D-Channels (#OpenZAP-39) */
- if (span->channels[i]->state == FTDM_CHANNEL_STATE_DOWN || span->channels[i]->type == FTDM_CHAN_TYPE_DQ921)
+ if (ftdm_channel_get_state(span->channels[i]) == FTDM_CHANNEL_STATE_DOWN ||
+ ftdm_channel_get_type(span->channels[i]) == FTDM_CHAN_TYPE_DQ921)
continue;
- ftdm_set_state_locked((span->channels[i]), FTDM_CHANNEL_STATE_RESTART);
+ ftdm_set_state_locked(span->channels[i], FTDM_CHANNEL_STATE_RESTART);
}
}
}
{
const char *what = gen->MesType == Q931mes_RELEASE ? "Release" : "Release Complete";
if (ftdmchan) {
- if (ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING || ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP) {
+ if (ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_TERMINATING ||
+ ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_HANGUP)
+ {
if (gen->MesType == Q931mes_RELEASE) {
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
} else {
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
}
}
- else if((gen->MesType == Q931mes_RELEASE && ftdmchan->state <= FTDM_CHANNEL_STATE_UP) ||
- (gen->MesType == Q931mes_RELEASE_COMPLETE && ftdmchan->state == FTDM_CHANNEL_STATE_DIALING)) {
+ else if ((gen->MesType == Q931mes_RELEASE && ftdm_channel_get_state(ftdmchan) <= FTDM_CHANNEL_STATE_UP) ||
+ (gen->MesType == Q931mes_RELEASE_COMPLETE && ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_DIALING)) {
/*
* Don't keep inbound channels open if the remote side hangs up before we answered
ftdm_status_t status;
memset(&sig, 0, sizeof(sig));
- sig.chan_id = ftdmchan->chan_id;
- sig.span_id = ftdmchan->span_id;
+ sig.span_id = ftdm_channel_get_span_id(ftdmchan);
+ sig.chan_id = ftdm_channel_get_id(ftdmchan);
sig.channel = ftdmchan;
sig.channel->caller_data.hangup_cause = (cause) ? cause->Value : FTDM_CAUSE_NORMAL_UNSPECIFIED;
sig.event_id = FTDM_SIGEVENT_STOP;
status = isdn_data->sig_cb(&sig);
- ftdm_log(FTDM_LOG_DEBUG, "Received %s in state %s, requested hangup for channel %d:%d\n", what, ftdm_channel_state2str(ftdmchan->state), ftdmchan->span_id, chan_id);
- }
- else {
- ftdm_log(FTDM_LOG_DEBUG, "Ignoring %s on channel %d\n", what, chan_id);
+ ftdm_log(FTDM_LOG_DEBUG, "Received %s in state %s, requested hangup for channel %d:%d\n", what,
+ ftdm_channel_get_state_str(ftdmchan),
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan));
+ } else {
+ ftdm_log(FTDM_LOG_DEBUG, "Ignoring %s on channel %d\n", what, ftdm_channel_get_id(ftdmchan));
}
} else {
ftdm_log(FTDM_LOG_CRIT, "Received %s with no matching channel %d\n", what, chan_id);
{
Q931ie_CallingNum *callingnum = Q931GetIEPtr(gen->CallingNum, gen->buf);
Q931ie_CalledNum *callednum = Q931GetIEPtr(gen->CalledNum, gen->buf);
- int fail = 1;
- int fail_cause = 0;
- int overlap_dial = 0;
uint32_t cplen = mlen;
+ int overlap_dial = 0;
+ int fail_cause = 0;
+ int fail = 1;
- if(ftdmchan && ftdmchan == isdn_data->channels_remote_crv[gen->CRV]) {
+ if (ftdmchan && ftdmchan == isdn_data->channels_remote_crv[gen->CRV]) {
ftdm_log(FTDM_LOG_INFO, "Duplicate SETUP message(?) for Channel %d:%d ~ %d:%d in state %s [ignoring]\n",
- ftdmchan->span_id,
- ftdmchan->chan_id,
- ftdmchan->physical_span_id,
- ftdmchan->physical_chan_id,
- ftdm_channel_state2str(ftdmchan->state));
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan),
+ ftdm_channel_get_ph_span_id(ftdmchan),
+ ftdm_channel_get_ph_id(ftdmchan),
+ ftdm_channel_get_state_str(ftdmchan));
break;
}
* In NT-mode with channel selection "any",
* try to find a free channel
*/
- for (x = 1; x <= span->chan_count; x++) {
- ftdm_channel_t *zc = span->channels[x];
+ for (x = 1; x <= ftdm_span_get_chan_count(span); x++) {
+ ftdm_channel_t *zc = ftdm_span_get_channel(span, x);
- if (!ftdm_test_flag(zc, FTDM_CHANNEL_INUSE) && zc->state == FTDM_CHANNEL_STATE_DOWN) {
+ if (!ftdm_test_flag(zc, FTDM_CHANNEL_INUSE) && ftdm_channel_get_state(zc) == FTDM_CHANNEL_STATE_DOWN) {
ftdmchan = zc;
break;
}
* TODO: NT mode is abled to select a different channel if the one chosen
* by the TE side is already in use
*/
- if (chan_id > 0 && chan_id < FTDM_MAX_CHANNELS_SPAN && chan_id <= span->chan_count) {
- ftdmchan = span->channels[chan_id];
+ if (chan_id > 0 && chan_id < FTDM_MAX_CHANNELS_SPAN && chan_id <= ftdm_span_get_chan_count(span)) {
+ ftdmchan = ftdm_span_get_channel(span, chan_id);
}
else {
/* invalid channel id */
if (FTDM_SPAN_IS_NT(span)) {
ftdm_log(FTDM_LOG_NOTICE, "No destination number found, assuming overlap dial\n");
overlap_dial++;
- }
- else {
+ } else {
ftdm_log(FTDM_LOG_ERROR, "No destination number found\n");
ftdmchan = NULL;
}
}
if (ftdmchan) {
- if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE) || ftdmchan->state != FTDM_CHANNEL_STATE_DOWN) {
- if (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN || ftdmchan->state >= FTDM_CHANNEL_STATE_TERMINATING) {
+ if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE) || ftdm_channel_get_state(ftdmchan) != FTDM_CHANNEL_STATE_DOWN) {
+ if (ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_DOWN || ftdm_channel_get_state(ftdmchan) >= FTDM_CHANNEL_STATE_TERMINATING)
+ {
int x = 0;
ftdm_log(FTDM_LOG_WARNING, "Channel %d:%d ~ %d:%d is already in use waiting for it to become available.\n",
- ftdmchan->span_id,
- ftdmchan->chan_id,
- ftdmchan->physical_span_id,
- ftdmchan->physical_chan_id);
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan),
+ ftdm_channel_get_ph_span_id(ftdmchan),
+ ftdm_channel_get_ph_id(ftdmchan));
for (x = 0; x < 200; x++) {
if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
}
if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE)) {
ftdm_log(FTDM_LOG_ERROR, "Channel %d:%d ~ %d:%d is already in use.\n",
- ftdmchan->span_id,
- ftdmchan->chan_id,
- ftdmchan->physical_span_id,
- ftdmchan->physical_chan_id
- );
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan),
+ ftdm_channel_get_ph_span_id(ftdmchan),
+ ftdm_channel_get_ph_id(ftdmchan));
ftdmchan = NULL;
}
}
- if (ftdmchan && ftdmchan->state == FTDM_CHANNEL_STATE_DOWN) {
+ if (ftdmchan && ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_DOWN) {
+ ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(ftdmchan);
+
isdn_data->channels_remote_crv[gen->CRV] = ftdmchan;
memset(&ftdmchan->caller_data, 0, sizeof(ftdmchan->caller_data));
}
/* copy number readd prefix as needed */
- isdn_get_number(callingnum, ftdmchan->caller_data.cid_num.digits);
- isdn_get_number(callingnum, ftdmchan->caller_data.cid_name);
- isdn_get_number(callingnum, ftdmchan->caller_data.ani.digits);
+ isdn_get_number(callingnum, caller_data->cid_num.digits);
+ isdn_get_number(callingnum, caller_data->cid_name);
+ isdn_get_number(callingnum, caller_data->ani.digits);
-// ftdm_set_string(ftdmchan->caller_data.cid_num.digits, (char *)callingnum->Digit);
-// ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)callingnum->Digit);
-// ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)callingnum->Digit);
if (!overlap_dial) {
-// ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)callednum->Digit);
- isdn_get_number(callednum, ftdmchan->caller_data.dnis.digits);
+ isdn_get_number(callednum, caller_data->dnis.digits);
}
#ifdef __TODO_OR_REMOVE__
ftdmchan->caller_data.CRV = gen->CRV;
#endif
- if (cplen > sizeof(ftdmchan->caller_data.raw_data)) {
- cplen = sizeof(ftdmchan->caller_data.raw_data);
+ if (cplen > sizeof(caller_data->raw_data)) {
+ cplen = sizeof(caller_data->raw_data);
}
gen->CRVFlag = !(gen->CRVFlag);
- memcpy(ftdmchan->caller_data.raw_data, msg, cplen);
- ftdmchan->caller_data.raw_data_len = cplen;
+ memcpy(caller_data->raw_data, msg, cplen);
+ caller_data->raw_data_len = cplen;
fail = 0;
}
}
if (fail) {
Q931ie_Cause cause;
+
gen->MesType = Q931mes_DISCONNECT;
gen->CRVFlag = 1; /* inbound call */
+
cause.IEId = Q931ie_CAUSE;
cause.Size = sizeof(Q931ie_Cause);
cause.CodStand = Q931_CODING_ITU;
Q931InitIEChanID(&ChanID);
ChanID.IntType = FTDM_SPAN_IS_BRI(ftdmchan->span) ? 0 : 1; /* PRI = 1, BRI = 0 */
ChanID.PrefExcl = FTDM_SPAN_IS_NT(ftdmchan->span) ? 1 : 0; /* Exclusive in NT-mode = 1, Preferred otherwise = 0 */
- if(ChanID.IntType) {
+ if (ChanID.IntType) {
ChanID.InfoChanSel = 1; /* None = 0, See Slot = 1, Any = 3 */
ChanID.ChanMapType = 3; /* B-Chan */
- ChanID.ChanSlot = (unsigned char)ftdmchan->chan_id;
+ ChanID.ChanSlot = (unsigned char)ftdm_channel_get_id(ftdmchan);
} else {
- ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
+ ChanID.InfoChanSel = (unsigned char)ftdm_channel_get_id(ftdmchan) & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
}
gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
case Q931mes_CALL_PROCEEDING:
{
if (ftdmchan) {
- ftdm_log(FTDM_LOG_CRIT, "Received CALL PROCEEDING message for channel %d\n", chan_id);
+ ftdm_log(FTDM_LOG_CRIT, "Received CALL PROCEEDING message for channel %d\n", ftdm_channel_get_id(ftdmchan));
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS);
} else {
ftdm_log(FTDM_LOG_CRIT, "Received CALL PROCEEDING with no matching channel %d\n", chan_id);
case Q931mes_CONNECT_ACKNOWLEDGE:
{
if (ftdmchan) {
- ftdm_log(FTDM_LOG_DEBUG, "Received CONNECT_ACK message for channel %d\n", chan_id);
+ ftdm_log(FTDM_LOG_DEBUG, "Received CONNECT_ACK message for channel %d\n", ftdm_channel_get_id(ftdmchan));
} else {
ftdm_log(FTDM_LOG_DEBUG, "Received CONNECT_ACK with no matching channel %d\n", chan_id);
}
case Q931mes_INFORMATION:
{
if (ftdmchan) {
- ftdm_log(FTDM_LOG_CRIT, "Received INFORMATION message for channel %d\n", ftdmchan->chan_id);
+ ftdm_log(FTDM_LOG_CRIT, "Received INFORMATION message for channel %d\n", ftdm_channel_get_id(ftdmchan));
- if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALTONE) {
+ if (ftdm_channel_get_state(ftdmchan) == FTDM_CHANNEL_STATE_DIALTONE) {
char digit = '\0';
/*
/* TODO: make this more safe with strncat() */
pos = strlen(ftdmchan->caller_data.dnis.digits);
- strcat(&ftdmchan->caller_data.dnis.digits[pos], (char *)callednum->Digit);
+ strcat(&ftdmchan->caller_data.dnis.digits[pos], (char *)callednum->Digit);
/* update timer */
data->digit_timeout = ftdm_time_now() + isdn_data->digit_timeout;
ftdm_status_t status;
ftdm_log(FTDM_LOG_DEBUG, "%d:%d STATE [%s]\n",
- ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state));
+ ftdm_channel_get_span_id(ftdmchan),
+ ftdm_channel_get_id(ftdmchan),
+ ftdm_channel_get_state_str(ftdmchan));
memset(&sig, 0, sizeof(sig));
- sig.chan_id = ftdmchan->chan_id;
- sig.span_id = ftdmchan->span_id;
+ sig.span_id = ftdm_channel_get_span_id(ftdmchan);
+ sig.chan_id = ftdm_channel_get_id(ftdmchan);
sig.channel = ftdmchan;
- switch (ftdmchan->state) {
+ switch (ftdm_channel_get_state(ftdmchan)) {
case FTDM_CHANNEL_STATE_DOWN:
{
if (gen->CRV) {
gen->CRV = crv;
gen->CRVFlag = 1; /* inbound */
- if (FTDM_SPAN_IS_NT(ftdmchan->span)) {
+ if (FTDM_SPAN_IS_NT(ftdm_channel_get_span(ftdmchan))) {
Q931ie_ChanID ChanID;
/*
* Set new Channel ID
*/
Q931InitIEChanID(&ChanID);
- ChanID.IntType = FTDM_SPAN_IS_BRI(ftdmchan->span) ? 0 : 1; /* PRI = 1, BRI = 0 */
+ ChanID.IntType = FTDM_SPAN_IS_BRI(ftdm_channel_get_span(ftdmchan)) ? 0 : 1; /* PRI = 1, BRI = 0 */
ChanID.PrefExcl = 1; /* always exclusive in NT-mode */
- if(ChanID.IntType) {
+ if (ChanID.IntType) {
ChanID.InfoChanSel = 1; /* None = 0, See Slot = 1, Any = 3 */
ChanID.ChanMapType = 3; /* B-Chan */
- ChanID.ChanSlot = (unsigned char)ftdmchan->chan_id;
+ ChanID.ChanSlot = (unsigned char)ftdm_channel_get_id(ftdmchan);
} else {
- ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
+ ChanID.InfoChanSel = (unsigned char)ftdm_channel_get_id(ftdmchan) & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
}
gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
}
break;
case FTDM_CHANNEL_STATE_DIALING:
if (!(isdn_data->opts & FTDM_ISDN_OPT_SUGGEST_CHANNEL)) {
+ ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(ftdmchan);
Q931ie_BearerCap BearerCap;
Q931ie_ChanID ChanID;
Q931ie_CallingNum CallingNum;
/*
* get codec type
*/
- ftdm_channel_command(ftdmchan->span->channels[ftdmchan->chan_id], FTDM_COMMAND_GET_NATIVE_CODEC, &codec);
+ ftdm_channel_command(ftdmchan, FTDM_COMMAND_GET_NATIVE_CODEC, &codec);
/*
* Q.931 Setup Message
* ChannelID IE
*/
Q931InitIEChanID(&ChanID);
- ChanID.IntType = FTDM_SPAN_IS_BRI(ftdmchan->span) ? 0 : 1; /* PRI = 1, BRI = 0 */
- ChanID.PrefExcl = FTDM_SPAN_IS_NT(ftdmchan->span) ? 1 : 0; /* Exclusive in NT-mode = 1, Preferred otherwise = 0 */
- if(ChanID.IntType) {
+ ChanID.IntType = FTDM_SPAN_IS_BRI(ftdm_channel_get_span(ftdmchan)) ? 0 : 1; /* PRI = 1, BRI = 0 */
+ ChanID.PrefExcl = FTDM_SPAN_IS_NT(ftdm_channel_get_span(ftdmchan)) ? 1 : 0; /* Exclusive in NT-mode = 1, Preferred otherwise = 0 */
+ if (ChanID.IntType) {
ChanID.InfoChanSel = 1; /* None = 0, See Slot = 1, Any = 3 */
ChanID.ChanMapType = 3; /* B-Chan */
- ChanID.ChanSlot = (unsigned char)ftdmchan->chan_id;
+ ChanID.ChanSlot = (unsigned char)ftdm_channel_get_id(ftdmchan);
} else {
- ChanID.InfoChanSel = (unsigned char)ftdmchan->chan_id & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
+ ChanID.InfoChanSel = (unsigned char)ftdm_channel_get_id(ftdmchan) & 0x03; /* None = 0, B1 = 1, B2 = 2, Any = 3 */
}
gen->ChanID = Q931AppendIE(gen, (L3UCHAR *) &ChanID);
/*
* Display IE
*/
- if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE) && FTDM_SPAN_IS_NT(ftdmchan->span)) {
+ if (!(isdn_data->opts & FTDM_ISDN_OPT_OMIT_DISPLAY_IE) && FTDM_SPAN_IS_NT(ftdm_channel_get_span(ftdmchan))) {
Q931InitIEDisplay(&Display);
- Display.Size = Display.Size + (unsigned char)strlen(ftdmchan->caller_data.cid_name);
+ Display.Size = Display.Size + (unsigned char)strlen(caller_data->cid_name);
gen->Display = Q931AppendIE(gen, (L3UCHAR *) &Display);
ptrDisplay = Q931GetIEPtr(gen->Display, gen->buf);
- ftdm_copy_string((char *)ptrDisplay->Display, ftdmchan->caller_data.cid_name, strlen(ftdmchan->caller_data.cid_name)+1);
+ ftdm_copy_string((char *)ptrDisplay->Display, caller_data->cid_name, strlen(caller_data->cid_name) + 1);
}
/*
* CallingNum IE
*/
Q931InitIECallingNum(&CallingNum);
- CallingNum.TypNum = ftdmchan->caller_data.ani.type;
+ CallingNum.TypNum = caller_data->ani.type;
CallingNum.NumPlanID = Q931_NUMPLAN_E164;
CallingNum.PresInd = Q931_PRES_ALLOWED;
CallingNum.ScreenInd = Q931_SCREEN_USER_NOT_SCREENED;
- CallingNum.Size = CallingNum.Size + (unsigned char)strlen(ftdmchan->caller_data.cid_num.digits);
+ CallingNum.Size = CallingNum.Size + (unsigned char)strlen(caller_data->cid_num.digits);
gen->CallingNum = Q931AppendIE(gen, (L3UCHAR *) &CallingNum);
ptrCallingNum = Q931GetIEPtr(gen->CallingNum, gen->buf);
- ftdm_copy_string((char *)ptrCallingNum->Digit, ftdmchan->caller_data.cid_num.digits, strlen(ftdmchan->caller_data.cid_num.digits)+1);
+ ftdm_copy_string((char *)ptrCallingNum->Digit, caller_data->cid_num.digits, strlen(caller_data->cid_num.digits) + 1);
/*
* CalledNum IE
Q931InitIECalledNum(&CalledNum);
CalledNum.TypNum = Q931_TON_UNKNOWN;
CalledNum.NumPlanID = Q931_NUMPLAN_E164;
- CalledNum.Size = CalledNum.Size + (unsigned char)strlen(ftdmchan->caller_data.ani.digits);
+ CalledNum.Size = CalledNum.Size + (unsigned char)strlen(caller_data->ani.digits);
gen->CalledNum = Q931AppendIE(gen, (L3UCHAR *) &CalledNum);
ptrCalledNum = Q931GetIEPtr(gen->CalledNum, gen->buf);
- ftdm_copy_string((char *)ptrCalledNum->Digit, ftdmchan->caller_data.ani.digits, strlen(ftdmchan->caller_data.ani.digits)+1);
+ ftdm_copy_string((char *)ptrCalledNum->Digit, caller_data->ani.digits, strlen(caller_data->ani.digits) + 1);
/*
* High-Layer Compatibility IE (Note: Required for AVM FritzBox)
call = Q931GetCallByCRV(&isdn_data->q931, gen->CRV);
if (call) {
ftdm_log(FTDM_LOG_DEBUG, "Storing reference to current span in call %d [0x%x]\n", gen->CRV, gen->CRV);
- Q931CallSetPrivate(call, ftdmchan->span);
+ Q931CallSetPrivate(call, ftdm_channel_get_span(ftdmchan));
}
}
}
case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
{
/* reply RELEASE with RELEASE_COMPLETE message */
- if(ftdmchan->last_state == FTDM_CHANNEL_STATE_HANGUP) {
+ if (ftdm_channel_get_last_state(ftdmchan) == FTDM_CHANNEL_STATE_HANGUP) {
gen->MesType = Q931mes_RELEASE_COMPLETE;
Q931Rx43(&isdn_data->q931, gen, gen->Size);
break;
case FTDM_CHANNEL_STATE_HANGUP:
{
+ ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(ftdmchan);
Q931ie_Cause cause;
ftdm_log(FTDM_LOG_DEBUG, "Hangup: Direction %s\n", ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? "Outbound" : "Inbound");
* BRI PTMP needs special handling here...
* TODO: cleanup / refine (see above)
*/
- if (ftdmchan->last_state == FTDM_CHANNEL_STATE_RING) {
+ if (ftdm_channel_get_last_state(ftdmchan) == FTDM_CHANNEL_STATE_RING) {
/*
* inbound call [was: number unknown (= not found in routing state)]
* (in Q.931 spec terms: Reject request)
gen->MesType = Q931mes_RELEASE_COMPLETE;
//cause.Value = (unsigned char) FTDM_CAUSE_UNALLOCATED;
- cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
+ cause.Value = (unsigned char) caller_data->hangup_cause;
*cause.Diag = '\0';
gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
Q931Rx43(&isdn_data->q931, gen, gen->Size);
//ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
}
- else if (ftdmchan->last_state <= FTDM_CHANNEL_STATE_PROGRESS) {
+ else if (ftdm_channel_get_last_state(ftdmchan) <= FTDM_CHANNEL_STATE_PROGRESS) {
/*
* just release all unanswered calls [was: inbound call, remote side hung up before we answered]
*/
gen->MesType = Q931mes_RELEASE;
- cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
+ cause.Value = (unsigned char) caller_data->hangup_cause;
*cause.Diag = '\0';
gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
Q931Rx43(&isdn_data->q931, gen, gen->Size);
*/
gen->MesType = Q931mes_DISCONNECT;
- cause.Value = (unsigned char) ftdmchan->caller_data.hangup_cause;
+ cause.Value = (unsigned char) caller_data->hangup_cause;
*cause.Diag = '\0';
gen->Cause = Q931AppendIE(gen, (L3UCHAR *) &cause);
Q931Rx43(&isdn_data->q931, gen, gen->Size);
sig.event_id = FTDM_SIGEVENT_STOP;
status = isdn_data->sig_cb(&sig);
+
gen->MesType = Q931mes_RELEASE;
gen->CRVFlag = ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND) ? 0 : 1;
Q931Rx43(&isdn_data->q931, gen, gen->Size);
static __inline__ void check_state(ftdm_span_t *span)
{
- if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE)) {
- uint32_t j;
- ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
- for(j = 1; j <= span->chan_count; j++) {
- if (ftdm_test_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE)) {
- ftdm_mutex_lock(span->channels[j]->mutex);
- ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
- state_advance(span->channels[j]);
- ftdm_channel_complete_state(span->channels[j]);
- ftdm_mutex_unlock(span->channels[j]->mutex);
- }
- }
- }
+ if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE)) {
+ uint32_t j;
+
+ ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
+
+ for (j = 1; j <= ftdm_span_get_chan_count(span); j++) {
+ ftdm_channel_t *chan = ftdm_span_get_channel(span, j);
+
+ if (ftdm_test_flag(chan, FTDM_CHANNEL_STATE_CHANGE)) {
+ ftdm_channel_lock(chan);
+
+ ftdm_clear_flag(chan, FTDM_CHANNEL_STATE_CHANGE);
+ state_advance(chan);
+ ftdm_channel_complete_state(chan);
+
+ ftdm_channel_unlock(chan);
+ }
+ }
+ }
}
ftdm_sigmsg_t sig;
memset(&sig, 0, sizeof(sig));
- sig.chan_id = event->channel->chan_id;
- sig.span_id = event->channel->span_id;
+ sig.span_id = ftdm_channel_get_span_id(event->channel);
+ sig.chan_id = ftdm_channel_get_id(event->channel);
sig.channel = event->channel;
ftdm_log(FTDM_LOG_DEBUG, "EVENT [%s][%d:%d] STATE [%s]\n",
- ftdm_oob_event2str(event->enum_id), event->channel->span_id, event->channel->chan_id, ftdm_channel_state2str(event->channel->state));
+ ftdm_oob_event2str(event->enum_id),
+ ftdm_channel_get_span_id(event->channel),
+ ftdm_channel_get_id(event->channel),
+ ftdm_channel_get_state_str(event->channel));
- switch(event->enum_id) {
+ switch (event->enum_id) {
case FTDM_OOB_ALARM_TRAP:
{
sig.event_id = FTDM_OOB_ALARM_TRAP;
- if (event->channel->state != FTDM_CHANNEL_STATE_DOWN) {
+ if (ftdm_channel_get_state(event->channel) != FTDM_CHANNEL_STATE_DOWN) {
ftdm_set_state_locked(event->channel, FTDM_CHANNEL_STATE_RESTART);
}
ftdm_set_flag(event->channel, FTDM_CHANNEL_SUSPENDED);
ftdm_channel_get_alarms(event->channel, &alarmbits);
isdn_data->sig_cb(&sig);
+
ftdm_log(FTDM_LOG_WARNING, "channel %d:%d (%d:%d) has alarms [%s]\n",
- event->channel->span_id, event->channel->chan_id,
- event->channel->physical_span_id, event->channel->physical_chan_id,
- event->channel->last_error);
+ ftdm_channel_get_span_id(event->channel),
+ ftdm_channel_get_id(event->channel),
+ ftdm_channel_get_ph_span_id(event->channel),
+ ftdm_channel_get_ph_id(event->channel),
+ ftdm_channel_get_last_error(event->channel));
}
break;
case FTDM_OOB_ALARM_CLEAR:
{
const char * digit_str = (const char *)event->data;
- if(digit_str) {
+ if (digit_str) {
fio_event_cb_t event_callback = NULL;
ftdm_channel_queue_dtmf(event->channel, digit_str);
static __inline__ void check_events(ftdm_span_t *span)
{
- ftdm_status_t status;
-
- status = ftdm_span_poll_event(span, 5, NULL);
+ ftdm_status_t status = ftdm_span_poll_event(span, 5, NULL);
- switch(status) {
+ switch (status) {
case FTDM_SUCCESS:
{
ftdm_event_t *event;
+
while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
if (event->enum_id == FTDM_OOB_NOOP) {
continue;
if (!dt_buffer) {
return -1;
}
+
wrote = teletone_mux_tones(ts, map);
ftdm_buffer_write(dt_buffer, ts->buffer, wrote * 2);
return 0;
ftdm_buffer_set_loops(dt_buffer, -1);
/* get a tone generation friendly interval to avoid distortions */
- for (x = 1; x <= span->chan_count; x++) {
- if (span->channels[x]->type != FTDM_CHAN_TYPE_DQ921) {
- ftdm_channel_command(span->channels[x], FTDM_COMMAND_GET_INTERVAL, &interval);
+ for (x = 1; x <= ftdm_span_get_chan_count(span); x++) {
+ ftdm_channel_t *chan = ftdm_span_get_channel(span, x);
+
+ if (ftdm_channel_get_type(chan) != FTDM_CHAN_TYPE_DQ921) {
+ ftdm_channel_command(chan, FTDM_COMMAND_GET_INTERVAL, &interval);
break;
}
}
ts.duration = ts.rate;
/* main loop */
- while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
+ while (ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
ftdm_wait_flag_t flags;
ftdm_status_t status;
int last_chan_state = 0;
/*
* check b-channel states and generate & send tones if neccessary
*/
- for (x = 1; x <= span->chan_count; x++) {
- ftdm_channel_t *ftdmchan = span->channels[x];
+ for (x = 1; x <= ftdm_span_get_chan_count(span); x++) {
+ ftdm_channel_t *chan = ftdm_span_get_channel(span, x);
ftdm_size_t len = sizeof(frame), rlen;
- if (ftdmchan->type == FTDM_CHAN_TYPE_DQ921) {
+ if (ftdm_channel_get_type(chan) == FTDM_CHAN_TYPE_DQ921) {
continue;
}
* (Recycle buffer content if succeeding channels share the
* same state, this saves some cpu cycles)
*/
- switch (ftdmchan->state) {
+ switch (ftdm_channel_get_state(chan)) {
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 *)chan->mod_data;
+ ftdm_caller_data_t *caller_data = ftdm_channel_get_caller_data(chan);
/* check overlap dial timeout first before generating tone */
if (data && data->digit_timeout && data->digit_timeout <= now) {
- if (strlen(ftdmchan->caller_data.dnis.digits) > 0) {
+ if (strlen(caller_data->dnis.digits) > 0) {
ftdm_log(FTDM_LOG_DEBUG, "Overlap dial timeout, advancing to RING state\n");
- ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
+ ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_RING);
} else {
/* no digits received, hangup */
ftdm_log(FTDM_LOG_DEBUG, "Overlap dial timeout, no digits received, going to HANGUP state\n");
- ftdmchan->caller_data.hangup_cause = FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE; /* TODO: probably wrong cause value */
- ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
+ caller_data->hangup_cause = FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE; /* TODO: probably wrong cause value */
+ ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP);
}
data->digit_timeout = 0;
continue;
}
- if (last_chan_state != ftdmchan->state) {
+ if (last_chan_state != ftdm_channel_get_state(chan)) {
ftdm_buffer_zero(dt_buffer);
- teletone_run(&ts, ftdmchan->span->tone_map[FTDM_TONEMAP_DIAL]);
- last_chan_state = ftdmchan->state;
+ teletone_run(&ts, span->tone_map[FTDM_TONEMAP_DIAL]);
+ last_chan_state = ftdm_channel_get_state(chan);
}
}
break;
case FTDM_CHANNEL_STATE_RING:
{
- if (last_chan_state != ftdmchan->state) {
+ if (last_chan_state != ftdm_channel_get_state(chan)) {
ftdm_buffer_zero(dt_buffer);
- teletone_run(&ts, ftdmchan->span->tone_map[FTDM_TONEMAP_RING]);
- last_chan_state = ftdmchan->state;
+ teletone_run(&ts, span->tone_map[FTDM_TONEMAP_RING]);
+ last_chan_state = ftdm_channel_get_state(chan);
}
}
break;
continue;
}
- if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OPEN)) {
- if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
- ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
+ if (!ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
+ if (ftdm_channel_open_chan(chan) != FTDM_SUCCESS) {
+ ftdm_set_state_locked(chan, FTDM_CHANNEL_STATE_HANGUP);
continue;
}
- ftdm_log(FTDM_LOG_NOTICE, "Successfully opened channel %d:%d\n", ftdmchan->span_id, ftdmchan->chan_id);
+ ftdm_log(FTDM_LOG_NOTICE, "Successfully opened channel %d:%d\n",
+ ftdm_channel_get_span_id(chan),
+ ftdm_channel_get_id(chan));
}
flags = FTDM_READ;
- status = ftdm_channel_wait(ftdmchan, &flags, (gated) ? 0 : interval);
- switch(status) {
+ status = ftdm_channel_wait(chan, &flags, (gated) ? 0 : interval);
+ switch (status) {
case FTDM_FAIL:
continue;
}
gated = 1;
- status = ftdm_channel_read(ftdmchan, frame, &len);
+ status = ftdm_channel_read(chan, frame, &len);
if (status != FTDM_SUCCESS || len <= 0) {
continue;
}
- if (ftdmchan->effective_codec != FTDM_CODEC_SLIN) {
+ if (chan->effective_codec != FTDM_CODEC_SLIN) {
len *= 2;
}
rlen = ftdm_buffer_read_loop(dt_buffer, frame, len);
- if (ftdmchan->effective_codec != FTDM_CODEC_SLIN) {
+ if (chan->effective_codec != FTDM_CODEC_SLIN) {
fio_codec_t codec_func = NULL;
- if (ftdmchan->native_codec == FTDM_CODEC_ULAW) {
+ if (chan->native_codec == FTDM_CODEC_ULAW) {
codec_func = fio_slin2ulaw;
- } else if (ftdmchan->native_codec == FTDM_CODEC_ALAW) {
+ } else if (chan->native_codec == FTDM_CODEC_ALAW) {
codec_func = fio_slin2alaw;
}
if (codec_func) {
status = codec_func(frame, sizeof(frame), &rlen);
} else {
- snprintf(ftdmchan->last_error, sizeof(ftdmchan->last_error), "codec error!");
+ snprintf(chan->last_error, sizeof(chan->last_error), "codec error!");
goto done;
}
}
- ftdm_channel_write(ftdmchan, frame, sizeof(frame), &rlen);
+ ftdm_channel_write(chan, frame, sizeof(frame), &rlen);
}
/*
Q921Start(&isdn_data->q921);
Q931Start(&isdn_data->q931);
- while(ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
+ while (ftdm_running() && ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
ftdm_wait_flag_t flags = FTDM_READ;
ftdm_status_t status = ftdm_channel_wait(isdn_data->dchan, &flags, 100);
/*
*
*/
- switch(status) {
+ switch (status) {
case FTDM_FAIL:
{
ftdm_log(FTDM_LOG_ERROR, "D-Chan Read Error!\n");
}
done:
- ftdm_channel_close(&isdn_data->dchans[0]);
- ftdm_channel_close(&isdn_data->dchans[1]);
+// ftdm_channel_close(&isdn_data->dchans[0]);
+// ftdm_channel_close(&isdn_data->dchans[1]);
ftdm_clear_flag(isdn_data, FTDM_ISDN_RUNNING);
#ifdef WIN32
ftdm_set_flag(isdn_data, FTDM_ISDN_STOP);
- while(ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
+ while (ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
ftdm_sleep(100);
}
- while(ftdm_test_flag(isdn_data, FTDM_ISDN_TONES_RUNNING)) {
+ while (ftdm_test_flag(isdn_data, FTDM_ISDN_TONES_RUNNING)) {
ftdm_sleep(100);
}
*/
static ftdm_status_t ftdm_isdn_start(ftdm_span_t *span)
{
- ftdm_status_t ret;
ftdm_isdn_data_t *isdn_data = span->signal_data;
+ ftdm_status_t ret;
if (ftdm_test_flag(isdn_data, FTDM_ISDN_RUNNING)) {
return FTDM_FAIL;
if (!strcasecmp(argv[2], "q921")) {
layer = 0x01;
- } else if(!strcasecmp(argv[2], "q931")) {
+ } else if (!strcasecmp(argv[2], "q931")) {
layer = 0x02;
} else if (!strcasecmp(argv[2], "all")) {
layer = 0x03;
stream->write_function(stream, "+OK capture started.\n");
goto done;
}
- else if(!strcasecmp(argv[2], "stop")) {
+ else if (!strcasecmp(argv[2], "stop")) {
if (!isdn_pcap_is_open(isdn_data)) {
stream->write_function(stream, "-ERR capture is not running.\n");
stream->write_function(stream, "+OK capture stopped.\n");
goto done;
}
- else if(!strcasecmp(argv[2], "suspend")) {
+ else if (!strcasecmp(argv[2], "suspend")) {
if (!isdn_pcap_is_open(isdn_data)) {
stream->write_function(stream, "-ERR capture is not running.\n");
stream->write_function(stream, "+OK capture suspended.\n");
goto done;
}
- else if(!strcasecmp(argv[2], "resume")) {
+ else if (!strcasecmp(argv[2], "resume")) {
if (!isdn_pcap_is_open(isdn_data)) {
stream->write_function(stream, "-ERR capture is not running.\n");
projects / thirdparty / freeswitch.git / commitdiff
