[svn-commits] moy: branch moy/mfcr2-1.4 r152129 - in /team/moy/mfcr2-1.4: ./ apps/ build_to...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Oct 26 20:27:59 CDT 2008
Author: moy
Date: Sun Oct 26 20:27:57 2008
New Revision: 152129
URL: http://svn.digium.com/view/asterisk?view=rev&rev=152129
Log:
merged changes from asterisk-1.4.22 (DAHDI-enabled)
Added:
team/moy/mfcr2-1.4/.lastclean
- copied unchanged from r152058, tags/1.4.22/.lastclean
team/moy/mfcr2-1.4/.version
- copied unchanged from r152058, tags/1.4.22/.version
team/moy/mfcr2-1.4/ChangeLog
- copied unchanged from r152058, tags/1.4.22/ChangeLog
team/moy/mfcr2-1.4/Zaptel-to-DAHDI.txt
- copied unchanged from r152058, tags/1.4.22/Zaptel-to-DAHDI.txt
team/moy/mfcr2-1.4/apps/app_dahdibarge.c
- copied unchanged from r152058, tags/1.4.22/apps/app_dahdibarge.c
team/moy/mfcr2-1.4/apps/app_dahdiras.c
- copied unchanged from r152058, tags/1.4.22/apps/app_dahdiras.c
team/moy/mfcr2-1.4/apps/app_dahdiscan.c
- copied unchanged from r152058, tags/1.4.22/apps/app_dahdiscan.c
team/moy/mfcr2-1.4/channels/chan_dahdi.c (with props)
team/moy/mfcr2-1.4/codecs/codec_dahdi.c
- copied unchanged from r152058, tags/1.4.22/codecs/codec_dahdi.c
team/moy/mfcr2-1.4/configs/chan_dahdi.conf.sample
- copied unchanged from r152058, tags/1.4.22/configs/chan_dahdi.conf.sample
team/moy/mfcr2-1.4/doc/lang/
- copied from r152058, tags/1.4.22/doc/lang/
team/moy/mfcr2-1.4/doc/lang/hebrew.ods
- copied unchanged from r152058, tags/1.4.22/doc/lang/hebrew.ods
team/moy/mfcr2-1.4/doc/sip-retransmit.txt
- copied unchanged from r152058, tags/1.4.22/doc/sip-retransmit.txt
team/moy/mfcr2-1.4/include/asterisk/dahdi_compat.h
- copied unchanged from r152058, tags/1.4.22/include/asterisk/dahdi_compat.h
team/moy/mfcr2-1.4/include/asterisk/tonezone_compat.h
- copied unchanged from r152058, tags/1.4.22/include/asterisk/tonezone_compat.h
team/moy/mfcr2-1.4/main/editline/makelist.in
- copied unchanged from r152058, tags/1.4.22/main/editline/makelist.in
team/moy/mfcr2-1.4/pbx/ael/ael-test/ael-vtest25/
- copied from r152058, tags/1.4.22/pbx/ael/ael-test/ael-vtest25/
team/moy/mfcr2-1.4/pbx/ael/ael-test/ael-vtest25/extensions.ael
- copied unchanged from r152058, tags/1.4.22/pbx/ael/ael-test/ael-vtest25/extensions.ael
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-vtest25
- copied unchanged from r152058, tags/1.4.22/pbx/ael/ael-test/ref.ael-vtest25
Removed:
team/moy/mfcr2-1.4/apps/app_zapbarge.c
team/moy/mfcr2-1.4/apps/app_zapras.c
team/moy/mfcr2-1.4/apps/app_zapscan.c
team/moy/mfcr2-1.4/channels/chan_zap.c
team/moy/mfcr2-1.4/codecs/codec_zap.c
team/moy/mfcr2-1.4/configs/zapata.conf.sample
team/moy/mfcr2-1.4/include/asterisk/dlfcn-compat.h
team/moy/mfcr2-1.4/main/dlfcn.c
team/moy/mfcr2-1.4/main/editline/makelist
team/moy/mfcr2-1.4/redhat/
Modified:
team/moy/mfcr2-1.4/ (props changed)
team/moy/mfcr2-1.4/CHANGES
team/moy/mfcr2-1.4/LICENSE
team/moy/mfcr2-1.4/Makefile
team/moy/mfcr2-1.4/Makefile.rules
team/moy/mfcr2-1.4/README
team/moy/mfcr2-1.4/acinclude.m4
team/moy/mfcr2-1.4/apps/Makefile
team/moy/mfcr2-1.4/apps/app_chanspy.c
team/moy/mfcr2-1.4/apps/app_dial.c
team/moy/mfcr2-1.4/apps/app_disa.c
team/moy/mfcr2-1.4/apps/app_flash.c
team/moy/mfcr2-1.4/apps/app_forkcdr.c
team/moy/mfcr2-1.4/apps/app_getcpeid.c
team/moy/mfcr2-1.4/apps/app_ices.c
team/moy/mfcr2-1.4/apps/app_meetme.c
team/moy/mfcr2-1.4/apps/app_page.c
team/moy/mfcr2-1.4/apps/app_parkandannounce.c
team/moy/mfcr2-1.4/apps/app_queue.c
team/moy/mfcr2-1.4/apps/app_read.c
team/moy/mfcr2-1.4/apps/app_rpt.c
team/moy/mfcr2-1.4/apps/app_sendtext.c
team/moy/mfcr2-1.4/apps/app_voicemail.c
team/moy/mfcr2-1.4/build_tools/cflags.xml
team/moy/mfcr2-1.4/build_tools/get_makeopts
team/moy/mfcr2-1.4/build_tools/get_moduleinfo
team/moy/mfcr2-1.4/build_tools/menuselect-deps.in
team/moy/mfcr2-1.4/build_tools/strip_nonapi
team/moy/mfcr2-1.4/cdr/cdr_csv.c
team/moy/mfcr2-1.4/cdr/cdr_tds.c
team/moy/mfcr2-1.4/channels/chan_agent.c
team/moy/mfcr2-1.4/channels/chan_gtalk.c
team/moy/mfcr2-1.4/channels/chan_h323.c
team/moy/mfcr2-1.4/channels/chan_iax2.c
team/moy/mfcr2-1.4/channels/chan_local.c
team/moy/mfcr2-1.4/channels/chan_mgcp.c
team/moy/mfcr2-1.4/channels/chan_misdn.c
team/moy/mfcr2-1.4/channels/chan_sip.c
team/moy/mfcr2-1.4/channels/chan_skinny.c
team/moy/mfcr2-1.4/channels/iax2-parser.c
team/moy/mfcr2-1.4/channels/misdn/isdn_lib.c
team/moy/mfcr2-1.4/channels/misdn_config.c
team/moy/mfcr2-1.4/configs/agents.conf.sample
team/moy/mfcr2-1.4/configs/extensions.ael.sample
team/moy/mfcr2-1.4/configs/extensions.conf.sample
team/moy/mfcr2-1.4/configs/misdn.conf.sample
team/moy/mfcr2-1.4/configs/sip.conf.sample
team/moy/mfcr2-1.4/configs/sla.conf.sample
team/moy/mfcr2-1.4/configs/smdi.conf.sample
team/moy/mfcr2-1.4/configure
team/moy/mfcr2-1.4/configure.ac
team/moy/mfcr2-1.4/contrib/init.d/rc.mandrake.asterisk
team/moy/mfcr2-1.4/contrib/init.d/rc.redhat.asterisk
team/moy/mfcr2-1.4/contrib/scripts/autosupport
team/moy/mfcr2-1.4/contrib/scripts/get_ilbc_source.sh
team/moy/mfcr2-1.4/contrib/utils/zones2indications.c
team/moy/mfcr2-1.4/doc/ael.txt
team/moy/mfcr2-1.4/doc/asterisk-conf.txt
team/moy/mfcr2-1.4/doc/asterisk-mib.txt
team/moy/mfcr2-1.4/doc/backtrace.txt
team/moy/mfcr2-1.4/doc/cdrdriver.txt
team/moy/mfcr2-1.4/doc/configuration.txt
team/moy/mfcr2-1.4/doc/digium-mib.txt
team/moy/mfcr2-1.4/doc/hardware.txt
team/moy/mfcr2-1.4/doc/imapstorage.txt
team/moy/mfcr2-1.4/doc/sla.tex
team/moy/mfcr2-1.4/funcs/func_cdr.c
team/moy/mfcr2-1.4/funcs/func_channel.c
team/moy/mfcr2-1.4/funcs/func_curl.c
team/moy/mfcr2-1.4/funcs/func_strings.c
team/moy/mfcr2-1.4/include/asterisk/abstract_jb.h
team/moy/mfcr2-1.4/include/asterisk/ael_structs.h
team/moy/mfcr2-1.4/include/asterisk/app.h
team/moy/mfcr2-1.4/include/asterisk/astobj.h
team/moy/mfcr2-1.4/include/asterisk/astobj2.h
team/moy/mfcr2-1.4/include/asterisk/autoconfig.h.in
team/moy/mfcr2-1.4/include/asterisk/causes.h
team/moy/mfcr2-1.4/include/asterisk/cdr.h
team/moy/mfcr2-1.4/include/asterisk/channel.h
team/moy/mfcr2-1.4/include/asterisk/compat.h
team/moy/mfcr2-1.4/include/asterisk/doxyref.h
team/moy/mfcr2-1.4/include/asterisk/global_datastores.h
team/moy/mfcr2-1.4/include/asterisk/indications.h
team/moy/mfcr2-1.4/include/asterisk/lock.h
team/moy/mfcr2-1.4/include/asterisk/options.h
team/moy/mfcr2-1.4/include/asterisk/pbx.h
team/moy/mfcr2-1.4/include/asterisk/sched.h
team/moy/mfcr2-1.4/include/asterisk/stringfields.h
team/moy/mfcr2-1.4/include/asterisk/threadstorage.h
team/moy/mfcr2-1.4/include/asterisk/utils.h
team/moy/mfcr2-1.4/main/Makefile
team/moy/mfcr2-1.4/main/abstract_jb.c
team/moy/mfcr2-1.4/main/acl.c
team/moy/mfcr2-1.4/main/app.c
team/moy/mfcr2-1.4/main/asterisk.c
team/moy/mfcr2-1.4/main/astmm.c
team/moy/mfcr2-1.4/main/astobj2.c
team/moy/mfcr2-1.4/main/audiohook.c
team/moy/mfcr2-1.4/main/autoservice.c
team/moy/mfcr2-1.4/main/cdr.c
team/moy/mfcr2-1.4/main/channel.c
team/moy/mfcr2-1.4/main/cli.c
team/moy/mfcr2-1.4/main/config.c
team/moy/mfcr2-1.4/main/devicestate.c
team/moy/mfcr2-1.4/main/dnsmgr.c
team/moy/mfcr2-1.4/main/editline/ (props changed)
team/moy/mfcr2-1.4/main/editline/Makefile.in
team/moy/mfcr2-1.4/main/editline/configure
team/moy/mfcr2-1.4/main/editline/configure.in
team/moy/mfcr2-1.4/main/editline/np/vis.c
team/moy/mfcr2-1.4/main/file.c
team/moy/mfcr2-1.4/main/fixedjitterbuf.h
team/moy/mfcr2-1.4/main/frame.c
team/moy/mfcr2-1.4/main/global_datastores.c
team/moy/mfcr2-1.4/main/http.c
team/moy/mfcr2-1.4/main/indications.c
team/moy/mfcr2-1.4/main/loader.c
team/moy/mfcr2-1.4/main/manager.c
team/moy/mfcr2-1.4/main/pbx.c
team/moy/mfcr2-1.4/main/poll.c
team/moy/mfcr2-1.4/main/rtp.c
team/moy/mfcr2-1.4/main/say.c
team/moy/mfcr2-1.4/main/sched.c
team/moy/mfcr2-1.4/main/translate.c
team/moy/mfcr2-1.4/main/utils.c
team/moy/mfcr2-1.4/makeopts.in
team/moy/mfcr2-1.4/pbx/Makefile
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-ntest10
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-test18
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-test6
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-test8
team/moy/mfcr2-1.4/pbx/ael/ael-test/ref.ael-vtest13
team/moy/mfcr2-1.4/pbx/ael/ael.flex
team/moy/mfcr2-1.4/pbx/ael/ael_lex.c
team/moy/mfcr2-1.4/pbx/pbx_ael.c
team/moy/mfcr2-1.4/pbx/pbx_config.c
team/moy/mfcr2-1.4/pbx/pbx_dundi.c
team/moy/mfcr2-1.4/pbx/pbx_spool.c
team/moy/mfcr2-1.4/res/res_agi.c
team/moy/mfcr2-1.4/res/res_config_odbc.c
team/moy/mfcr2-1.4/res/res_features.c
team/moy/mfcr2-1.4/res/res_indications.c
team/moy/mfcr2-1.4/res/res_musiconhold.c
team/moy/mfcr2-1.4/res/res_odbc.c
team/moy/mfcr2-1.4/res/snmp/agent.c
team/moy/mfcr2-1.4/sample.call
team/moy/mfcr2-1.4/sounds/Makefile
Propchange: team/moy/mfcr2-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/moy/mfcr2-1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/moy/mfcr2-1.4/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Sun Oct 26 20:27:57 2008
@@ -1,1 +1,1 @@
-menuselect https://origsvn.digium.com/svn/menuselect/tags/autotag_for_asterisk/1.4.21-rc2
+menuselect https://origsvn.digium.com/svn/menuselect/tags/autotag_for_asterisk/1.4.22-rc5
Modified: team/moy/mfcr2-1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/CHANGES?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/CHANGES (original)
+++ team/moy/mfcr2-1.4/CHANGES Sun Oct 26 20:27:57 2008
@@ -131,12 +131,22 @@
o New Option: K/k parking via dtmf tones
5. Dictate() -- optional filename argument added.
6. Directory() -- new option: e - In addition to the name, also read the extension number...
- 7. Meetme() -- new options:
+ 7. ForkCDR() -- new options:
+ o 'a' -- update answer time on new cdr
+ o 'A' -- Lock the orig CDR answer time against changes.
+ o 'D' -- Copy the disposition from the orig to the new CDR.
+ o 'd' -- clear the dstcannel field in the new CDR.
+ o 'e' -- set the end time of the original CDR.
+ o 'R' -- do NOT reset the new CDR.
+ o 's' -- Add/change var in orig CDR.
+ o 'T' -- Force ast_cdr_end, answer to obey LOCKED flag for the orig. CDR.
+ -- ast_cdr_setvar will be forced also (used by the CDR() func in write mode)
+ 8. Meetme() -- new options:
o 'I' -- announce user join/leave without review
o 'l' -- set listen only mode (Listen only, no talking)
o 'o' -- set talker optimization - treats talkers who aren't speaking as...
o '1' -- do not play message when first person enters
- 8. MeetmeAdmin() -- new options:
+ 9. MeetmeAdmin() -- new options:
o 'r' -- Reset one user's volume settings
o 'R' -- Reset all users volume settings
o 's' -- Lower entire conference speaking volume
@@ -147,21 +157,21 @@
o 'U' -- Lower all users listen volume
o 'v' -- Lower entire conference listening volume
o 'V' -- Raise entire conference listening volume
- 9. OSPFinish() : now also can return ERROR result.
- 10. OSPLookup() : Sets more variables, also now returns ERROR result.
- 11. Page() -- New option: r - record the page into a file (see 'r' for app_meetme)
- 12. Pickup() -- multiple extensions, PICKUPMARK; read the description!
- 13. Queue()
+ 10. OSPFinish() : now also can return ERROR result.
+ 11. OSPLookup() : Sets more variables, also now returns ERROR result.
+ 12. Page() -- New option: r - record the page into a file (see 'r' for app_meetme)
+ 13. Pickup() -- multiple extensions, PICKUPMARK; read the description!
+ 14. Queue()
o New Argument: AGI
o New option: i
- 14. Random() -- is now deprecated in 1.4
- 15. Read() -- replace 'skip' and 'noanswer' options with 's', 'n', add 'i' option.
- 16. Record() -- New option: 'x' : ignore all terminator keys (DTMF) and keep recording until hangup
- 17. UserEvent() -- slight change in behavior. Read the description.
- 18. VoiceMailMain() -- new a(#) option, goes to folder # directly.
- 19. WaitForSilence() -- new optional 3rd arg, time delay before returning.
+ 15. Random() -- is now deprecated in 1.4
+ 16. Read() -- replace 'skip' and 'noanswer' options with 's', 'n', add 'i' option.
+ 17. Record() -- New option: 'x' : ignore all terminator keys (DTMF) and keep recording until hangup
+ 18. UserEvent() -- slight change in behavior. Read the description.
+ 19. VoiceMailMain() -- new a(#) option, goes to folder # directly.
+ 20. WaitForSilence() -- new optional 3rd arg, time delay before returning.
* Functions that have changes to their interfaces:
- 1. CDR -- new option: u
+ 1. CDR -- new options: u and s
2. LANGUAGE -- Deprecated. Use CHANNEL(language) instead.
3. MUSICCLASS -- Deprecated. Use CHANNEL(musicclass) instead.
* Configuration File Changes:
Modified: team/moy/mfcr2-1.4/LICENSE
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/LICENSE?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/LICENSE (original)
+++ team/moy/mfcr2-1.4/LICENSE Sun Oct 26 20:27:57 2008
@@ -31,8 +31,8 @@
GPL'd products (although if you've written a module for Asterisk we
would strongly encourage you to make the same exception that we do).
-Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -59,7 +59,7 @@
+1.877.344.4861 (via telephone in the USA)
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
-IAX2/misery.digium.com/6000 (via IAX2)
+IAX2/pbx.digium.com (via IAX2)
licensing at digium.com (via email)
Digium, Inc.
Modified: team/moy/mfcr2-1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/Makefile?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/Makefile (original)
+++ team/moy/mfcr2-1.4/Makefile Sun Oct 26 20:27:57 2008
@@ -245,9 +245,6 @@
ifneq ($(wildcard .version),)
ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
- RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
-else
- RPMVERSION=unknown
endif
ifneq ($(wildcard .svn),)
@@ -281,7 +278,7 @@
endif
ifeq ($(OSARCH),SunOS)
- SOLINK=-shared -fpic -L/usr/local/ssl/lib
+ SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
SUBMAKE=$(MAKE) --quiet --no-print-directory
@@ -346,10 +343,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -358,7 +355,7 @@
fi
@rm -f $@.tmp
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
@build_tools/make_version_h > $@.tmp
@if cmp -s $@.tmp $@ ; then : ; else \
mv $@.tmp $@ ; \
@@ -392,7 +389,7 @@
@$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
- rm -f config.log config.status
+ rm -f config.log config.status config.cache
rm -rf autom4te.cache
rm -f include/asterisk/autoconfig.h
rm -f include/asterisk/buildopts.h
@@ -480,9 +477,11 @@
@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(MAKE) -C $(@:-install=) install
NEWMODS=$(notdir $(wildcard */*.so))
-OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+DEPMODS=chan_zap.so app_zapras.so app_zapscan.so app_zapbarge.so codec_zap.so
+OLDMODS=$(filter-out $(NEWMODS) $(DEPMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck:
+ @for f in $(DEPMODS); do rm -f $(DESTDIR)$(MODULES_DIR)/$$f; done
@if [ -n "$(OLDMODS)" ]; then \
echo " WARNING WARNING WARNING" ;\
echo "" ;\
@@ -581,7 +580,8 @@
echo "astrundir => $(ASTVARRUNDIR)" ; \
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
- echo ";[options]" ; \
+ echo "[options]" ; \
+ echo "languageprefix = yes ; Use the new sound prefix path syntax" ; \
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -595,7 +595,6 @@
echo ";nocolor = yes ; Disable console colors" ; \
echo ";dontwarn = yes ; Disable some warnings" ; \
echo ";dumpcore = yes ; Dump core on crash (same as -g at startup)" ; \
- echo ";languageprefix = yes ; Use the new sound prefix path syntax" ; \
echo ";internal_timing = yes" ; \
echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
echo ";maxcalls = 10 ; Maximum amount of calls allowed" ; \
@@ -607,6 +606,7 @@
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
+ echo ";dahdichanname = yes ; Channels created by chan_dahdi will be called 'DAHDI', otherwise 'Zap'" ; \
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
@@ -646,20 +646,6 @@
@echo " + HTTP_DOCSDIR +"
@echo " + +"
@echo " +-------------------------------------------+"
-
-spec:
- sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
-
-rpm: __rpm
-
-__rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
- rm -rf /tmp/asterisk ; \
- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
- $(MAKE) DESTDIR=/tmp/asterisk install ; \
- $(MAKE) DESTDIR=/tmp/asterisk samples ; \
- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
- cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
- rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
@@ -774,4 +760,6 @@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell menuselect.makeopts include/asterisk/version.h installdirs
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell menuselect.makeopts installdirs
+
+FORCE:
Modified: team/moy/mfcr2-1.4/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/Makefile.rules?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/Makefile.rules (original)
+++ team/moy/mfcr2-1.4/Makefile.rules Sun Oct 26 20:27:57 2008
@@ -42,6 +42,14 @@
$(ECHO_PREFIX) echo " [CC] $< -> $@"
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+%.o: %.i
+ $(ECHO_PREFIX) echo " [CCi] $< -> $@"
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+
+%.i: %.c
+ $(ECHO_PREFIX) echo " [CPP] $< -> $@"
+ $(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MD -MT $@ -MF .$(subst /,_,$@).d -MP
Modified: team/moy/mfcr2-1.4/README
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/README?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/README (original)
+++ team/moy/mfcr2-1.4/README Sun Oct 26 20:27:57 2008
@@ -159,7 +159,7 @@
understand, and do not affect how it is actually parsed.
Entries of the form 'variable=value' set the value of some parameter in
-asterisk. For example, in zapata.conf, one might specify:
+asterisk. For example, in chan_dahdi.conf, one might specify:
switchtype=national
Modified: team/moy/mfcr2-1.4/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/acinclude.m4?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/acinclude.m4 (original)
+++ team/moy/mfcr2-1.4/acinclude.m4 Sun Oct 26 20:27:57 2008
@@ -42,7 +42,7 @@
AC_SUBST([PBX_$1])
])
-# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data])
+# AST_EXT_LIB_CHECK([package symbol name], [package library name], [function to check], [package header], [additional LIB data], [additional INCLUDE data])
AC_DEFUN([AST_EXT_LIB_CHECK],
[
@@ -63,17 +63,14 @@
if test "x${$1_DIR}" != "x"; then
$1_LIB="${pbxlibdir} ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
- saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} -I${$1_DIR}/include"
- if test "x$4" != "x" ; then
- AC_CHECK_HEADER([${$1_DIR}/include/$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
- fi
- CPPFLAGS="${saved_cppflags}"
- else
- if test "x$4" != "x" ; then
- AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
- fi
fi
+ $1_INCLUDE="${$1_INCLUDE} $6"
+ saved_cppflags="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
+ if test "x$4" != "x" ; then
+ AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
+ fi
+ CPPFLAGS="${saved_cppflags}"
if test "x${$1_HEADER_FOUND}" = "x0" ; then
if test -n "${$1_MANDATORY}" ;
then
@@ -101,13 +98,65 @@
fi
])
+# The next three functions check for the availability of a given package.
+# AST_C_DEFINE_CHECK looks for the presence of a #define in a header file,
+# AST_C_COMPILE_CHECK can be used for testing for various items in header files,
+# AST_EXT_LIB_CHECK looks for a symbol in a given library, or at least
+# for the presence of a header file.
+# AST_EXT_TOOL_CHECK looks for a symbol in using $1-config to determine CFLAGS and LIBS
+#
+# They are only run if PBX_$1 != 1 (where $1 is the package),
+# so you can call them multiple times and stop at the first matching one.
+# On success, they both set PBX_$1 = 1, set $1_INCLUDE and $1_LIB as applicable,
+# and also #define HAVE_$1 1 and #define HAVE_$1_VERSION ${last_argument}
+# in autoconfig.h so you can tell which test succeeded.
+# They should be called after AST_EXT_LIB_SETUP($1, ...)
+
+# Check if a given macro is defined in a certain header.
+
+# AST_C_DEFINE_CHECK([package], [macro name], [header file], [version])
+AC_DEFUN([AST_C_DEFINE_CHECK],
+[
+ if test "x${PBX_$1}" != "x1"; then
+ AC_MSG_CHECKING([for $2 in $3])
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${$1_DIR}" != "x"; then
+ $1_INCLUDE="-I${$1_DIR}/include"
+ fi
+ CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
+
+ AC_COMPILE_IFELSE(
+ [ AC_LANG_PROGRAM( [#include <$3>],
+ [#if defined($2)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+ ])],
+ [ AC_MSG_RESULT(yes)
+ PBX_$1=1
+ AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.])
+ AC_DEFINE([HAVE_$1_VERSION], $4, [Define $1 headers version])
+ ],
+ [ AC_MSG_RESULT(no) ]
+ )
+ CPPFLAGS="${saved_cppflags}"
+ fi
+ AC_SUBST(PBX_$1)
+])
+
# AST_C_COMPILE_CHECK can be used for testing for various items in header files
-# AST_C_COMPILE_CHECK([package], [expression], [header file], [version])
+# AST_C_COMPILE_CHECK([package], [expression], [header file], [version], [description])
AC_DEFUN([AST_C_COMPILE_CHECK],
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
- AC_MSG_CHECKING([if "$2" compiles using $3])
+ if test "x$5" != "x"; then
+ AC_MSG_CHECKING([for $5])
+ else
+ AC_MSG_CHECKING([if "$2" compiles using $3])
+ fi
saved_cppflags="${CPPFLAGS}"
if test "x${$1_DIR}" != "x"; then
$1_INCLUDE="-I${$1_DIR}/include"
Modified: team/moy/mfcr2-1.4/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/apps/Makefile?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/apps/Makefile (original)
+++ team/moy/mfcr2-1.4/apps/Makefile Sun Oct 26 20:27:57 2008
@@ -37,11 +37,6 @@
MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
endif
-ifeq (SunOS,$(shell uname))
-MENUSELECT_DEPENDS_app_chanspy+=RT
-RT_LIB=-lrt
-endif
-
all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules
Modified: team/moy/mfcr2-1.4/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/apps/app_chanspy.c?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/apps/app_chanspy.c (original)
+++ team/moy/mfcr2-1.4/apps/app_chanspy.c Sun Oct 26 20:27:57 2008
@@ -54,6 +54,10 @@
#include "asterisk/lock.h"
#define AST_NAME_STRLEN 256
+
+/* "Zap/pseudo" is ten characters.
+ * "DAHDI/pseudo" is twelve characters.
+ */
static const char *tdesc = "Listen to a channel, and optionally whisper into it";
static const char *app_chan = "ChanSpy";
@@ -142,7 +146,7 @@
AST_APP_OPTION_ARG('r', OPTION_RECORD, OPT_ARG_RECORD),
});
-int next_unique_id_to_use = 0;
+static int next_unique_id_to_use = 0;
struct chanspy_translation_helper {
/* spy data */
@@ -461,6 +465,12 @@
const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
{
struct ast_channel *this;
+ char channel_name[AST_CHANNEL_NAME];
+ static size_t PSEUDO_CHAN_LEN = 0;
+
+ if (!PSEUDO_CHAN_LEN) {
+ PSEUDO_CHAN_LEN = *dahdi_chan_name_len + strlen("/pseudo");
+ }
redo:
if (spec)
@@ -473,7 +483,9 @@
if (!this)
return NULL;
- if (!strncmp(this->name, "Zap/pseudo", 10)) {
+ snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name);
+ if (!strncmp(this->name, channel_name, PSEUDO_CHAN_LEN)) {
+ last = this;
ast_channel_unlock(this);
goto redo;
} else if (this == chan) {
@@ -543,7 +555,7 @@
int igrp = !mygroup;
char *groups[25];
int num_groups = 0;
- char *dup_group;
+ char dup_group[512];
int x;
char *s;
@@ -575,7 +587,7 @@
if (mygroup) {
if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) {
- dup_group = ast_strdupa(group);
+ ast_copy_string(dup_group, group, sizeof(dup_group));
num_groups = ast_app_separate_args(dup_group, ':', groups,
sizeof(groups) / sizeof(groups[0]));
}
@@ -662,6 +674,8 @@
ast_channel_setoption(chan, AST_OPTION_TXGAIN, &zero_volume, sizeof(zero_volume), 0);
+ ast_mutex_lock(&chanspy_ds.lock);
+ ast_mutex_unlock(&chanspy_ds.lock);
ast_mutex_destroy(&chanspy_ds.lock);
return res;
Modified: team/moy/mfcr2-1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/apps/app_dial.c?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/apps/app_dial.c (original)
+++ team/moy/mfcr2-1.4/apps/app_dial.c Sun Oct 26 20:27:57 2008
@@ -298,9 +298,10 @@
AST_APP_OPTION('W', OPT_CALLER_MONITOR),
});
-#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag(flags, OPT_CALLEE_HANGUP | \
+#define CAN_EARLY_BRIDGE(flags,chan,peer) (!ast_test_flag(flags, OPT_CALLEE_HANGUP | \
OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
- OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
+ OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK) && \
+ !chan->audiohooks && !peer->audiohooks)
/* We define a custom "local user" structure because we
use it not only for keeping track of what is in use but
@@ -341,6 +342,7 @@
ast_cdr_failed(chan->cdr); \
numcongestion++; \
break; \
+ case AST_CAUSE_NO_ROUTE_DESTINATION: \
case AST_CAUSE_UNREGISTERED: \
if (chan->cdr) \
ast_cdr_failed(chan->cdr); \
@@ -576,6 +578,10 @@
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "%s answered %s\n", c->name, in->name);
peer = c;
+ if (peer->cdr) {
+ peer->cdr->answer = ast_tvnow();
+ peer->cdr->disposition = AST_CDR_ANSWERED;
+ }
ast_copy_flags(peerflags, o,
OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
@@ -585,7 +591,7 @@
ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
ast_copy_string(c->exten, "", sizeof(c->exten));
/* Setup RTP early bridge if appropriate */
- if (CAN_EARLY_BRIDGE(peerflags))
+ if (CAN_EARLY_BRIDGE(peerflags, in, peer))
ast_rtp_early_bridge(in, peer);
}
/* If call has been answered, then the eventual hangup is likely to be normal hangup */
@@ -614,7 +620,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
/* Setup early media if appropriate */
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_rtp_early_bridge(in, c);
if (!(*sentringing) && !ast_test_flag(outgoing, OPT_MUSICBACK)) {
ast_indicate(in, AST_CONTROL_RINGING);
@@ -625,7 +631,7 @@
if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", c->name, in->name);
/* Setup early media if appropriate */
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROGRESS);
@@ -643,7 +649,7 @@
case AST_CONTROL_PROCEEDING:
if (option_verbose > 2)
ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROCEEDING);
@@ -789,6 +795,35 @@
return 0;
}
+static void set_dial_features(struct ast_flags *opts, struct ast_dial_features *features)
+{
+ struct ast_flags perm_opts = {.flags = 0};
+
+ ast_copy_flags(&perm_opts, opts,
+ OPT_CALLER_TRANSFER | OPT_CALLER_PARK | OPT_CALLER_MONITOR | OPT_CALLER_HANGUP |
+ OPT_CALLEE_TRANSFER | OPT_CALLEE_PARK | OPT_CALLEE_MONITOR | OPT_CALLEE_HANGUP);
+
+ memset(features->options, 0, sizeof(features->options));
+
+ ast_app_options2str(dial_exec_options, &perm_opts, features->options, sizeof(features->options));
+ if (ast_test_flag(&perm_opts, OPT_CALLEE_TRANSFER))
+ ast_set_flag(&(features->features_callee), AST_FEATURE_REDIRECT);
+ if (ast_test_flag(&perm_opts, OPT_CALLER_TRANSFER))
+ ast_set_flag(&(features->features_caller), AST_FEATURE_REDIRECT);
+ if (ast_test_flag(&perm_opts, OPT_CALLEE_HANGUP))
+ ast_set_flag(&(features->features_callee), AST_FEATURE_DISCONNECT);
+ if (ast_test_flag(&perm_opts, OPT_CALLER_HANGUP))
+ ast_set_flag(&(features->features_caller), AST_FEATURE_DISCONNECT);
+ if (ast_test_flag(&perm_opts, OPT_CALLEE_MONITOR))
+ ast_set_flag(&(features->features_callee), AST_FEATURE_AUTOMON);
+ if (ast_test_flag(&perm_opts, OPT_CALLER_MONITOR))
+ ast_set_flag(&(features->features_caller), AST_FEATURE_AUTOMON);
+ if (ast_test_flag(&perm_opts, OPT_CALLEE_PARK))
+ ast_set_flag(&(features->features_callee), AST_FEATURE_PARKCALL);
+ if (ast_test_flag(&perm_opts, OPT_CALLER_PARK))
+ ast_set_flag(&(features->features_caller), AST_FEATURE_PARKCALL);
+}
+
static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec)
{
int res = -1;
@@ -831,6 +866,9 @@
struct ast_flags opts = { 0, };
char *opt_args[OPT_ARG_ARRAY_SIZE];
struct ast_datastore *datastore = NULL;
+ struct ast_datastore *ds_caller_features = NULL;
+ struct ast_datastore *ds_callee_features = NULL;
+ struct ast_dial_features *caller_features;
int fulldial = 0, num_dialed = 0;
if (ast_strlen_zero(data)) {
@@ -1086,6 +1124,26 @@
}
ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP | OPT_IGNORE_FORWARDING);
+
+ /* Create datastore for channel dial features for caller */
+ if (!(ds_caller_features = ast_channel_datastore_alloc(&dial_features_info, NULL))) {
+ ast_log(LOG_WARNING, "Unable to create channel datastore for dial features. Aborting!\n");
+ goto out;
+ }
+
+ if (!(caller_features = ast_calloc(1, sizeof(*caller_features)))) {
+ ast_log(LOG_WARNING, "Unable to allocate memory for feature flags. Aborting!\n");
+ goto out;
+ }
+
+ ast_channel_lock(chan);
+ caller_features->is_caller = 1;
+ set_dial_features(&opts, caller_features);
+ ds_caller_features->inheritance = -1;
+ ds_caller_features->data = caller_features;
+ ast_channel_datastore_add(chan, ds_caller_features);
+ ast_channel_unlock(chan);
+
/* loop through the list of dial destinations */
rest = args.peers;
while ((cur = strsep(&rest, "&")) ) {
@@ -1096,6 +1154,7 @@
char *tech = strsep(&number, "/");
/* find if we already dialed this interface */
struct ast_dialed_interface *di;
+ struct ast_dial_features *callee_features;
AST_LIST_HEAD(, ast_dialed_interface) *dialed_interfaces;
num_dialed++;
if (!number) {
@@ -1244,6 +1303,27 @@
ast_copy_string(tmp->chan->exten, chan->macroexten, sizeof(tmp->chan->exten));
else
ast_copy_string(tmp->chan->exten, chan->exten, sizeof(tmp->chan->exten));
+
+ /* Save callee features */
+ if (!(ds_callee_features = ast_channel_datastore_alloc(&dial_features_info, NULL))) {
+ ast_log(LOG_WARNING, "Unable to create channel datastore for dial features. Aborting!\n");
+ ast_free(tmp);
+ goto out;
+ }
+
+ if (!(callee_features = ast_calloc(1, sizeof(*callee_features)))) {
+ ast_log(LOG_WARNING, "Unable to allocate memory for feature flags. Aborting!\n");
+ ast_free(tmp);
+ goto out;
+ }
+
+ ast_channel_lock(tmp->chan);
+ callee_features->is_caller = 0;
+ set_dial_features(&opts, callee_features);
+ ds_callee_features->inheritance = -1;
+ ds_callee_features->data = callee_features;
+ ast_channel_datastore_add(tmp->chan, ds_callee_features);
+ ast_channel_unlock(tmp->chan);
/* Place the call, but don't wait on the answer */
res = ast_call(tmp->chan, numsubst, 0);
@@ -1685,8 +1765,9 @@
res = -1;
goto done;
}
- if (opermode && (!strncmp(chan->name,"Zap",3)) &&
- (!strncmp(peer->name,"Zap",3)))
+ if (opermode &&
+ (((!strncasecmp(chan->name,"Zap",3)) && (!strncasecmp(peer->name,"Zap",3))) ||
+ ((!strncasecmp(chan->name,"Dahdi",5)) && (!strncasecmp(peer->name,"Dahdi",5)))))
{
struct oprmode oprmode;
Modified: team/moy/mfcr2-1.4/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/apps/app_disa.c?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/apps/app_disa.c (original)
+++ team/moy/mfcr2-1.4/apps/app_disa.c Sun Oct 26 20:27:57 2008
@@ -98,7 +98,7 @@
static void play_dialtone(struct ast_channel *chan, char *mailbox)
{
- const struct tone_zone_sound *ts = NULL;
+ const struct ind_tone_zone_sound *ts = NULL;
if(ast_app_has_voicemail(mailbox, NULL))
ts = ast_get_indication_tone(chan->zone, "dialrecall");
else
Modified: team/moy/mfcr2-1.4/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.4/apps/app_flash.c?view=diff&rev=152129&r1=152128&r2=152129
==============================================================================
--- team/moy/mfcr2-1.4/apps/app_flash.c (original)
+++ team/moy/mfcr2-1.4/apps/app_flash.c Sun Oct 26 20:27:57 2008
@@ -18,7 +18,7 @@
/*! \file
*
- * \brief App to flash a zap trunk
+ * \brief App to flash a DAHDI trunk
*
* \author Mark Spencer <markster at digium.com>
*
@@ -26,7 +26,7 @@
*/
/*** MODULEINFO
- <depend>zaptel</depend>
+ <depend>dahdi</depend>
***/
#include "asterisk.h"
@@ -38,7 +38,6 @@
#include <string.h>
#include <errno.h>
#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -50,24 +49,33 @@
#include "asterisk/image.h"
#include "asterisk/options.h"
+#include "asterisk/dahdi_compat.h"
+
static char *app = "Flash";
-static char *synopsis = "Flashes a Zap Trunk";
+static char *dahdi_synopsis = "Flashes a DAHDI trunk";
-static char *descrip =
-"Performs a flash on a zap trunk. This can be used\n"
+static char *dahdi_descrip =
+"Performs a flash on a DAHDI trunk. This can be used\n"
"to access features provided on an incoming analogue circuit\n"
"such as conference and call waiting. Use with SendDTMF() to\n"
"perform external transfers\n";
+static char *zap_synopsis = "Flashes a Zap trunk";
+
+static char *zap_descrip =
+"Performs a flash on a Zap trunk. This can be used\n"
+"to access features provided on an incoming analogue circuit\n"
+"such as conference and call waiting. Use with SendDTMF() to\n"
+"perform external transfers\n";
static inline int zt_wait_event(int fd)
{
/* Avoid the silly zt_waitevent which ignores a bunch of events */
int i,j=0;
- i = ZT_IOMUX_SIGEVENT;
[... 33604 lines stripped ...]
More information about the svn-commits
mailing list