[asterisk-commits] mattf: branch mattf/asterisk-ss7 r43400 - in
/team/mattf/asterisk-ss7: ./ app...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Sep 21 08:54:50 MST 2006
Author: mattf
Date: Thu Sep 21 10:54:49 2006
New Revision: 43400
URL: http://svn.digium.com/view/asterisk?rev=43400&view=rev
Log:
Do it now!
Added:
team/mattf/asterisk-ss7/channels/h323/Makefile.in (props changed)
- copied unchanged from r43397, trunk/channels/h323/Makefile.in
team/mattf/asterisk-ss7/channels/h323/ast_h323.cxx (props changed)
- copied unchanged from r43397, trunk/channels/h323/ast_h323.cxx
team/mattf/asterisk-ss7/channels/h323/caps_h323.cxx (props changed)
- copied unchanged from r43397, trunk/channels/h323/caps_h323.cxx
team/mattf/asterisk-ss7/channels/h323/caps_h323.h (props changed)
- copied unchanged from r43397, trunk/channels/h323/caps_h323.h
team/mattf/asterisk-ss7/channels/h323/cisco-h225.asn (props changed)
- copied unchanged from r43397, trunk/channels/h323/cisco-h225.asn
team/mattf/asterisk-ss7/channels/h323/cisco-h225.cxx (props changed)
- copied unchanged from r43397, trunk/channels/h323/cisco-h225.cxx
team/mattf/asterisk-ss7/channels/h323/cisco-h225.h (props changed)
- copied unchanged from r43397, trunk/channels/h323/cisco-h225.h
team/mattf/asterisk-ss7/channels/h323/compat_h323.cxx (props changed)
- copied unchanged from r43397, trunk/channels/h323/compat_h323.cxx
team/mattf/asterisk-ss7/channels/h323/compat_h323.h (props changed)
- copied unchanged from r43397, trunk/channels/h323/compat_h323.h
team/mattf/asterisk-ss7/channels/h323/noexport.map (props changed)
- copied unchanged from r43397, trunk/channels/h323/noexport.map
team/mattf/asterisk-ss7/configs/h323.conf.sample (props changed)
- copied unchanged from r43397, trunk/configs/h323.conf.sample
team/mattf/asterisk-ss7/doc/rtp-packetization.txt (props changed)
- copied unchanged from r43397, trunk/doc/rtp-packetization.txt
team/mattf/asterisk-ss7/include/jitterbuf.h (props changed)
- copied unchanged from r43397, trunk/include/jitterbuf.h
Removed:
team/mattf/asterisk-ss7/channels/h323/Makefile
team/mattf/asterisk-ss7/channels/h323/ast_h323.cpp
team/mattf/asterisk-ss7/channels/h323/h323.conf.sample
team/mattf/asterisk-ss7/main/jitterbuf.h
Modified:
team/mattf/asterisk-ss7/ (props changed)
team/mattf/asterisk-ss7/.cleancount
team/mattf/asterisk-ss7/CREDITS
team/mattf/asterisk-ss7/Makefile
team/mattf/asterisk-ss7/UPGRADE.txt
team/mattf/asterisk-ss7/acinclude.m4
team/mattf/asterisk-ss7/apps/app_adsiprog.c
team/mattf/asterisk-ss7/apps/app_alarmreceiver.c
team/mattf/asterisk-ss7/apps/app_directory.c
team/mattf/asterisk-ss7/apps/app_festival.c
team/mattf/asterisk-ss7/apps/app_followme.c
team/mattf/asterisk-ss7/apps/app_getcpeid.c
team/mattf/asterisk-ss7/apps/app_macro.c
team/mattf/asterisk-ss7/apps/app_meetme.c
team/mattf/asterisk-ss7/apps/app_osplookup.c
team/mattf/asterisk-ss7/apps/app_privacy.c
team/mattf/asterisk-ss7/apps/app_queue.c
team/mattf/asterisk-ss7/apps/app_rpt.c
team/mattf/asterisk-ss7/apps/app_voicemail.c
team/mattf/asterisk-ss7/build_tools/cflags.xml
team/mattf/asterisk-ss7/build_tools/make_version
team/mattf/asterisk-ss7/build_tools/menuselect-deps.in
team/mattf/asterisk-ss7/cdr/cdr_csv.c
team/mattf/asterisk-ss7/cdr/cdr_odbc.c
team/mattf/asterisk-ss7/cdr/cdr_pgsql.c
team/mattf/asterisk-ss7/cdr/cdr_radius.c
team/mattf/asterisk-ss7/cdr/cdr_tds.c
team/mattf/asterisk-ss7/channels/Makefile
team/mattf/asterisk-ss7/channels/chan_agent.c
team/mattf/asterisk-ss7/channels/chan_h323.c
team/mattf/asterisk-ss7/channels/chan_iax2.c
team/mattf/asterisk-ss7/channels/chan_misdn.c
team/mattf/asterisk-ss7/channels/chan_sip.c
team/mattf/asterisk-ss7/channels/chan_zap.c
team/mattf/asterisk-ss7/channels/h323/ (props changed)
team/mattf/asterisk-ss7/channels/h323/README
team/mattf/asterisk-ss7/channels/h323/TODO
team/mattf/asterisk-ss7/channels/h323/ast_h323.h
team/mattf/asterisk-ss7/channels/h323/chan_h323.h
team/mattf/asterisk-ss7/channels/iax2-provision.c
team/mattf/asterisk-ss7/configs/queues.conf.sample
team/mattf/asterisk-ss7/configs/sip.conf.sample
team/mattf/asterisk-ss7/configs/skinny.conf.sample
team/mattf/asterisk-ss7/configure
team/mattf/asterisk-ss7/configure.ac
team/mattf/asterisk-ss7/doc/realtime.txt
team/mattf/asterisk-ss7/funcs/func_callerid.c
team/mattf/asterisk-ss7/funcs/func_odbc.c
team/mattf/asterisk-ss7/include/asterisk/adsi.h
team/mattf/asterisk-ss7/include/asterisk/agi.h
team/mattf/asterisk-ss7/include/asterisk/autoconfig.h.in
team/mattf/asterisk-ss7/include/asterisk/compat.h
team/mattf/asterisk-ss7/include/asterisk/config.h
team/mattf/asterisk-ss7/include/asterisk/monitor.h
team/mattf/asterisk-ss7/include/asterisk/res_odbc.h
team/mattf/asterisk-ss7/main/Makefile
team/mattf/asterisk-ss7/main/astmm.c
team/mattf/asterisk-ss7/main/config.c
team/mattf/asterisk-ss7/main/logger.c
team/mattf/asterisk-ss7/main/manager.c
team/mattf/asterisk-ss7/main/rtp.c
team/mattf/asterisk-ss7/main/udptl.c
team/mattf/asterisk-ss7/pbx/pbx_ael.c
team/mattf/asterisk-ss7/pbx/pbx_config.c
team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c
team/mattf/asterisk-ss7/res/res_adsi.c
team/mattf/asterisk-ss7/res/res_agi.c
team/mattf/asterisk-ss7/res/res_config_odbc.c
team/mattf/asterisk-ss7/res/res_config_pgsql.c
team/mattf/asterisk-ss7/res/res_convert.c
team/mattf/asterisk-ss7/res/res_features.c
team/mattf/asterisk-ss7/res/res_jabber.c
team/mattf/asterisk-ss7/res/res_monitor.c
team/mattf/asterisk-ss7/res/res_musiconhold.c
team/mattf/asterisk-ss7/res/res_odbc.c
team/mattf/asterisk-ss7/sounds/Makefile
Propchange: team/mattf/asterisk-ss7/
('branch-1.2-blocked' removed)
Propchange: team/mattf/asterisk-ss7/
('branch-1.2-merged' removed)
Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
branch-1.4-blocked =
Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
branch-1.4-merged = /branches/1.4:1-43376,43383,43386,43388,43392,43396
Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 21 10:54:49 2006
@@ -1,1 +1,1 @@
-/trunk:1-43273
+/trunk:1-43399
Modified: team/mattf/asterisk-ss7/.cleancount
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/.cleancount?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/.cleancount (original)
+++ team/mattf/asterisk-ss7/.cleancount Thu Sep 21 10:54:49 2006
@@ -1,1 +1,1 @@
-23
+24
Modified: team/mattf/asterisk-ss7/CREDITS
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/CREDITS?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/CREDITS (original)
+++ team/mattf/asterisk-ss7/CREDITS Thu Sep 21 10:54:49 2006
@@ -150,6 +150,8 @@
James Rothenberger - Support for IMAP storage integration added by OneBizTone LLC Work funded by University of Pennsylvania jar at onebiztone.com
+Paul Cadach - Bringing chan_h323 up to date, bug fixes, and more!
+
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Michael Jerris - bug marshaling
Modified: team/mattf/asterisk-ss7/Makefile
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/Makefile?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/Makefile (original)
+++ team/mattf/asterisk-ss7/Makefile Thu Sep 21 10:54:49 2006
@@ -106,7 +106,7 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-MOD_SUBDIR_CFLAGS=-I../include -I../main
+MOD_SUBDIR_CFLAGS=-I../include
OTHER_SUBDIR_CFLAGS=-I../include
ifeq ($(OSARCH),linux-gnu)
@@ -641,7 +641,7 @@
rm -rf $(DESTDIR)$(ASTLOGDIR)
menuselect: menuselect/menuselect menuselect-tree
- - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
+ - at menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
@unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
Modified: team/mattf/asterisk-ss7/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/UPGRADE.txt?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/UPGRADE.txt (original)
+++ team/mattf/asterisk-ss7/UPGRADE.txt Thu Sep 21 10:54:49 2006
@@ -414,3 +414,11 @@
channel drivers set ANI. If you would like to change the callerid number
on the channel from the dialplan and have that change also show up in the
CDR, then you *must* set CALLERID(ANI) as well as CALLERID(num).
+
+API:
+
+* There are some API functions that were not previously prefixed with the 'ast_'
+ prefix but now are; these include the ADSI, ODBC and AGI interfaces. If you
+ have a module that uses the services provided by res_adsi, res_odbc, or
+ res_agi, you will need to add ast_ prefixes to the functions that you call
+ from those modules.
Modified: team/mattf/asterisk-ss7/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/acinclude.m4?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/acinclude.m4 (original)
+++ team/mattf/asterisk-ss7/acinclude.m4 Thu Sep 21 10:54:49 2006
@@ -116,6 +116,320 @@
AC_SUBST([GNU_MAKE])
])
+
+AC_DEFUN(
+[AST_CHECK_PWLIB], [
+PWLIB_INCDIR=
+PWLIB_LIBDIR=
+if test "${PWLIBDIR:-unset}" != "unset" ; then
+ AC_CHECK_FILE(${PWLIBDIR}/version.h, HAS_PWLIB=1, )
+fi
+if test "${HAS_PWLIB:-unset}" = "unset" ; then
+ if test "${OPENH323DIR:-unset}" != "unset"; then
+ AC_CHECK_FILE(${OPENH323DIR}/../pwlib/version.h, HAS_PWLIB=1, )
+ fi
+ if test "${HAS_PWLIB:-unset}" != "unset" ; then
+ PWLIBDIR="${OPENH323DIR}/../pwlib"
+ else
+ AC_CHECK_FILE(${HOME}/pwlib/include/ptlib.h, HAS_PWLIB=1, )
+ if test "${HAS_PWLIB:-unset}" != "unset" ; then
+ PWLIBDIR="${HOME}/pwlib"
+ else
+ AC_CHECK_FILE(/usr/local/include/ptlib.h, HAS_PWLIB=1, )
+ if test "${HAS_PWLIB:-unset}" != "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
+ if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/share/pwlib/make)
+ fi
+ PWLIB_INCDIR="/usr/local/include"
+ PWLIB_LIBDIR="/usr/local/lib"
+ else
+ AC_CHECK_FILE(/usr/include/ptlib.h, HAS_PWLIB=1, )
+ if test "${HAS_PWLIB:-unset}" != "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/pwlib/make)
+ PWLIB_INCDIR="/usr/include"
+ PWLIB_LIBDIR="/usr/lib"
+ fi
+ fi
+ fi
+ fi
+fi
+
+#if test "${HAS_PWLIB:-unset}" = "unset" ; then
+# echo "Cannot find pwlib - please install or set PWLIBDIR and try again"
+# exit
+#fi
+
+if test "${HAS_PWLIB:-unset}" != "unset" ; then
+ if test "${PWLIBDIR:-unset}" = "unset" ; then
+ if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
+ PWLIBDIR=`$PTLIB_CONFIG --prefix`
+ else
+ echo "Cannot find ptlib-config - please install and try again"
+ exit
+ fi
+ fi
+
+ if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then
+ PWLIBDIR="/usr/share/pwlib"
+ PWLIB_INCDIR="/usr/include"
+ PWLIB_LIBDIR="/usr/lib"
+ fi
+ if test "x$PWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then
+ PWLIBDIR="/usr/local/share/pwlib"
+ PWLIB_INCDIR="/usr/local/include"
+ PWLIB_LIBDIR="/usr/local/lib"
+ fi
+
+ if test "${PWLIB_INCDIR:-unset}" = "unset"; then
+ PWLIB_INCDIR="${PWLIBDIR}/include"
+ fi
+ if test "${PWLIB_LIBDIR:-unset}" = "unset"; then
+ PWLIB_LIBDIR="${PWLIBDIR}/lib"
+ fi
+
+ AC_SUBST([PWLIBDIR])
+ AC_SUBST([PWLIB_INCDIR])
+ AC_SUBST([PWLIB_LIBDIR])
+fi
+])
+
+
+AC_DEFUN(
+[AST_CHECK_OPENH323_PLATFORM], [
+PWLIB_OSTYPE=
+case "$host_os" in
+ linux*) PWLIB_OSTYPE=linux ;
+ ;;
+ freebsd* ) PWLIB_OSTYPE=FreeBSD ;
+ ;;
+ openbsd* ) PWLIB_OSTYPE=OpenBSD ;
+ ENDLDLIBS="-lossaudio" ;
+ ;;
+ netbsd* ) PWLIB_OSTYPE=NetBSD ;
+ ENDLDLIBS="-lossaudio" ;
+ ;;
+ solaris* | sunos* ) PWLIB_OSTYPE=solaris ;
+ ;;
+ darwin* ) PWLIB_OSTYPE=Darwin ;
+ ;;
+ beos*) PWLIB_OSTYPE=beos ;
+ STDCCFLAGS="$STDCCFLAGS -D__BEOS__"
+ ;;
+ cygwin*) PWLIB_OSTYPE=cygwin ;
+ ;;
+ mingw*) PWLIB_OSTYPE=mingw ;
+ STDCCFLAGS="$STDCCFLAGS -mms-bitfields" ;
+ ENDLDLIBS="-lwinmm -lwsock32 -lsnmpapi -lmpr -lcomdlg32 -lgdi32 -lavicap32" ;
+ ;;
+ * ) PWLIB_OSTYPE="$host_os" ;
+ AC_MSG_WARN("OS $PWLIB_OSTYPE not recognized - proceed with caution!") ;
+ ;;
+esac
+
+PWLIB_MACHTYPE=
+case "$host_cpu" in
+ x86 | i686 | i586 | i486 | i386 ) PWLIB_MACHTYPE=x86
+ ;;
+
+ x86_64) PWLIB_MACHTYPE=x86_64 ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+
+ alpha | alphaev56 | alphaev6 | alphaev67 | alphaev7) PWLIB_MACHTYPE=alpha ;
+ P_64BIT=1 ;
+ ;;
+
+ sparc ) PWLIB_MACHTYPE=sparc ;
+ ;;
+
+ powerpc ) PWLIB_MACHTYPE=ppc ;
+ ;;
+
+ ppc ) PWLIB_MACHTYPE=ppc ;
+ ;;
+
+ powerpc64 ) PWLIB_MACHTYPE=ppc64 ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+
+ ppc64 ) PWLIB_MACHTYPE=ppc64 ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+
+ ia64) PWLIB_MACHTYPE=ia64 ;
+ P_64BIT=1 ;
+ ;;
+
+ s390x) PWLIB_MACHTYPE=s390x ;
+ P_64BIT=1 ;
+ LIB64=1 ;
+ ;;
+
+ s390) PWLIB_MACHTYPE=s390 ;
+ ;;
+
+ * ) PWLIB_MACHTYPE="$host_cpu";
+ AC_MSG_WARN("CPU $PWLIB_MACHTYPE not recognized - proceed with caution!") ;;
+esac
+
+PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
+
+AC_SUBST([PWLIB_PLATFORM])
+])
+
+
+AC_DEFUN(
+[AST_CHECK_OPENH323], [
+OPENH323_INCDIR=
+OPENH323_LIBDIR=
+if test "${OPENH323DIR:-unset}" != "unset" ; then
+ AC_CHECK_FILE(${OPENH323DIR}/version.h, HAS_OPENH323=1, )
+fi
+if test "${HAS_OPENH323:-unset}" = "unset" ; then
+ AC_CHECK_FILE(${PWLIBDIR}/../openh323/version.h, OPENH323DIR="${PWLIBDIR}/../openh323"; HAS_OPENH323=1, )
+ if test "${HAS_OPENH323:-unset}" != "unset" ; then
+ OPENH323DIR="${PWLIBDIR}/../openh323"
+ AC_CHECK_FILE(${OPENH323DIR}/include/h323.h, , OPENH323_INCDIR="${PWLIB_INCDIR}/openh323"; OPENH323_LIBDIR="${PWLIB_LIBDIR}")
+ else
+ AC_CHECK_FILE(${HOME}/openh323/include/h323.h, HAS_OPENH323=1, )
+ if test "${HAS_OPENH323:-unset}" != "unset" ; then
+ OPENH323DIR="${HOME}/openh323"
+ else
+ AC_CHECK_FILE(/usr/local/include/openh323/h323.h, HAS_OPENH323=1, )
+ if test "${HAS_OPENH323:-unset}" != "unset" ; then
+ OPENH323DIR="/usr/local/share/openh323"
+ OPENH323_INCDIR="/usr/local/include/openh323"
+ OPENH323_LIBDIR="/usr/local/lib"
+ else
+ AC_CHECK_FILE(/usr/include/openh323/h323.h, HAS_OPENH323=1, )
+ if test "${HAS_OPENH323:-unset}" != "unset" ; then
+ OPENH323DIR="/usr/share/openh323"
+ OPENH323_INCDIR="/usr/include/openh323"
+ OPENH323_LIBDIR="/usr/lib"
+ fi
+ fi
+ fi
+ fi
+fi
+
+if test "${HAS_OPENH323:-unset}" != "unset" ; then
+ if test "${OPENH323_INCDIR:-unset}" = "unset"; then
+ OPENH323_INCDIR="${OPENH323DIR}/include"
+ fi
+ if test "${OPENH323_LIBDIR:-unset}" = "unset"; then
+ OPENH323_LIBDIR="${OPENH323DIR}/lib"
+ fi
+
+ AC_SUBST([OPENH323DIR])
+ AC_SUBST([OPENH323_INCDIR])
+ AC_SUBST([OPENH323_LIBDIR])
+fi
+])
+
+
+AC_DEFUN(
+[AST_CHECK_PWLIB_VERSION], [
+ if test "${HAS_$2:-unset}" != "unset"; then
+ $2_VERSION=`grep "$2_VERSION" ${$2_INCDIR}/$3 | cut -f2 -d ' ' | sed -e 's/"//g'`
+ $2_MAJOR_VERSION=`echo ${$2_VERSION} | cut -f1 -d.`
+ $2_MINOR_VERSION=`echo ${$2_VERSION} | cut -f2 -d.`
+ $2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`
+ let $2_VER=${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}
+ let $2_REQ=$4*10000+$5*100+$6
+
+ AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
+ if test ${$2_VER} -lt ${$2_REQ}; then
+ AC_MSG_RESULT(no)
+ unset HAS_$2
+ else
+ AC_MSG_RESULT(yes)
+ fi
+ fi
+])
+
+
+AC_DEFUN(
+[AST_CHECK_PWLIB_BUILD], [
+ if test "${HAS_$2:-unset}" != "unset"; then
+ AC_MSG_CHECKING($1 installation validity)
+
+ saved_cppflags="${CPPFLAGS}"
+ saved_libs="${LIBS}"
+ LIBS="${LIBS} -L${$2_LIBDIR} -l${PLATFORM_$2} $7"
+ CPPFLAGS="${CPPFLAGS} -I${$2_INCDIR} $6"
+
+ AC_LANG_PUSH([C++])
+
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([$4],[$5])],
+ [ AC_MSG_RESULT(yes)
+ ac_cv_lib_$2="yes"
+ ],
+ [ AC_MSG_RESULT(no)
+ ac_cv_lib_$2="no"
+ ]
+ )
+
+ AC_LANG_POP([C++])
+
+ LIBS="${saved_libs}"
+ CPPFLAGS="${saved_cppflags}"
+
+ if test "${ac_cv_lib_$2}" = "yes"; then
+ if test "${$2_LIBDIR}" != "" -a "${$2_LIBDIR}" != "/usr/lib"; then
+ $2_LIB="-L${$2_LIBDIR} -l${PLATFORM_$2}"
+ else
+ $2_LIB="-l${PLATFORM_$2}"
+ fi
+ if test "${$2_INCDIR}" != "" -a "${$2_INCDIR}" != "/usr/include"; then
+ $2_INCLUDE="-I${$2_INCDIR}"
+ fi
+ PBX_$2=1
+ AC_DEFINE([HAVE_$2], 1, [$3])
+ fi
+ fi
+])
+
+AC_DEFUN(
+[AST_CHECK_OPENH323_BUILD], [
+ if test "${HAS_OPENH323:-unset}" != "unset"; then
+ AC_MSG_CHECKING(OpenH323 build option)
+ OPENH323_SUFFIX=
+ files=`ls -l ${OPENH323_LIBDIR}/libh323_${PWLIB_PLATFORM}_*.so*`
+ libfile=
+ if test -n "$files"; then
+ for f in $files; do
+ if test -f $f -a ! -L $f; then
+ libfile=`basename $f`
+ break;
+ fi
+ done
+ fi
+ if test "${libfile:-unset}" != "unset"; then
+ OPENH323_SUFFIX=`eval "echo ${libfile} | sed -e 's/libh323_${PWLIB_PLATFORM}_\(@<:@^.@:>@*\)\..*/\1/'"`
+ fi
+ case "${OPENH323_SUFFIX}" in
+ n)
+ OPENH323_BUILD="notrace";;
+ r)
+ OPENH323_BUILD="opt";;
+ d)
+ OPENH323_BUILD="debug";;
+ *)
+ OPENH323_BUILD="notrace";;
+ esac
+ AC_MSG_RESULT(${OPENH323_BUILD})
+
+ AC_SUBST([OPENH323_SUFFIX])
+ AC_SUBST([OPENH323_BUILD])
+ fi
+])
+
+
# AST_FUNC_FORK
# -------------
AN_FUNCTION([fork], [AST_FUNC_FORK])
Modified: team/mattf/asterisk-ss7/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_adsiprog.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_adsiprog.c (original)
+++ team/mattf/asterisk-ss7/apps/app_adsiprog.c Thu Sep 21 10:54:49 2006
@@ -1438,11 +1438,11 @@
return -1;
/* Start an empty ADSI Session */
- if (adsi_load_session(chan, NULL, 0, 1) < 1)
+ if (ast_adsi_load_session(chan, NULL, 0, 1) < 1)
return -1;
/* Now begin the download attempt */
- if (adsi_begin_download(chan, scr->desc, scr->fdn, scr->sec, scr->ver)) {
+ if (ast_adsi_begin_download(chan, scr->desc, scr->fdn, scr->sec, scr->ver)) {
/* User rejected us for some reason */
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "User rejected download attempt\n");
@@ -1456,7 +1456,7 @@
for (x=0;x<scr->numkeys;x++) {
if (bytes + scr->keys[x].retstrlen > 253) {
/* Send what we've collected so far */
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1469,7 +1469,7 @@
#endif
}
if (bytes) {
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1480,7 +1480,7 @@
for (x=0;x<scr->numdisplays;x++) {
if (bytes + scr->displays[x].datalen > 253) {
/* Send what we've collected so far */
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1493,7 +1493,7 @@
#endif
}
if (bytes) {
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1504,7 +1504,7 @@
for (x=0;x<scr->numsubs;x++) {
if (bytes + scr->subs[x].datalen > 253) {
/* Send what we've collected so far */
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1517,7 +1517,7 @@
#endif
}
if (bytes) {
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
return -1;
}
@@ -1525,11 +1525,11 @@
bytes = 0;
- bytes += adsi_display(buf, ADSI_INFO_PAGE, 1, ADSI_JUST_LEFT, 0, "Download complete.", "");
- bytes += adsi_set_line(buf, ADSI_INFO_PAGE, 1);
- if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY) < 0)
+ bytes += ast_adsi_display(buf, ADSI_INFO_PAGE, 1, ADSI_JUST_LEFT, 0, "Download complete.", "");
+ bytes += ast_adsi_set_line(buf, ADSI_INFO_PAGE, 1);
+ if (ast_adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DISPLAY) < 0)
return -1;
- if (adsi_end_download(chan)) {
+ if (ast_adsi_end_download(chan)) {
/* Download failed for some reason */
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Download attempt failed\n");
@@ -1538,7 +1538,7 @@
return -1;
}
free(scr);
- adsi_unload_session(chan);
+ ast_adsi_unload_session(chan);
return 0;
}
@@ -1552,7 +1552,7 @@
if (ast_strlen_zero(data))
data = "asterisk.adsi";
- if (!adsi_available(chan)) {
+ if (!ast_adsi_available(chan)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "ADSI Unavailable on CPE. Not bothering to try.\n");
} else {
Modified: team/mattf/asterisk-ss7/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_alarmreceiver.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_alarmreceiver.c (original)
+++ team/mattf/asterisk-ss7/apps/app_alarmreceiver.c Thu Sep 21 10:54:49 2006
@@ -733,7 +733,7 @@
static int load_config(void)
{
struct ast_config *cfg;
- char *p;
+ const char *p;
/* Read in the config file */
Modified: team/mattf/asterisk-ss7/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_directory.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_directory.c (original)
+++ team/mattf/asterisk-ss7/apps/app_directory.c Thu Sep 21 10:54:49 2006
@@ -183,7 +183,7 @@
}
#endif
-static char *convert(char *lastname)
+static char *convert(const char *lastname)
{
char *tmp;
int lcount = 0;
@@ -342,8 +342,8 @@
struct ast_category *cat;
struct ast_variable *var;
char *mailbox;
- char *fullname;
- char *hidefromdir;
+ const char *fullname;
+ const char *hidefromdir;
char tmp[100];
/* Load flat file config. */
@@ -402,7 +402,8 @@
int res;
int found=0;
int lastuserchoice = 0;
- char *start, *pos, *conv,*stringp=NULL;
+ char *start, *conv, *stringp = NULL;
+ const char *pos;
if (ast_strlen_zero(context)) {
ast_log(LOG_WARNING,
@@ -570,7 +571,8 @@
int last = 1;
int readext = 0;
int fromappvm = 0;
- char *dirintro, *parse;
+ const char *dirintro;
+ char *parse;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(vmcontext);
AST_APP_ARG(dialcontext);
Modified: team/mattf/asterisk-ss7/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_festival.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_festival.c (original)
+++ team/mattf/asterisk-ss7/apps/app_festival.c Thu Sep 21 10:54:49 2006
@@ -280,10 +280,10 @@
struct ast_hostent ahp;
int fd;
FILE *fs;
- char *host;
- char *cachedir;
- char *temp;
- char *festivalcommand;
+ const char *host;
+ const char *cachedir;
+ const char *temp;
+ const char *festivalcommand;
int port=1314;
int n;
char ack[4];
Modified: team/mattf/asterisk-ss7/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_followme.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_followme.c (original)
+++ team/mattf/asterisk-ss7/apps/app_followme.c Thu Sep 21 10:54:49 2006
@@ -149,7 +149,7 @@
static int ynlongest = 0;
static time_t start_time, answer_time, end_time;
-static char *featuredigittostr;
+static const char *featuredigittostr;
static int featuredigittimeout = 5000; /*!< Feature Digit Timeout */
static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class */
@@ -288,9 +288,9 @@
int timeout;
char *timeoutstr;
int numorder;
- char *takecallstr;
- char *declinecallstr;
- char *tmpstr;
+ const char *takecallstr;
+ const char *declinecallstr;
+ const char *tmpstr;
cfg = ast_config_load("followme.conf");
if (!cfg) {
Modified: team/mattf/asterisk-ss7/apps/app_getcpeid.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_getcpeid.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_getcpeid.c (original)
+++ team/mattf/asterisk-ss7/apps/app_getcpeid.c Thu Sep 21 10:54:49 2006
@@ -60,7 +60,7 @@
for (x=0;x<4;x++)
tmp[x] = stuff[x];
tmp[4] = NULL;
- return adsi_print(chan, tmp, justify, voice);
+ return ast_adsi_print(chan, tmp, justify, voice);
}
static int cpeid_exec(struct ast_channel *chan, void *idata)
@@ -83,10 +83,10 @@
strncpy(stuff[0], "** CPE Info **", sizeof(data[0]) - 1);
strncpy(stuff[1], "Identifying CPE...", sizeof(data[1]) - 1);
strncpy(stuff[2], "Please wait...", sizeof(data[2]) - 1);
- res = adsi_load_session(chan, NULL, 0, 1);
+ res = ast_adsi_load_session(chan, NULL, 0, 1);
if (res > 0) {
cpeid_setstatus(chan, stuff, 0);
- res = adsi_get_cpeid(chan, cpeid, 0);
+ res = ast_adsi_get_cpeid(chan, cpeid, 0);
if (res > 0) {
gotcpeid = 1;
if (option_verbose > 2)
@@ -96,7 +96,7 @@
strncpy(stuff[1], "Measuring CPE...", sizeof(data[1]) - 1);
strncpy(stuff[2], "Please wait...", sizeof(data[2]) - 1);
cpeid_setstatus(chan, stuff, 0);
- res = adsi_get_cpeinfo(chan, &width, &height, &buttons, 0);
+ res = ast_adsi_get_cpeinfo(chan, &width, &height, &buttons, 0);
if (res > -1) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "CPE has %d lines, %d columns, and %d buttons on '%s'\n", height, width, buttons, chan->name);
@@ -123,7 +123,7 @@
break;
}
}
- adsi_unload_session(chan);
+ ast_adsi_unload_session(chan);
}
}
ast_module_user_remove(u);
Modified: team/mattf/asterisk-ss7/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_macro.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_macro.c (original)
+++ team/mattf/asterisk-ss7/apps/app_macro.c Thu Sep 21 10:54:49 2006
@@ -238,14 +238,14 @@
case AST_PBX_KEEPALIVE:
if (option_debug)
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
- if (option_verbose > 1)
+ else if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
goto out;
break;
default:
if (option_debug)
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
- if (option_verbose > 1)
+ else if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
dead = 1;
goto out;
Modified: team/mattf/asterisk-ss7/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_meetme.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_meetme.c (original)
+++ team/mattf/asterisk-ss7/apps/app_meetme.c Thu Sep 21 10:54:49 2006
@@ -2948,7 +2948,7 @@
static void load_config_meetme(void)
{
struct ast_config *cfg;
- char *val;
+ const char *val;
audio_buffers = DEFAULT_AUDIO_BUFFERS;
Modified: team/mattf/asterisk-ss7/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_osplookup.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_osplookup.c (original)
+++ team/mattf/asterisk-ss7/apps/app_osplookup.c Thu Sep 21 10:54:49 2006
@@ -1385,7 +1385,7 @@
static int osp_load(void)
{
- char* t;
+ const char* t;
unsigned int v;
struct ast_config* cfg;
int error = OSPC_ERR_NO_ERROR;
Modified: team/mattf/asterisk-ss7/apps/app_privacy.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_privacy.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_privacy.c (original)
+++ team/mattf/asterisk-ss7/apps/app_privacy.c Thu Sep 21 10:54:49 2006
@@ -82,7 +82,7 @@
int maxretries = 3;
int minlength = 10;
int x = 0;
- char *s;
+ const char *s;
char phone[30];
struct ast_module_user *u;
struct ast_config *cfg = NULL;
Modified: team/mattf/asterisk-ss7/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_queue.c?rev=43400&r1=43399&r2=43400&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_queue.c (original)
+++ team/mattf/asterisk-ss7/apps/app_queue.c Thu Sep 21 10:54:49 2006
@@ -313,6 +313,7 @@
struct member {
char interface[80]; /*!< Technology/Location */
+ char membername[80]; /*!< Member name to use in queue logs */
int penalty; /*!< Are we a last resort? */
int calls; /*!< Number of calls serviced by this member */
int dynamic; /*!< Are we dynamically added? */
@@ -554,13 +555,14 @@
manager_event(EVENT_FLAG_AGENT, "QueueMemberStatus",
"Queue: %s\r\n"
"Location: %s\r\n"
+ "MemberName: %s\r\n"
"Membership: %s\r\n"
"Penalty: %d\r\n"
"CallsTaken: %d\r\n"
"LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
- q->name, cur->interface, cur->dynamic ? "dynamic" : "static",
+ q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : "static",
cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
}
@@ -594,7 +596,7 @@
return 0;
}
-static struct member *create_queue_member(char *interface, int penalty, int paused)
+static struct member *create_queue_member(char *interface, const char *membername, int penalty, int paused)
{
struct member *cur;
@@ -602,6 +604,7 @@
cur->penalty = penalty;
cur->paused = paused;
ast_copy_string(cur->interface, interface, sizeof(cur->interface));
+ ast_copy_string(cur->membername, membername, sizeof(cur->membername));
if (!strchr(cur->interface, '/'))
ast_log(LOG_WARNING, "No location at interface '%s'\n", interface);
cur->status = ast_device_state(interface);
@@ -909,7 +912,7 @@
}
}
-static void rt_handle_member_record(struct call_queue *q, char *interface, const char *penalty_str)
+static void rt_handle_member_record(struct call_queue *q, char *interface, const char *membername, const char *penalty_str)
{
struct member *m, *prev_m;
int penalty = 0;
@@ -927,7 +930,7 @@
/* Create a new one if not found, else update penalty */
if (!m) {
- if ((m = create_queue_member(interface, penalty, 0))) {
+ if ((m = create_queue_member(interface, membername, penalty, 0))) {
m->dead = 0;
add_to_interfaces(interface);
if (prev_m) {
@@ -1058,8 +1061,11 @@
m->dead = 1;
}
- while ((interface = ast_category_browse(member_config, interface)))
- rt_handle_member_record(q, interface, ast_variable_retrieve(member_config, interface, "penalty"));
+ while ((interface = ast_category_browse(member_config, interface))) {
+ rt_handle_member_record(q, interface,
+ S_OR(ast_variable_retrieve(member_config, interface, "membername"), interface),
+ ast_variable_retrieve(member_config, interface, "penalty"));
+ }
/* Delete all realtime members that have been deleted in DB. */
m = q->members;
@@ -1441,13 +1447,14 @@
manager_event(EVENT_FLAG_AGENT, "QueueMemberStatus",
"Queue: %s\r\n"
"Location: %s\r\n"
+ "MemberName: %s\r\n"
"Membership: %s\r\n"
"Penalty: %d\r\n"
"CallsTaken: %d\r\n"
"LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
- q->name, cur->interface, cur->dynamic ? "dynamic" : "static",
+ q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : "static",
cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
}
@@ -1814,18 +1821,18 @@
}
/*! \brief RNA == Ring No Answer. Common code that is executed when we try a queue member and they don't answer. */
-static void rna(int rnatime, struct queue_ent *qe, char *membername)
+static void rna(int rnatime, struct queue_ent *qe, char *interface, char *membername)
{
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", rnatime);
ast_queue_log(qe->parent->name, qe->chan->uniqueid, membername, "RINGNOANSWER", "%d", rnatime);
if (qe->parent->autopause) {
- if (!set_member_paused(qe->parent->name, membername, 1)) {
+ if (!set_member_paused(qe->parent->name, interface, 1)) {
if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_3 "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", membername, qe->parent->name);
+ ast_verbose( VERBOSE_PREFIX_3 "Auto-Pausing Queue Member %s in queue %s since they failed to answer.\n", interface, qe->parent->name);
} else {
if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_3 "Failed to pause Queue Member %s in queue %s!\n", membername, qe->parent->name);
+ ast_verbose( VERBOSE_PREFIX_3 "Failed to pause Queue Member %s in queue %s!\n", interface, qe->parent->name);
}
}
return;
@@ -1847,7 +1854,8 @@
struct callattempt *peer = NULL;
struct ast_channel *winner;
struct ast_channel *in = qe->chan;
- char on[256] = "";
+ char on[80] = "";
+ char membername[80] = "";
long starttime = 0;
long endtime = 0;
@@ -1896,6 +1904,7 @@
} else if (o->chan && (o->chan == winner)) {
if (!ast_strlen_zero(o->chan->call_forward) && !forwardsallowed) {
ast_copy_string(on, o->member->interface, sizeof(on));
+ ast_copy_string(membername, o->member->membername, sizeof(membername));
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s' prevented.\n", in->name, o->chan->call_forward);
winner = o->chan = NULL;
@@ -1975,7 +1984,7 @@
do_hang(o);
endtime = (long)time(NULL);
endtime -= starttime;
- rna(endtime*1000, qe, on);
+ rna(endtime*1000, qe, on, membername);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart)
*to = orig;
@@ -1990,7 +1999,7 @@
ast_cdr_busy(in->cdr);
endtime = (long)time(NULL);
endtime -= starttime;
- rna(endtime*1000, qe, on);
+ rna(endtime*1000, qe, on, membername);
do_hang(o);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart)
@@ -2019,7 +2028,7 @@
ast_frfree(f);
} else {
endtime = (long) time(NULL) - starttime;
- rna(endtime * 1000, qe, on);
+ rna(endtime * 1000, qe, on, membername);
do_hang(o);
if (qe->parent->strategy != QUEUE_STRATEGY_RINGALL) {
if (qe->parent->timeoutrestart)
@@ -2056,7 +2065,7 @@
ast_frfree(f);
}
if (!*to)
- rna(orig, qe, on);
+ rna(orig, qe, on, membername);
}
return peer;
@@ -2442,7 +2451,7 @@
if (peer->_softhangup) {
/* Agent must have hung up */
ast_log(LOG_WARNING, "Agent on %s hungup on the customer. They're going to be pissed.\n", peer->name);
- ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "AGENTDUMP", "%s", "");
record_abandoned(qe);
if (qe->parent->eventwhencalled)
manager_event(EVENT_FLAG_AGENT, "AgentDump",
@@ -2450,15 +2459,16 @@
"Uniqueid: %s\r\n"
"Channel: %s\r\n"
"Member: %s\r\n"
+ "MemberName: %s\r\n"
"%s",
- queuename, qe->chan->uniqueid, peer->name, member->interface,
+ queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_hangup(peer);
goto out;
} else if (res2) {
/* Caller must have hung up just before being connected*/
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
- ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long)time(NULL) - qe->start);
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long)time(NULL) - qe->start);
record_abandoned(qe);
ast_hangup(peer);
return -1;
@@ -2472,7 +2482,7 @@
/* Make sure channels are compatible */
res = ast_channel_make_compatible(qe->chan, peer);
if (res < 0) {
- ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "SYSCOMPAT", "%s", "");
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "SYSCOMPAT", "%s", "");
[... 9757 lines stripped ...]
More information about the asterisk-commits
mailing list