mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-31 02:37:10 +00:00
Merged revisions 130040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r130040 | kpfleming | 2008-07-11 10:57:17 -0500 (Fri, 11 Jul 2008) | 12 lines Merged revisions 130039 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r130039 | kpfleming | 2008-07-11 10:41:56 -0500 (Fri, 11 Jul 2008) | 4 lines add support for a configuration parameter for 'inband audio during RELEASE', which is currently mandatory in libpri-1.4.4 but will become configurable in libpri-1.4.5 later today (related to issue #13042) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
@@ -413,6 +413,9 @@ struct dahdi_pri {
|
||||
int span;
|
||||
int resetting;
|
||||
int resetpos;
|
||||
#ifdef HAVE_PRI_INBANDRELEASE
|
||||
unsigned int inbandrelease:1; /*!< Should we support inband audio after receiving RELEASE? */
|
||||
#endif
|
||||
time_t lastreset; /*!< time when unused channels were last reset */
|
||||
long resetinterval; /*!< Interval (in seconds) for resetting unused channels */
|
||||
int sig;
|
||||
@@ -8289,6 +8292,9 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
|
||||
pris[span].minunused = conf->pri.minunused;
|
||||
pris[span].minidle = conf->pri.minidle;
|
||||
pris[span].overlapdial = conf->pri.overlapdial;
|
||||
#ifdef HAVE_PRI_INBANDRELEASE
|
||||
pris[span].inbandrelease = conf->pri.inbandrelease;
|
||||
#endif
|
||||
pris[span].facilityenable = conf->pri.facilityenable;
|
||||
ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial));
|
||||
ast_copy_string(pris[span].idleext, conf->pri.idleext, sizeof(pris[span].idleext));
|
||||
@@ -11322,6 +11328,9 @@ static int start_pri(struct dahdi_pri *pri)
|
||||
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
|
||||
pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
|
||||
pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
|
||||
#ifdef HAVE_PRI_INBANDRELEASE
|
||||
pri_set_inbandrelease(pri->dchans[i], pri->inbandrelease);
|
||||
#endif
|
||||
/* Enslave to master if appropriate */
|
||||
if (i)
|
||||
pri_enslave(pri->dchans[0], pri->dchans[i]);
|
||||
@@ -14076,6 +14085,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, struct ast_variable *v,
|
||||
} else {
|
||||
confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
|
||||
}
|
||||
#ifdef HAVE_PRI_INBANDRELEASE
|
||||
} else if (!strcasecmp(v->name, "inbandrelease")) {
|
||||
confp->pri.inbandrelease = ast_true(v->value);
|
||||
#endif
|
||||
} else if (!strcasecmp(v->name, "pritimer")) {
|
||||
#ifdef PRI_GETSET_TIMERS
|
||||
char tmp[20], *timerc, *c = tmp;
|
||||
|
||||
@@ -162,6 +162,10 @@
|
||||
;
|
||||
;overlapdial=yes
|
||||
;
|
||||
; Allow inband audio (progress) when a call is RELEASEd by the far end of a PRI
|
||||
;
|
||||
;inbandrelease=yes
|
||||
;
|
||||
; PRI Out of band indications.
|
||||
; Enable this to report Busy and Congestion on a PRI using out-of-band
|
||||
; notification. Inband indication, as used by Asterisk doesn't seem to work
|
||||
|
||||
264
configure
vendored
264
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.ac Revision: 127397 .
|
||||
# From configure.ac Revision: 127778 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
|
||||
#
|
||||
@@ -38883,6 +38883,268 @@ fi
|
||||
|
||||
|
||||
|
||||
if test "x${PBX_PRI_INBANDRELEASE}" != "x1" -a "${USE_PRI_INBANDRELEASE}" != "no"; then
|
||||
pbxlibdir=""
|
||||
# if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
|
||||
if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
|
||||
if test -d ${PRI_INBANDRELEASE_DIR}/lib; then
|
||||
pbxlibdir="-L${PRI_INBANDRELEASE_DIR}/lib"
|
||||
else
|
||||
pbxlibdir="-L${PRI_INBANDRELEASE_DIR}"
|
||||
fi
|
||||
fi
|
||||
pbxfuncname="pri_set_inbandrelease"
|
||||
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
|
||||
AST_PRI_INBANDRELEASE_FOUND=yes
|
||||
else
|
||||
as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
|
||||
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
|
||||
echo $ECHO_N "checking for ${pbxfuncname} in -lpri... $ECHO_C" >&6; }
|
||||
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-lpri ${pbxlibdir} $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char ${pbxfuncname} ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return ${pbxfuncname} ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest$ac_exeext &&
|
||||
$as_test_x conftest$ac_exeext; then
|
||||
eval "$as_ac_Lib=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_Lib=no"
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
ac_res=`eval echo '${'$as_ac_Lib'}'`
|
||||
{ echo "$as_me:$LINENO: result: $ac_res" >&5
|
||||
echo "${ECHO_T}$ac_res" >&6; }
|
||||
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
|
||||
AST_PRI_INBANDRELEASE_FOUND=yes
|
||||
else
|
||||
AST_PRI_INBANDRELEASE_FOUND=no
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# now check for the header.
|
||||
if test "${AST_PRI_INBANDRELEASE_FOUND}" = "yes"; then
|
||||
PRI_INBANDRELEASE_LIB="${pbxlibdir} -lpri "
|
||||
# if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
|
||||
if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
|
||||
PRI_INBANDRELEASE_INCLUDE="-I${PRI_INBANDRELEASE_DIR}/include"
|
||||
fi
|
||||
PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} "
|
||||
if test "xlibpri.h" = "x" ; then # no header, assume found
|
||||
PRI_INBANDRELEASE_HEADER_FOUND="1"
|
||||
else # check for the header
|
||||
saved_cppflags="${CPPFLAGS}"
|
||||
CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}"
|
||||
if test "${ac_cv_header_libpri_h+set}" = set; then
|
||||
{ echo "$as_me:$LINENO: checking for libpri.h" >&5
|
||||
echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_libpri_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ echo "$as_me:$LINENO: checking libpri.h usability" >&5
|
||||
echo $ECHO_N "checking libpri.h usability... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <libpri.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ echo "$as_me:$LINENO: checking libpri.h presence" >&5
|
||||
echo $ECHO_N "checking libpri.h presence... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <libpri.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5
|
||||
echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5
|
||||
echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5
|
||||
echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;}
|
||||
( cat <<\_ASBOX
|
||||
## ------------------------------- ##
|
||||
## Report this to www.asterisk.org ##
|
||||
## ------------------------------- ##
|
||||
_ASBOX
|
||||
) | sed "s/^/$as_me: WARNING: /" >&2
|
||||
;;
|
||||
esac
|
||||
{ echo "$as_me:$LINENO: checking for libpri.h" >&5
|
||||
echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_libpri_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_header_libpri_h=$ac_header_preproc
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; }
|
||||
|
||||
fi
|
||||
if test $ac_cv_header_libpri_h = yes; then
|
||||
PRI_INBANDRELEASE_HEADER_FOUND=1
|
||||
else
|
||||
PRI_INBANDRELEASE_HEADER_FOUND=0
|
||||
fi
|
||||
|
||||
|
||||
CPPFLAGS="${saved_cppflags}"
|
||||
fi
|
||||
if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then
|
||||
PRI_INBANDRELEASE_LIB=""
|
||||
PRI_INBANDRELEASE_INCLUDE=""
|
||||
else
|
||||
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
|
||||
PRI_INBANDRELEASE_LIB=""
|
||||
fi
|
||||
PBX_PRI_INBANDRELEASE=1
|
||||
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_PRI_INBANDRELEASE 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_PRI_INBANDRELEASE_VERSION
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x${PBX_SPANDSP}" != "x1" -a "${USE_SPANDSP}" != "no"; then
|
||||
{ echo "$as_me:$LINENO: checking if \"
|
||||
#if SPANDSP_RELEASE_DATE < 20080516
|
||||
|
||||
@@ -1292,6 +1292,8 @@ 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_INBANDRELEASE], [pri], [pri_set_inbandrelease], [libpri.h])
|
||||
|
||||
AST_C_COMPILE_CHECK([SPANDSP], [
|
||||
#if SPANDSP_RELEASE_DATE < 20080516
|
||||
#error "spandsp 0.0.5 or greater is required"
|
||||
|
||||
@@ -589,6 +589,12 @@
|
||||
/* Define this to indicate the ${PRI_DESCRIP} library */
|
||||
#undef HAVE_PRI
|
||||
|
||||
/* Define this to indicate the ${PRI_INBANDRELEASE_DESCRIP} library */
|
||||
#undef HAVE_PRI_INBANDRELEASE
|
||||
|
||||
/* Define to indicate the ${PRI_INBANDRELEASE_DESCRIP} library version */
|
||||
#undef HAVE_PRI_INBANDRELEASE_VERSION
|
||||
|
||||
/* Define to indicate the ${PRI_DESCRIP} library version */
|
||||
#undef HAVE_PRI_VERSION
|
||||
|
||||
|
||||
Reference in New Issue
Block a user