Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 132643 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r132643 | kpfleming | 2008-07-22 14:59:10 -0500 (Tue, 22 Jul 2008) | 10 lines

Merged revisions 132641 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132641 | kpfleming | 2008-07-22 14:49:11 -0500 (Tue, 22 Jul 2008) | 2 lines

use renamed libpri API call for controlling this feature (was improperly named before)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Kevin P. Fleming 17 years ago
parent c5552225dd
commit de75687750
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File

18
channels/chan_dahdi.c
Unescape View File

@ -413,8 +413,8 @@ struct dahdi_pri {
int span; int span;
int resetting; int resetting;
int resetpos; int resetpos;
#ifdef HAVE_PRI_INBANDRELEASE #ifdef HAVE_PRI_INBANDDISCONNECT
unsigned int inbandrelease:1; /*!< Should we support inband audio after receiving RELEASE? */ unsigned int inbanddisconnect:1; /*!< Should we support inband audio after receiving DISCONNECT? */
#endif #endif
time_t lastreset; /*!< time when unused channels were last reset */ time_t lastreset; /*!< time when unused channels were last reset */
long resetinterval; /*!< Interval (in seconds) for resetting unused channels */ long resetinterval; /*!< Interval (in seconds) for resetting unused channels */
@ -8306,8 +8306,8 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
pris[span].minunused = conf->pri.minunused; pris[span].minunused = conf->pri.minunused;
pris[span].minidle = conf->pri.minidle; pris[span].minidle = conf->pri.minidle;
pris[span].overlapdial = conf->pri.overlapdial; pris[span].overlapdial = conf->pri.overlapdial;
#ifdef HAVE_PRI_INBANDRELEASE #ifdef HAVE_PRI_INBANDDISCONNECT
pris[span].inbandrelease = conf->pri.inbandrelease; pris[span].inbanddisconnect = conf->pri.inbandrelease;
#endif #endif
pris[span].facilityenable = conf->pri.facilityenable; pris[span].facilityenable = conf->pri.facilityenable;
ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial)); ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial));
@ -11342,8 +11342,8 @@ static int start_pri(struct dahdi_pri *pri)
if (pri->switchtype == PRI_SWITCH_GR303_TMC) if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH; pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0); pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
#ifdef HAVE_PRI_INBANDRELEASE #ifdef HAVE_PRI_INBANDDISCONNECT
pri_set_inbandrelease(pri->dchans[i], pri->inbandrelease); pri_set_inbanddisconnect(pri->dchans[i], pri->inbandrelease);
#endif #endif
/* Enslave to master if appropriate */ /* Enslave to master if appropriate */
if (i) if (i)
@ -14132,9 +14132,9 @@ static int process_dahdi(struct dahdi_chan_conf *confp, struct ast_variable *v,
} else { } else {
confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE; confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
} }
#ifdef HAVE_PRI_INBANDRELEASE #ifdef HAVE_PRI_INBANDDISCONNECT
} else if (!strcasecmp(v->name, "inbandrelease")) { } else if (!strcasecmp(v->name, "inbanddisconnect")) {
confp->pri.inbandrelease = ast_true(v->value); confp->pri.inbanddisconnect = ast_true(v->value);
#endif #endif
} else if (!strcasecmp(v->name, "pritimer")) { } else if (!strcasecmp(v->name, "pritimer")) {
#ifdef PRI_GETSET_TIMERS #ifdef PRI_GETSET_TIMERS

2
configs/chan_dahdi.conf.sample
Unescape View File

@ -164,7 +164,7 @@
; ;
; Allow inband audio (progress) when a call is RELEASEd by the far end of a PRI ; Allow inband audio (progress) when a call is RELEASEd by the far end of a PRI
; ;
;inbandrelease=yes ;inbanddisconnect=yes
; ;
; PRI Out of band indications. ; PRI Out of band indications.
; Enable this to report Busy and Congestion on a PRI using out-of-band ; Enable this to report Busy and Congestion on a PRI using out-of-band

56
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 130041 . # From configure.ac Revision: 132391 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6. # Generated by GNU Autoconf 2.61 for asterisk 1.6.
# #
@ -38916,19 +38916,19 @@ fi
if test "x${PBX_PRI_INBANDRELEASE}" != "x1" -a "${USE_PRI_INBANDRELEASE}" != "no"; then if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then
pbxlibdir="" pbxlibdir=""
# if --with-PRI_INBANDRELEASE=DIR has been specified, use it. # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then
if test -d ${PRI_INBANDRELEASE_DIR}/lib; then if test -d ${PRI_INBANDDISCONNECT_DIR}/lib; then
pbxlibdir="-L${PRI_INBANDRELEASE_DIR}/lib" pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}/lib"
else else
pbxlibdir="-L${PRI_INBANDRELEASE_DIR}" pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}"
fi fi
fi fi
pbxfuncname="pri_set_inbandrelease" pbxfuncname="pri_set_inbanddisconnect"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PRI_INBANDRELEASE_FOUND=yes AST_PRI_INBANDDISCONNECT_FOUND=yes
else else
as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh` as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5 { echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
@ -38994,26 +38994,26 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5 { echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; } echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then if test `eval echo '${'$as_ac_Lib'}'` = yes; then
AST_PRI_INBANDRELEASE_FOUND=yes AST_PRI_INBANDDISCONNECT_FOUND=yes
else else
AST_PRI_INBANDRELEASE_FOUND=no AST_PRI_INBANDDISCONNECT_FOUND=no
fi fi
fi fi
# now check for the header. # now check for the header.
if test "${AST_PRI_INBANDRELEASE_FOUND}" = "yes"; then if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then
PRI_INBANDRELEASE_LIB="${pbxlibdir} -lpri " PRI_INBANDDISCONNECT_LIB="${pbxlibdir} -lpri "
# if --with-PRI_INBANDRELEASE=DIR has been specified, use it. # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then
PRI_INBANDRELEASE_INCLUDE="-I${PRI_INBANDRELEASE_DIR}/include" PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include"
fi fi
PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} " PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} "
if test "xlibpri.h" = "x" ; then # no header, assume found if test "xlibpri.h" = "x" ; then # no header, assume found
PRI_INBANDRELEASE_HEADER_FOUND="1" PRI_INBANDDISCONNECT_HEADER_FOUND="1"
else # check for the header else # check for the header
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}" CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
if test "${ac_cv_header_libpri_h+set}" = set; then if test "${ac_cv_header_libpri_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for libpri.h" >&5 { echo "$as_me:$LINENO: checking for libpri.h" >&5
echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
@ -39145,31 +39145,31 @@ echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
fi fi
if test $ac_cv_header_libpri_h = yes; then if test $ac_cv_header_libpri_h = yes; then
PRI_INBANDRELEASE_HEADER_FOUND=1 PRI_INBANDDISCONNECT_HEADER_FOUND=1
else else
PRI_INBANDRELEASE_HEADER_FOUND=0 PRI_INBANDDISCONNECT_HEADER_FOUND=0
fi fi
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
fi fi
if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then
PRI_INBANDRELEASE_LIB="" PRI_INBANDDISCONNECT_LIB=""
PRI_INBANDRELEASE_INCLUDE="" PRI_INBANDDISCONNECT_INCLUDE=""
else else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
PRI_INBANDRELEASE_LIB="" PRI_INBANDDISCONNECT_LIB=""
fi fi
PBX_PRI_INBANDRELEASE=1 PBX_PRI_INBANDDISCONNECT=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_INBANDRELEASE 1 #define HAVE_PRI_INBANDDISCONNECT 1
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_INBANDRELEASE_VERSION #define HAVE_PRI_INBANDDISCONNECT_VERSION
_ACEOF _ACEOF
fi fi

2
configure.ac
Unescape View File

@ -1293,7 +1293,7 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h]) AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
AST_EXT_LIB_CHECK([PRI_INBANDRELEASE], [pri], [pri_set_inbandrelease], [libpri.h]) AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h])
AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm]) AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])

8
include/asterisk/autoconfig.h.in
Unescape View File

@ -589,11 +589,11 @@
/* Define this to indicate the ${PRI_DESCRIP} library */ /* Define this to indicate the ${PRI_DESCRIP} library */
#undef HAVE_PRI #undef HAVE_PRI
/* Define this to indicate the ${PRI_INBANDRELEASE_DESCRIP} library */ /* Define this to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library */
#undef HAVE_PRI_INBANDRELEASE #undef HAVE_PRI_INBANDDISCONNECT
/* Define to indicate the ${PRI_INBANDRELEASE_DESCRIP} library version */ /* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library version */
#undef HAVE_PRI_INBANDRELEASE_VERSION #undef HAVE_PRI_INBANDDISCONNECT_VERSION
/* Define to indicate the ${PRI_DESCRIP} library version */ /* Define to indicate the ${PRI_DESCRIP} library version */
#undef HAVE_PRI_VERSION #undef HAVE_PRI_VERSION

Write Preview
Loading…
Cancel
Save