kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-18 09:32:34 +00:00
Code Issues Projects Releases Wiki Activity

freetdm: ftmod_pritap - Destroy call references as soon as possible

Browse Source
This commit is contained in:
Moises Silva 2012-10-23 00:40:19 -05:00
parent 3cb1fd267f
commit 7d5a4a7172
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libs/freetdm/src/ftmod/ftmod_pritap/ftmod_pritap.c
View File

@ -308,7 +308,7 @@ static ftdm_status_t state_advance(ftdm_channel_t *ftdmchan)
peerchan->pflags = 0; peerchan->pflags = 0;
ftdm_channel_close(&peerchan); ftdm_channel_close(&peerchan);
} else { } else {
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_ERROR, "Odd, no peer chan\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "Odd, no peer chan\n");
} }
} }
break; break;
@ -497,13 +497,11 @@ static void tap_pri_put_pcall(pritap_t *pritap, void *callref)
} }
tstcrv = tap_pri_get_crv(pritap->pri, pritap->pcalls[i].callref); tstcrv = tap_pri_get_crv(pritap->pri, pritap->pcalls[i].callref);
if (tstcrv == crv) { if (tstcrv == crv) {
ftdm_log(FTDM_LOG_DEBUG, "releasing slot %d in span %s used by callref %d/%p\n", i, if (pritap->pcalls[i].inuse) {
pritap->span->name, crv, pritap->pcalls[i].callref); ftdm_log(FTDM_LOG_DEBUG, "releasing slot %d in span %s used by callref %d/%p\n", i,
if (!pritap->pcalls[i].inuse) { pritap->span->name, crv, pritap->pcalls[i].callref);
ftdm_log(FTDM_LOG_ERROR, "slot %d in span %s used by callref %d/%p was released already?\n", pritap->pcalls[i].inuse = 0;
i, pritap->span->name, crv, pritap->pcalls[i].callref);
} }
pritap->pcalls[i].inuse = 0;
} }
} }
@ -595,7 +593,7 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
/* check that we already know about this call in the peer PRI (which was the one receiving the PRI_EVENT_RING event) */ /* check that we already know about this call in the peer PRI (which was the one receiving the PRI_EVENT_RING event) */
if (!(pcall = tap_pri_get_pcall_bycrv(peertap, crv))) { if (!(pcall = tap_pri_get_pcall_bycrv(peertap, crv))) {
ftdm_log(FTDM_LOG_DEBUG, ftdm_log(FTDM_LOG_DEBUG,
"ignoring proceeding in channel %s:%d:%d for callref %d since we don't know about it", "ignoring proceeding in channel %s:%d:%d for callref %d since we don't know about it\n",
pritap->span->name, PRI_SPAN(e->proceeding.channel), PRI_CHANNEL(e->proceeding.channel), crv); pritap->span->name, PRI_SPAN(e->proceeding.channel), PRI_CHANNEL(e->proceeding.channel), crv);
break; break;
} }
@ -646,7 +644,7 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
fchan->call_data = peerfchan; fchan->call_data = peerfchan;
peerfchan->call_data = fchan; peerfchan->call_data = fchan;
ftdm_log_chan_msg(pcall->fchan, FTDM_LOG_NOTICE, "Starting new tapped call\n"); ftdm_log_chan(pcall->fchan, FTDM_LOG_NOTICE, "Starting new tapped call with callref %d\n", crv);
ftdm_set_state_locked(fchan, FTDM_CHANNEL_STATE_RING); ftdm_set_state_locked(fchan, FTDM_CHANNEL_STATE_RING);
break; break;
@ -666,9 +664,11 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
pritap->span->name, PRI_SPAN(e->proceeding.channel), PRI_CHANNEL(e->proceeding.channel), crv); pritap->span->name, PRI_SPAN(e->proceeding.channel), PRI_CHANNEL(e->proceeding.channel), crv);
break; break;
} }
ftdm_channel_lock(pcall->fchan);
ftdm_log_chan(pcall->fchan, FTDM_LOG_NOTICE, "Tapped call was answered in state %s\n", ftdm_channel_state2str(pcall->fchan->state)); ftdm_log_chan(pcall->fchan, FTDM_LOG_NOTICE, "Tapped call was answered in state %s\n", ftdm_channel_state2str(pcall->fchan->state));
ftdm_set_pflag_locked(pcall->fchan, PRITAP_NETWORK_ANSWER); ftdm_set_pflag(pcall->fchan, PRITAP_NETWORK_ANSWER);
ftdm_set_state_locked(pcall->fchan, FTDM_CHANNEL_STATE_UP); ftdm_set_state(pcall->fchan, FTDM_CHANNEL_STATE_UP);
ftdm_channel_unlock(pcall->fchan);
break; break;
case PRI_EVENT_HANGUP_REQ: case PRI_EVENT_HANGUP_REQ:
@ -683,15 +683,18 @@ static void handle_pri_passive_event(pritap_t *pritap, pri_event *e)
break; break;
} }
if (!pcall->fchan) { if (pcall->fchan) {
ftdm_log(FTDM_LOG_DEBUG, fchan = pcall->fchan;
"ignoring hangup in channel %s:%d:%d for callref %d since we never got a channel", ftdm_channel_lock(fchan);
pritap->span->name, PRI_SPAN(e->proceeding.channel), PRI_CHANNEL(e->proceeding.channel), crv); if (fchan->state < FTDM_CHANNEL_STATE_TERMINATING) {
break; ftdm_set_state(fchan, FTDM_CHANNEL_STATE_TERMINATING);
}
pcall->fchan = NULL; /* after this event we're not supposed to need to do anything with the channel anymore */
ftdm_channel_unlock(fchan);
} }
fchan = pcall->fchan; tap_pri_put_pcall(pritap, e->hangup.call);
ftdm_set_state_locked(fchan, FTDM_CHANNEL_STATE_TERMINATING); tap_pri_put_pcall(peertap, e->hangup.call);
break; break;
case PRI_EVENT_HANGUP_ACK: case PRI_EVENT_HANGUP_ACK: