[asterisk-commits] file: branch anthonyl/5240-testing r43295 - in
/team/anthonyl/5240-testing: ....
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Sep 19 14:20:55 MST 2006
Author: file
Date: Tue Sep 19 16:20:54 2006
New Revision: 43295
URL: http://svn.digium.com/view/asterisk?rev=43295&view=rev
Log:
Merged revisions 43185,43199,43205,43207-43208,43212-43216,43221,43230,43236-43237,43239-43240,43243-43245,43249,43256-43259,43263-43264,43271-43273,43281-43282,43285,43287-43290 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r43185 | mogorman | 2006-09-18 12:36:14 -0400 (Mon, 18 Sep 2006) | 5 lines
seperate jingle and gtalk so it will be easier to track
changes in both of the moving specs. Currently chan_gtalk is
compatible with the latest gtalk/libjingle version, and chan_jingle
needs a lot of work.
................
r43199 | file | 2006-09-18 13:37:44 -0400 (Mon, 18 Sep 2006) | 2 lines
Reference will be kept in the application component only right now. In the future this should be expanded to the channel driver (just like all the other channel drivers) (issue #7975 reported by andrewt)
................
r43205 | qwell | 2006-09-18 15:08:40 -0400 (Mon, 18 Sep 2006) | 2 lines
escape some quotes
................
r43207 | kpfleming | 2006-09-18 15:20:24 -0400 (Mon, 18 Sep 2006) | 2 lines
it appears that current Mac OS/X does not need the poll compatibility module at all, and platforms that do need it also need -DPOLLCOMPAT (or they wouldn't have compiled at all)
................
r43208 | kpfleming | 2006-09-18 15:30:10 -0400 (Mon, 18 Sep 2006) | 2 lines
handle config.guess name for FreeBSD properly
................
r43212 | kpfleming | 2006-09-18 15:54:18 -0400 (Mon, 18 Sep 2006) | 2 lines
merge qwell's CLI verbification work
................
r43213 | kpfleming | 2006-09-18 15:54:46 -0400 (Mon, 18 Sep 2006) | 2 lines
revert this since, since some unnamed platforms are silly about it :-)
................
r43214 | oej | 2006-09-18 15:56:44 -0400 (Mon, 18 Sep 2006) | 2 lines
Issue #7351 - sending CANCEL when the call at some point has been in UP state is wrong.
................
r43215 | qwell | 2006-09-18 15:57:09 -0400 (Mon, 18 Sep 2006) | 4 lines
We have autoconf...let's actually use it.
(note, M4 wasn't used, so...bye)
................
r43216 | kpfleming | 2006-09-18 15:58:27 -0400 (Mon, 18 Sep 2006) | 2 lines
always use fork() when available
................
r43221 | oej | 2006-09-18 16:13:14 -0400 (Mon, 18 Sep 2006) | 2 lines
Merging patch from 1.2 - Issue #7682
................
r43230 | qwell | 2006-09-18 17:24:50 -0400 (Mon, 18 Sep 2006) | 4 lines
Only use alloca.h on OSes that have it.
Reported by jontow on IRC in #asterisk-dev
................
r43236 | qwell | 2006-09-18 18:02:04 -0400 (Mon, 18 Sep 2006) | 2 lines
u_intXX_t is silly
................
r43237 | kpfleming | 2006-09-18 18:05:53 -0400 (Mon, 18 Sep 2006) | 2 lines
a little cleanup and simplification, and remove ON_FIRST_USE mode since nobody uses it
................
r43239 | kpfleming | 2006-09-18 18:14:09 -0400 (Mon, 18 Sep 2006) | 2 lines
don't need two copies of this
................
r43240 | qwell | 2006-09-18 18:35:40 -0400 (Mon, 18 Sep 2006) | 3 lines
Change the includes to work on FreeBSD
Linux has sys/soundcard.h, which does a #include <linux/soundcard.h>
................
r43243 | mogorman | 2006-09-18 19:32:57 -0400 (Mon, 18 Sep 2006) | 5 lines
allow for packetization on rtp channel drivers, need to add
option for setting our own packetization as apposed to just doing
what is asked.
................
r43244 | qwell | 2006-09-18 19:37:25 -0400 (Mon, 18 Sep 2006) | 2 lines
This was silly. Nowhere else do we use [ or [[
................
r43245 | qwell | 2006-09-18 19:59:23 -0400 (Mon, 18 Sep 2006) | 4 lines
This totally worked when I tested it...
Reverting for now..
................
r43249 | tilghman | 2006-09-19 08:30:17 -0400 (Tue, 19 Sep 2006) | 10 lines
Merged revisions 43248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43248 | tilghman | 2006-09-19 07:28:55 -0500 (Tue, 19 Sep 2006) | 2 lines
cid is passed to a destructive function; thus a copy is needed (issue 7961)
........
................
r43256 | kpfleming | 2006-09-19 10:04:15 -0400 (Tue, 19 Sep 2006) | 2 lines
restore ability for Makefiles to use 'generic' platform names when needed
................
r43257 | qwell | 2006-09-19 10:16:12 -0400 (Tue, 19 Sep 2006) | 2 lines
be a little more consistent with our variable usage
................
r43258 | qwell | 2006-09-19 10:19:54 -0400 (Tue, 19 Sep 2006) | 2 lines
Add a few more 'generic' platforms
................
r43259 | qwell | 2006-09-19 10:24:14 -0400 (Tue, 19 Sep 2006) | 2 lines
Let's order these better..
................
r43263 | file | 2006-09-19 11:23:39 -0400 (Tue, 19 Sep 2006) | 2 lines
Improve output of sip show peers (issue #6624 reported by mavetju with minor code changes by myself)
................
r43264 | file | 2006-09-19 11:36:25 -0400 (Tue, 19 Sep 2006) | 2 lines
Warning be gone!
................
r43271 | mogorman | 2006-09-19 12:23:03 -0400 (Tue, 19 Sep 2006) | 1 line
blocking version 43269 from being pushed into trunk
................
r43272 | mogorman | 2006-09-19 12:23:45 -0400 (Tue, 19 Sep 2006) | 3 lines
similar patch for verbose vs debug with minor changes
bug 2617
................
r43273 | mattf | 2006-09-19 12:25:21 -0400 (Tue, 19 Sep 2006) | 2 lines
Let's try this out. Seems silly, but we'll try it anyways
................
r43281 | mattf | 2006-09-19 13:07:22 -0400 (Tue, 19 Sep 2006) | 2 lines
Mergeing in Paul Cadach's chan_h323 changes *holds breath*
................
r43282 | mattf | 2006-09-19 13:09:01 -0400 (Tue, 19 Sep 2006) | 2 lines
Update configure and closest kin. *Hopes my branch doesn't break*
................
r43285 | file | 2006-09-19 14:48:17 -0400 (Tue, 19 Sep 2006) | 2 lines
While this is experimental I don't think it should be experimental enough to be printed out in big capital letters, and Kenny tends to agree too so you know it's right.
................
r43287 | mattf | 2006-09-19 15:04:13 -0400 (Tue, 19 Sep 2006) | 2 lines
Work!!!
................
r43288 | mattf | 2006-09-19 15:25:18 -0400 (Tue, 19 Sep 2006) | 2 lines
Add the h323 config file. Arrr!!! for international talk like a pirate's day.
................
r43289 | anthonyl | 2006-09-19 15:28:57 -0400 (Tue, 19 Sep 2006) | 1 line
5240 update
................
r43290 | qwell | 2006-09-19 15:58:09 -0400 (Tue, 19 Sep 2006) | 4 lines
After discussing this with other people, we decided we'd like to try to do this a little differently.
Stay tuned.
................
Modified:
team/anthonyl/5240-testing/ (props changed)
team/anthonyl/5240-testing/CREDITS
team/anthonyl/5240-testing/Makefile
team/anthonyl/5240-testing/Makefile.moddir_rules
team/anthonyl/5240-testing/acinclude.m4
team/anthonyl/5240-testing/apps/app_dial.c
team/anthonyl/5240-testing/apps/app_macro.c
team/anthonyl/5240-testing/apps/app_meetme.c
team/anthonyl/5240-testing/apps/app_mixmonitor.c
team/anthonyl/5240-testing/apps/app_osplookup.c
team/anthonyl/5240-testing/apps/app_playback.c
team/anthonyl/5240-testing/apps/app_queue.c
team/anthonyl/5240-testing/apps/app_realtime.c
team/anthonyl/5240-testing/apps/app_rpt.c
team/anthonyl/5240-testing/apps/app_voicemail.c
team/anthonyl/5240-testing/build_tools/cflags.xml
team/anthonyl/5240-testing/build_tools/menuselect-deps.in
team/anthonyl/5240-testing/build_tools/prep_moduledeps
team/anthonyl/5240-testing/channels/Makefile
team/anthonyl/5240-testing/channels/chan_agent.c
team/anthonyl/5240-testing/channels/chan_alsa.c
team/anthonyl/5240-testing/channels/chan_features.c
team/anthonyl/5240-testing/channels/chan_h323.c
team/anthonyl/5240-testing/channels/chan_iax2.c
team/anthonyl/5240-testing/channels/chan_jingle.c
team/anthonyl/5240-testing/channels/chan_local.c
team/anthonyl/5240-testing/channels/chan_mgcp.c
team/anthonyl/5240-testing/channels/chan_misdn.c
team/anthonyl/5240-testing/channels/chan_oss.c
team/anthonyl/5240-testing/channels/chan_sip.c
team/anthonyl/5240-testing/channels/chan_skinny.c
team/anthonyl/5240-testing/channels/chan_zap.c
team/anthonyl/5240-testing/channels/h323/Makefile
team/anthonyl/5240-testing/channels/h323/README
team/anthonyl/5240-testing/channels/h323/TODO
team/anthonyl/5240-testing/channels/h323/ast_h323.cpp
team/anthonyl/5240-testing/channels/h323/ast_h323.h
team/anthonyl/5240-testing/channels/h323/chan_h323.h
team/anthonyl/5240-testing/channels/h323/h323.conf.sample
team/anthonyl/5240-testing/channels/iax2-provision.c
team/anthonyl/5240-testing/codecs/gsm/Makefile
team/anthonyl/5240-testing/configure
team/anthonyl/5240-testing/configure.ac
team/anthonyl/5240-testing/doc/jingle.txt
team/anthonyl/5240-testing/doc/realtime.txt
team/anthonyl/5240-testing/formats/format_g723.c
team/anthonyl/5240-testing/formats/format_pcm.c
team/anthonyl/5240-testing/include/asterisk/autoconfig.h.in
team/anthonyl/5240-testing/include/asterisk/cli.h
team/anthonyl/5240-testing/include/asterisk/frame.h
team/anthonyl/5240-testing/include/asterisk/lock.h
team/anthonyl/5240-testing/include/asterisk/rtp.h
team/anthonyl/5240-testing/main/Makefile
team/anthonyl/5240-testing/main/asterisk.c
team/anthonyl/5240-testing/main/astmm.c
team/anthonyl/5240-testing/main/cdr.c
team/anthonyl/5240-testing/main/channel.c
team/anthonyl/5240-testing/main/cli.c
team/anthonyl/5240-testing/main/config.c
team/anthonyl/5240-testing/main/db.c
team/anthonyl/5240-testing/main/dnsmgr.c
team/anthonyl/5240-testing/main/file.c
team/anthonyl/5240-testing/main/frame.c
team/anthonyl/5240-testing/main/http.c
team/anthonyl/5240-testing/main/image.c
team/anthonyl/5240-testing/main/logger.c
team/anthonyl/5240-testing/main/manager.c
team/anthonyl/5240-testing/main/pbx.c
team/anthonyl/5240-testing/main/rtp.c
team/anthonyl/5240-testing/main/strcompat.c
team/anthonyl/5240-testing/main/translate.c
team/anthonyl/5240-testing/main/udptl.c
team/anthonyl/5240-testing/makeopts.in
team/anthonyl/5240-testing/pbx/pbx_ael.c
team/anthonyl/5240-testing/pbx/pbx_config.c
team/anthonyl/5240-testing/pbx/pbx_dundi.c
team/anthonyl/5240-testing/pbx/pbx_gtkconsole.c
team/anthonyl/5240-testing/res/res_agi.c
team/anthonyl/5240-testing/res/res_clioriginate.c
team/anthonyl/5240-testing/res/res_config_pgsql.c
team/anthonyl/5240-testing/res/res_convert.c
team/anthonyl/5240-testing/res/res_crypto.c
team/anthonyl/5240-testing/res/res_features.c
team/anthonyl/5240-testing/res/res_indications.c
team/anthonyl/5240-testing/res/res_jabber.c
team/anthonyl/5240-testing/res/res_musiconhold.c
team/anthonyl/5240-testing/res/res_odbc.c
team/anthonyl/5240-testing/utils/Makefile
team/anthonyl/5240-testing/utils/muted.c
Propchange: team/anthonyl/5240-testing/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/anthonyl/5240-testing/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/anthonyl/5240-testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 19 16:20:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-43181
+/trunk:1-43293
Modified: team/anthonyl/5240-testing/CREDITS
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/CREDITS?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/CREDITS (original)
+++ team/anthonyl/5240-testing/CREDITS Tue Sep 19 16:20:54 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/anthonyl/5240-testing/Makefile
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/Makefile?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/Makefile (original)
+++ team/anthonyl/5240-testing/Makefile Tue Sep 19 16:20:54 2006
@@ -140,13 +140,6 @@
endif
endif
endif
-endif
-
-ID=id
-
-ifeq ($(OSARCH),SunOS)
- M4=/usr/local/bin/m4
- ID=/usr/xpg4/bin/id
endif
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
@@ -648,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/anthonyl/5240-testing/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/Makefile.moddir_rules?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/Makefile.moddir_rules (original)
+++ team/anthonyl/5240-testing/Makefile.moddir_rules Tue Sep 19 16:20:54 2006
@@ -34,7 +34,7 @@
define module_so_template
$(1)=$(1).so
-$(1).so: CFLAGS+=-fpic
+$(1).so: CFLAGS+=-fPIC
$(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB))
$(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS))
$(1).so: $(2)
Modified: team/anthonyl/5240-testing/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/acinclude.m4?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/acinclude.m4 (original)
+++ team/anthonyl/5240-testing/acinclude.m4 Tue Sep 19 16:20:54 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/anthonyl/5240-testing/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_dial.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_dial.c (original)
+++ team/anthonyl/5240-testing/apps/app_dial.c Tue Sep 19 16:20:54 2006
@@ -1182,7 +1182,7 @@
/* Again, keep going even if there's an error */
if (option_debug)
ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
- else if (option_verbose > 2)
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
ast_hangup(tmp->chan);
tmp->chan = NULL;
Modified: team/anthonyl/5240-testing/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_macro.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_macro.c (original)
+++ team/anthonyl/5240-testing/apps/app_macro.c Tue Sep 19 16:20:54 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);
- else if (option_verbose > 1)
+ 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);
- else if (option_verbose > 1)
+ 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/anthonyl/5240-testing/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_meetme.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_meetme.c (original)
+++ team/anthonyl/5240-testing/apps/app_meetme.c Tue Sep 19 16:20:54 2006
@@ -661,13 +661,6 @@
return cnf;
}
-static int confs_show(int fd, int argc, char **argv)
-{
- ast_cli(fd, "Deprecated! Please use 'meetme' instead.\n");
-
- return RESULT_SUCCESS;
-}
-
/*! \brief CLI command for showing SLAs */
static int sla_show(int fd, int argc, char *argv[])
{
@@ -693,23 +686,7 @@
return RESULT_SUCCESS;
}
-static char show_confs_usage[] =
-"Deprecated! Please use 'meetme' instead.\n";
-
-static struct ast_cli_entry cli_show_confs = {
- { "show", "conferences", NULL }, confs_show,
- "Show status of conferences", show_confs_usage, NULL };
-
-
-static char sla_show_usage[] =
-"Usage: sla show\n"
-" Lists status of all shared line appearances\n";
-
-static struct ast_cli_entry cli_sla_show = {
- { "sla", "show", NULL }, sla_show,
- "Show status of Shared Line Appearances", sla_show_usage, NULL };
-
-static int conf_cmd(int fd, int argc, char **argv)
+static int meetme_cmd(int fd, int argc, char **argv)
{
/* Process the command */
struct ast_conference *cnf;
@@ -853,7 +830,7 @@
return 0;
}
-static char *complete_confcmd(const char *line, const char *word, int pos, int state)
+static char *complete_meetmecmd(const char *line, const char *word, int pos, int state)
{
static char *cmds[] = {"lock", "unlock", "mute", "unmute", "kick", "list", NULL};
@@ -915,13 +892,23 @@
return NULL;
}
-static char conf_usage[] =
-"Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
+static char meetme_usage[] =
+"Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
" Executes a command for the conference or on a conferee\n";
-static struct ast_cli_entry cli_conf = {
- {"meetme", NULL, NULL }, conf_cmd,
- "Execute a command on a conference or conferee", conf_usage, complete_confcmd};
+static char sla_show_usage[] =
+"Usage: sla show\n"
+" Lists status of all shared line appearances\n";
+
+static struct ast_cli_entry cli_meetme[] = {
+ { { "sla", "show", NULL },
+ sla_show, "Show status of Shared Line Appearances",
+ sla_show_usage, NULL },
+
+ { { "meetme", NULL, NULL },
+ meetme_cmd, "Execute a command on a conference or conferee",
+ meetme_usage, complete_meetmecmd },
+};
static void conf_flush(int fd, struct ast_channel *chan)
{
@@ -3072,10 +3059,8 @@
{
int res = 0;
- res |= ast_cli_unregister(&cli_show_confs);
- res |= ast_cli_unregister(&cli_sla_show);
- res |= ast_cli_unregister(&cli_conf);
- res |= ast_manager_unregister("MeetmeMute");
+ ast_cli_unregister_multiple(cli_meetme, sizeof(cli_meetme) / sizeof(struct ast_cli_entry));
+ res = ast_manager_unregister("MeetmeMute");
res |= ast_manager_unregister("MeetmeUnmute");
res |= ast_unregister_application(app3);
res |= ast_unregister_application(app2);
@@ -3095,10 +3080,8 @@
int res;
ASTOBJ_CONTAINER_INIT(&slas);
- res = ast_cli_register(&cli_show_confs);
- res |= ast_cli_register(&cli_sla_show);
- res |= ast_cli_register(&cli_conf);
- res |= ast_manager_register("MeetmeMute", EVENT_FLAG_CALL, action_meetmemute, "Mute a Meetme user");
+ ast_cli_register_multiple(cli_meetme, sizeof(cli_meetme) / sizeof(struct ast_cli_entry));
+ res = ast_manager_register("MeetmeMute", EVENT_FLAG_CALL, action_meetmemute, "Mute a Meetme user");
res |= ast_manager_register("MeetmeUnmute", EVENT_FLAG_CALL, action_meetmeunmute, "Unmute a Meetme user");
res |= ast_register_application(app3, admin_exec, synopsis3, descrip3);
res |= ast_register_application(app2, count_exec, synopsis2, descrip2);
Modified: team/anthonyl/5240-testing/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_mixmonitor.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_mixmonitor.c (original)
+++ team/anthonyl/5240-testing/apps/app_mixmonitor.c Tue Sep 19 16:20:54 2006
@@ -421,22 +421,21 @@
return ast_complete_channels(line, word, pos, state, 2);
}
-static struct ast_cli_entry cli_mixmonitor = {
- { "mixmonitor", NULL, NULL },
- mixmonitor_cli,
- "Execute a MixMonitor command.",
+static struct ast_cli_entry cli_mixmonitor[] = {
+ { { "mixmonitor", NULL, NULL },
+ mixmonitor_cli, "Execute a MixMonitor command.",
"mixmonitor <start|stop> <chan_name> [args]\n\n"
"The optional arguments are passed to the\n"
"MixMonitor application when the 'start' command is used.\n",
- complete_mixmonitor_cli
+ complete_mixmonitor_cli },
};
static int unload_module(void)
{
int res;
- res = ast_cli_unregister(&cli_mixmonitor);
- res |= ast_unregister_application(stop_app);
+ ast_cli_unregister_multiple(cli_mixmonitor, sizeof(cli_mixmonitor) / sizeof(struct ast_cli_entry));
+ res = ast_unregister_application(stop_app);
res |= ast_unregister_application(app);
ast_module_user_hangup_all();
@@ -448,8 +447,8 @@
{
int res;
- res = ast_cli_register(&cli_mixmonitor);
- res |= ast_register_application(app, mixmonitor_exec, synopsis, desc);
+ ast_cli_register_multiple(cli_mixmonitor, sizeof(cli_mixmonitor) / sizeof(struct ast_cli_entry));
+ res = ast_register_application(app, mixmonitor_exec, synopsis, desc);
res |= ast_register_application(stop_app, stop_mixmonitor_exec, stop_synopsis, stop_desc);
return res;
Modified: team/anthonyl/5240-testing/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_osplookup.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_osplookup.c (original)
+++ team/anthonyl/5240-testing/apps/app_osplookup.c Tue Sep 19 16:20:54 2006
@@ -1596,11 +1596,10 @@
"Usage: osp show\n"
" Displays information on Open Settlement Protocol support\n";
-static struct ast_cli_entry osp_cli = {
- {"osp", "show", NULL},
- osp_show,
- "Displays OSP information",
- osp_usage
+static struct ast_cli_entry cli_osp[] = {
+ { { "osp", "show", NULL},
+ osp_show, "Displays OSP information",
+ osp_usage },
};
static int load_module(void)
@@ -1610,8 +1609,8 @@
if(!osp_load())
return AST_MODULE_LOAD_DECLINE;
- res = ast_cli_register(&osp_cli);
- res |= ast_register_application(app1, ospauth_exec, synopsis1, descrip1);
+ ast_cli_register_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry));
+ res = ast_register_application(app1, ospauth_exec, synopsis1, descrip1);
res |= ast_register_application(app2, osplookup_exec, synopsis2, descrip2);
res |= ast_register_application(app3, ospnext_exec, synopsis3, descrip3);
res |= ast_register_application(app4, ospfinished_exec, synopsis4, descrip4);
@@ -1627,7 +1626,7 @@
res |= ast_unregister_application(app3);
res |= ast_unregister_application(app2);
res |= ast_unregister_application(app1);
- res |= ast_cli_unregister(&osp_cli);
+ ast_cli_unregister_multiple(cli_osp, sizeof(cli_osp) / sizeof(struct ast_cli_entry));
osp_unload();
ast_module_user_hangup_all();
Modified: team/anthonyl/5240-testing/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_playback.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_playback.c (original)
+++ team/anthonyl/5240-testing/apps/app_playback.c Tue Sep 19 16:20:54 2006
@@ -371,8 +371,10 @@
return RESULT_SUCCESS;
}
-static struct ast_cli_entry myclis[] = {
- { { "say", "load", NULL }, __say_init, "set/show the say mode", "say load new|old" },
+static struct ast_cli_entry cli_playback[] = {
+ { { "say", "load", NULL },
+ __say_init, "set/show the say mode",
+ "say load new|old" },
};
static int playback_exec(struct ast_channel *chan, void *data)
@@ -478,7 +480,7 @@
static int load_module(void)
{
reload();
- ast_cli_register_multiple(myclis, sizeof(myclis)/sizeof(struct ast_cli_entry));
+ ast_cli_register_multiple(cli_playback, sizeof(cli_playback) / sizeof(struct ast_cli_entry));
return ast_register_application(app, playback_exec, synopsis, descrip);
}
Modified: team/anthonyl/5240-testing/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/anthonyl/5240-testing/apps/app_queue.c?rev=43295&r1=43294&r2=43295&view=diff
==============================================================================
--- team/anthonyl/5240-testing/apps/app_queue.c (original)
+++ team/anthonyl/5240-testing/apps/app_queue.c Tue Sep 19 16:20:54 2006
@@ -1636,7 +1636,7 @@
/* Again, keep going even if there's an error */
if (option_debug)
ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
- else if (option_verbose > 2)
+ if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", tmp->interface);
do_hang(tmp);
(*busies)++;
@@ -3941,7 +3941,7 @@
return RESULT_SUCCESS;
}
-static int queues_show(int fd, int argc, char **argv)
+static int queue_list(int fd, int argc, char **argv)
{
return __queues_show(NULL, 0, fd, argc, argv, 0);
}
@@ -3975,7 +3975,7 @@
*/
static int manager_queues_show( struct mansession *s, struct message *m )
{
- char *a[] = { "show", "queues" };
+ char *a[] = { "queue", "list" };
__queues_show(s, 1, -1, 2, a, 0);
astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */
@@ -4175,7 +4175,7 @@
return 0;
}
-static int handle_add_queue_member(int fd, int argc, char *argv[])
+static int handle_queue_add_member(int fd, int argc, char *argv[])
{
char *queuename, *interface;
int penalty;
@@ -4222,9 +4222,9 @@
}
}
-static char *complete_add_queue_member(const char *line, const char *word, int pos, int state)
-{
- /* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - to; 5 - <queue>; 6 - penalty; 7 - <penalty> */
+static char *complete_queue_add_member(const char *line, const char *word, int pos, int state)
+{
+ /* 0 - queue; 1 - add; 2 - member; 3 - <member>; 4 - to; 5 - <queue>; 6 - penalty; 7 - <penalty> */
switch (pos) {
case 3: /* Don't attempt to complete name of member (infinite possibilities) */
return NULL;
@@ -4249,7 +4249,7 @@
}
}
-static int handle_remove_queue_member(int fd, int argc, char *argv[])
+static int handle_queue_remove_member(int fd, int argc, char *argv[])
{
char *queuename, *interface;
@@ -4280,13 +4280,13 @@
}
}
-static char *complete_remove_queue_member(const char *line, const char *word, int pos, int state)
+static char *complete_queue_remove_member(const char *line, const char *word, int pos, int state)
{
int which = 0;
struct call_queue *q;
struct member *m;
- /* 0 - add; 1 - queue; 2 - member; 3 - <member>; 4 - from; 5 - <queue> */
+ /* 0 - queue; 1 - remove; 2 - member; 3 - <member>; 4 - from; 5 - <queue> */
if (pos > 5 || pos < 3)
return NULL;
if (pos == 4) /* only one possible match, 'from' */
@@ -4312,44 +4312,64 @@
return NULL;
}
-static char show_queues_usage[] =
-"Usage: show queues\n"
+static char queue_list_usage[] =
+"Usage: queue list\n"
" Provides summary information on call queues.\n";
-static struct ast_cli_entry cli_show_queues = {
- { "show", "queues", NULL }, queues_show,
- "Show status of queues", show_queues_usage, NULL };
-
-static char show_queue_usage[] =
-"Usage: show queue\n"
+static char queue_show_usage[] =
+"Usage: queue show\n"
" Provides summary information on a specified queue.\n";
-static struct ast_cli_entry cli_show_queue = {
- { "show", "queue", NULL }, queue_show,
- "Show status of a specified queue", show_queue_usage, complete_queue };
-
-static char aqm_cmd_usage[] =
-"Usage: add queue member <channel> to <queue> [penalty <penalty>]\n";
-
-static struct ast_cli_entry cli_add_queue_member = {
- { "add", "queue", "member", NULL }, handle_add_queue_member,
- "Add a channel to a specified queue", aqm_cmd_usage, complete_add_queue_member };
-
-static char rqm_cmd_usage[] =
-"Usage: remove queue member <channel> from <queue>\n";
-
-static struct ast_cli_entry cli_remove_queue_member = {
- { "remove", "queue", "member", NULL }, handle_remove_queue_member,
- "Removes a channel from a specified queue", rqm_cmd_usage, complete_remove_queue_member };
+static char qam_cmd_usage[] =
+"Usage: queue add member <channel> to <queue> [penalty <penalty>]\n";
+
+static char qrm_cmd_usage[] =
+"Usage: queue remove member <channel> from <queue>\n";
+
+static struct ast_cli_entry cli_show_queues_deprecated = {
+ { "show", "queues", NULL },
+ queue_list, NULL,
+ NULL, NULL };
+
+static struct ast_cli_entry cli_show_queue_deprecated = {
+ { "show", "queue", NULL },
+ queue_show, NULL,
+ NULL, complete_queue };
+
+static struct ast_cli_entry cli_add_queue_member_deprecated = {
+ { "add", "queue", "member", NULL },
+ handle_queue_add_member, NULL,
+ NULL, complete_queue_add_member };
+
+static struct ast_cli_entry cli_remove_queue_member_deprecated = {
+ { "remove", "queue", "member", NULL },
+ handle_queue_remove_member, NULL,
+ NULL, complete_queue_remove_member };
+
+static struct ast_cli_entry cli_queue[] = {
+ { { "queue", "list", NULL },
+ queue_list, "Show status of queues",
+ queue_list_usage, NULL, &cli_show_queues_deprecated },
+
+ { { "queue", "show", NULL },
+ queue_show, "Show status of a specified queue",
+ queue_show_usage, complete_queue, &cli_show_queue_deprecated },
+
+ { { "queue", "add", "member", NULL },
+ handle_queue_add_member, "Add a channel to a specified queue",
+ qam_cmd_usage, complete_queue_add_member, &cli_add_queue_member_deprecated },
+
+ { { "queue", "remove", "member", NULL },
+ handle_queue_remove_member, "Removes a channel from a specified queue",
+ qrm_cmd_usage, complete_queue_remove_member, &cli_remove_queue_member_deprecated },
+};
static int unload_module(void)
{
int res;
- res = ast_cli_unregister(&cli_show_queue);
- res |= ast_cli_unregister(&cli_show_queues);
- res |= ast_cli_unregister(&cli_add_queue_member);
[... 18679 lines stripped ...]
More information about the asterisk-commits
mailing list