Compare commits
6 Commits
Author | SHA1 | Date |
---|---|---|
Harald Welte | 2cd5585026 | |
Harald Welte | a341d58fbd | |
Harald Welte | 83f6bf5276 | |
Harald Welte | 5621e2a5ed | |
Andrey Volk | f9990221e6 | |
Andrey Volk | 7a921c608b |
|
@ -1 +1 @@
|
||||||
1.10.1-dev
|
1.10.1-release
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
|
|
||||||
# Must change all of the below together
|
# Must change all of the below together
|
||||||
# For a release, set revision for that tagged release as well and uncomment
|
# For a release, set revision for that tagged release as well and uncomment
|
||||||
AC_INIT([freeswitch], [1.10.1-dev], bugs@freeswitch.org)
|
AC_INIT([freeswitch], [1.10.1-release], bugs@freeswitch.org)
|
||||||
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
|
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
|
||||||
AC_SUBST(SWITCH_VERSION_MINOR, [10])
|
AC_SUBST(SWITCH_VERSION_MINOR, [10])
|
||||||
AC_SUBST(SWITCH_VERSION_MICRO, [1-dev])
|
AC_SUBST(SWITCH_VERSION_MICRO, [1-release])
|
||||||
AC_SUBST(SWITCH_VERSION_REVISION, [])
|
AC_SUBST(SWITCH_VERSION_REVISION, [])
|
||||||
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
|
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
|
||||||
|
|
||||||
|
|
|
@ -2446,6 +2446,7 @@ FT_DECLARE(ftdm_caller_data_t *) ftdm_channel_get_caller_data(ftdm_channel_t *ft
|
||||||
FT_DECLARE(ftdm_channel_t *) ftdm_span_get_channel(const ftdm_span_t *span, uint32_t chanid)
|
FT_DECLARE(ftdm_channel_t *) ftdm_span_get_channel(const ftdm_span_t *span, uint32_t chanid)
|
||||||
{
|
{
|
||||||
ftdm_channel_t *chan;
|
ftdm_channel_t *chan;
|
||||||
|
chanid &= 0xffff; /* mask off libpri "ds1_explicit" bit & co */
|
||||||
ftdm_mutex_lock(span->mutex);
|
ftdm_mutex_lock(span->mutex);
|
||||||
if (chanid == 0 || chanid > span->chan_count) {
|
if (chanid == 0 || chanid > span->chan_count) {
|
||||||
ftdm_mutex_unlock(span->mutex);
|
ftdm_mutex_unlock(span->mutex);
|
||||||
|
|
|
@ -1207,7 +1207,7 @@ static ftdm_status_t state_advance(ftdm_channel_t *chan)
|
||||||
assert(sr);
|
assert(sr);
|
||||||
|
|
||||||
pri_sr_set_channel(sr, ftdm_channel_get_id(chan), 1, 0);
|
pri_sr_set_channel(sr, ftdm_channel_get_id(chan), 1, 0);
|
||||||
pri_sr_set_bearer(sr, PRI_TRANS_CAP_SPEECH, isdn_data->layer1);
|
pri_sr_set_bearer(sr, caller_data->bearer_capability << 3, isdn_data->layer1);
|
||||||
|
|
||||||
pri_sr_set_called(sr, caller_data->dnis.digits, called_ton, 1);
|
pri_sr_set_called(sr, caller_data->dnis.digits, called_ton, 1);
|
||||||
pri_sr_set_caller(sr, caller_data->cid_num.digits,
|
pri_sr_set_caller(sr, caller_data->cid_num.digits,
|
||||||
|
@ -1405,12 +1405,13 @@ static int on_hangup(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_even
|
||||||
{
|
{
|
||||||
ftdm_span_t *span = spri->span;
|
ftdm_span_t *span = spri->span;
|
||||||
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->hangup.channel);
|
ftdm_channel_t *chan = ftdm_span_get_channel(span, pevent->hangup.channel);
|
||||||
ftdm_libpri_b_chan_t *chan_priv = chan->call_data;
|
ftdm_libpri_b_chan_t *chan_priv;
|
||||||
|
|
||||||
if (!chan) {
|
if (!chan) {
|
||||||
ftdm_log(FTDM_LOG_CRIT, "-- Hangup on channel %d:%d but it's not in use?\n", ftdm_span_get_id(spri->span), pevent->hangup.channel);
|
ftdm_log(FTDM_LOG_CRIT, "-- Hangup on channel %d:%d but it's not in use?\n", ftdm_span_get_id(spri->span), pevent->hangup.channel);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
chan_priv = chan->call_data;
|
||||||
|
|
||||||
ftdm_channel_lock(chan);
|
ftdm_channel_lock(chan);
|
||||||
|
|
||||||
|
@ -1963,6 +1964,9 @@ static int on_ring(lpwrap_pri_t *spri, lpwrap_pri_event_t event_type, pri_event
|
||||||
snprintf(caller_data->aniII, 5, "%.2d", pevent->ring.ani2);
|
snprintf(caller_data->aniII, 5, "%.2d", pevent->ring.ani2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
caller_data->bearer_capability = pevent->ring.ctype >> 3;
|
||||||
|
isdn_data->layer1 = pevent->ring.layer1;
|
||||||
|
|
||||||
// scary to trust this pointer, you'd think they would give you a copy of the call data so you own it......
|
// scary to trust this pointer, you'd think they would give you a copy of the call data so you own it......
|
||||||
/* hurr, this is valid as along as nobody releases the call */
|
/* hurr, this is valid as along as nobody releases the call */
|
||||||
chan_priv->call = pevent->ring.call;
|
chan_priv->call = pevent->ring.call;
|
||||||
|
|
Loading…
Reference in New Issue