kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix available() for SS7, MFC/R2, and pseudo channels.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@217560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-09-10 00:35:30 +00:00
parent df7dd574fd
commit 98d156c5dd
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
channels/chan_dahdi.c
View File

@@ -946,12 +946,12 @@ static struct dahdi_pvt {
unsigned int inservice:1;
/*!
* \brief TRUE if the channel is locally blocked.
* \note Applies to SS7 channels.
* \note Applies to SS7 and MFCR2 channels.
*/
unsigned int locallyblocked:1;
/*!
* \brief TRUE if the channel is remotely blocked.
* \note Applies to SS7 channels.
* \note Applies to SS7 and MFCR2 channels.
*/
unsigned int remotelyblocked:1;
#if defined(HAVE_PRI)
@@ -11400,24 +11400,34 @@ static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t g
}
#endif
#ifdef HAVE_SS7
/* Trust SS7 */
if (p->ss7) {
if (p->ss7call)
return 0;
else
return 1;
if (p->locallyblocked || p->remotelyblocked) {
return 0;
}
/* If no owner definitely available */
if (!p->owner) {
#ifdef HAVE_SS7
/* Trust SS7 */
if (p->ss7) {
if (p->ss7call) {
return 0;
} else {
return 1;
}
}
#endif
#ifdef HAVE_OPENR2
/* Trust MFC/R2 */
if (p->mfcr2) {
if (p->mfcr2call)
return 0;
else
return 1;
}
/* Trust MFC/R2 */
if (p->mfcr2) {
if (p->mfcr2call) {
return 0;
} else {
return 1;
}
}
#endif
return 1;
}
return 0;
}