[asterisk-commits] oej: branch oej/videocaps r51361 - in
/team/oej/videocaps: ./ apps/ build_too...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jan 22 09:47:40 MST 2007
Author: oej
Date: Mon Jan 22 10:47:37 2007
New Revision: 51361
URL: http://svn.digium.com/view/asterisk?view=rev&rev=51361
Log:
Updating, resolving conflict, resetting automerge
Added:
team/oej/videocaps/build_tools/make_sample_voicemail
- copied unchanged from r51353, trunk/build_tools/make_sample_voicemail
team/oej/videocaps/doc/voicemail_odbc_postgresql.txt
- copied unchanged from r51353, trunk/doc/voicemail_odbc_postgresql.txt
team/oej/videocaps/funcs/func_shell.c
- copied unchanged from r51353, trunk/funcs/func_shell.c
team/oej/videocaps/include/asterisk/zapata.h
- copied unchanged from r51353, trunk/include/asterisk/zapata.h
team/oej/videocaps/main/threadstorage.c
- copied unchanged from r51353, trunk/main/threadstorage.c
Modified:
team/oej/videocaps/ (props changed)
team/oej/videocaps/.cleancount
team/oej/videocaps/BUGS
team/oej/videocaps/CHANGES
team/oej/videocaps/Makefile
team/oej/videocaps/Makefile.rules
team/oej/videocaps/UPGRADE.txt
team/oej/videocaps/acinclude.m4
team/oej/videocaps/apps/app_dial.c
team/oej/videocaps/apps/app_dictate.c
team/oej/videocaps/apps/app_flash.c
team/oej/videocaps/apps/app_meetme.c
team/oej/videocaps/apps/app_page.c
team/oej/videocaps/apps/app_queue.c
team/oej/videocaps/apps/app_rpt.c
team/oej/videocaps/apps/app_senddtmf.c
team/oej/videocaps/apps/app_sms.c
team/oej/videocaps/apps/app_speech_utils.c
team/oej/videocaps/apps/app_voicemail.c
team/oej/videocaps/apps/app_zapbarge.c
team/oej/videocaps/apps/app_zapras.c
team/oej/videocaps/apps/app_zapscan.c
team/oej/videocaps/build_tools/cflags.xml
team/oej/videocaps/build_tools/menuselect-deps.in
team/oej/videocaps/cdr/cdr_manager.c
team/oej/videocaps/channels/chan_agent.c
team/oej/videocaps/channels/chan_alsa.c
team/oej/videocaps/channels/chan_features.c
team/oej/videocaps/channels/chan_gtalk.c
team/oej/videocaps/channels/chan_h323.c
team/oej/videocaps/channels/chan_iax2.c
team/oej/videocaps/channels/chan_jingle.c
team/oej/videocaps/channels/chan_local.c
team/oej/videocaps/channels/chan_mgcp.c
team/oej/videocaps/channels/chan_misdn.c
team/oej/videocaps/channels/chan_oss.c
team/oej/videocaps/channels/chan_phone.c
team/oej/videocaps/channels/chan_sip.c
team/oej/videocaps/channels/chan_skinny.c
team/oej/videocaps/channels/chan_zap.c
team/oej/videocaps/channels/iax2-parser.c
team/oej/videocaps/channels/iax2-parser.h
team/oej/videocaps/channels/iax2.h
team/oej/videocaps/channels/misdn/ie.c
team/oej/videocaps/channels/misdn/isdn_lib.c
team/oej/videocaps/channels/misdn/isdn_lib.h
team/oej/videocaps/channels/misdn/isdn_msg_parser.c
team/oej/videocaps/channels/misdn_config.c
team/oej/videocaps/codecs/Makefile
team/oej/videocaps/codecs/codec_zap.c
team/oej/videocaps/codecs/g722/ (props changed)
team/oej/videocaps/codecs/gsm/Makefile
team/oej/videocaps/configs/features.conf.sample
team/oej/videocaps/configs/func_odbc.conf.sample
team/oej/videocaps/configs/iax.conf.sample
team/oej/videocaps/configs/misdn.conf.sample
team/oej/videocaps/configs/osp.conf.sample
team/oej/videocaps/configs/phone.conf.sample
team/oej/videocaps/configs/say.conf.sample
team/oej/videocaps/configs/sip.conf.sample
team/oej/videocaps/configs/users.conf.sample
team/oej/videocaps/configs/voicemail.conf.sample
team/oej/videocaps/configure
team/oej/videocaps/configure.ac
team/oej/videocaps/contrib/scripts/vmdb.sql
team/oej/videocaps/doc/asterisk-conf.txt
team/oej/videocaps/doc/misdn.txt
team/oej/videocaps/doc/osp.txt
team/oej/videocaps/funcs/func_base64.c
team/oej/videocaps/funcs/func_blacklist.c
team/oej/videocaps/funcs/func_callerid.c
team/oej/videocaps/funcs/func_cdr.c
team/oej/videocaps/funcs/func_channel.c
team/oej/videocaps/funcs/func_curl.c
team/oej/videocaps/funcs/func_cut.c
team/oej/videocaps/funcs/func_db.c
team/oej/videocaps/funcs/func_enum.c
team/oej/videocaps/funcs/func_env.c
team/oej/videocaps/funcs/func_global.c
team/oej/videocaps/funcs/func_groupcount.c
team/oej/videocaps/funcs/func_logic.c
team/oej/videocaps/funcs/func_math.c
team/oej/videocaps/funcs/func_md5.c
team/oej/videocaps/funcs/func_module.c
team/oej/videocaps/funcs/func_odbc.c
team/oej/videocaps/funcs/func_rand.c
team/oej/videocaps/funcs/func_realtime.c
team/oej/videocaps/funcs/func_sha1.c
team/oej/videocaps/funcs/func_strings.c
team/oej/videocaps/funcs/func_timeout.c
team/oej/videocaps/funcs/func_uri.c
team/oej/videocaps/funcs/func_version.c
team/oej/videocaps/funcs/func_vmcount.c
team/oej/videocaps/include/asterisk.h
team/oej/videocaps/include/asterisk/acl.h
team/oej/videocaps/include/asterisk/ael_structs.h
team/oej/videocaps/include/asterisk/astdb.h
team/oej/videocaps/include/asterisk/astmm.h
team/oej/videocaps/include/asterisk/autoconfig.h.in
team/oej/videocaps/include/asterisk/channel.h
team/oej/videocaps/include/asterisk/config.h
team/oej/videocaps/include/asterisk/frame.h
team/oej/videocaps/include/asterisk/indications.h
team/oej/videocaps/include/asterisk/jabber.h
team/oej/videocaps/include/asterisk/lock.h
team/oej/videocaps/include/asterisk/manager.h
team/oej/videocaps/include/asterisk/options.h
team/oej/videocaps/include/asterisk/pbx.h
team/oej/videocaps/include/asterisk/rtp.h
team/oej/videocaps/include/asterisk/smdi.h
team/oej/videocaps/include/asterisk/strings.h
team/oej/videocaps/include/asterisk/threadstorage.h
team/oej/videocaps/include/asterisk/utils.h
team/oej/videocaps/main/Makefile
team/oej/videocaps/main/acl.c
team/oej/videocaps/main/ast_expr2.c
team/oej/videocaps/main/ast_expr2.fl
team/oej/videocaps/main/ast_expr2.y
team/oej/videocaps/main/ast_expr2f.c
team/oej/videocaps/main/asterisk.c
team/oej/videocaps/main/astmm.c
team/oej/videocaps/main/cdr.c
team/oej/videocaps/main/channel.c
team/oej/videocaps/main/cli.c
team/oej/videocaps/main/config.c
team/oej/videocaps/main/db.c
team/oej/videocaps/main/db1-ast/btree/bt_close.c
team/oej/videocaps/main/db1-ast/btree/bt_conv.c
team/oej/videocaps/main/db1-ast/btree/bt_debug.c
team/oej/videocaps/main/db1-ast/btree/bt_delete.c
team/oej/videocaps/main/db1-ast/btree/bt_get.c
team/oej/videocaps/main/db1-ast/btree/bt_open.c
team/oej/videocaps/main/db1-ast/btree/bt_overflow.c
team/oej/videocaps/main/db1-ast/btree/bt_page.c
team/oej/videocaps/main/db1-ast/btree/bt_put.c
team/oej/videocaps/main/db1-ast/btree/bt_search.c
team/oej/videocaps/main/db1-ast/btree/bt_seq.c
team/oej/videocaps/main/db1-ast/btree/bt_split.c
team/oej/videocaps/main/db1-ast/btree/bt_utils.c
team/oej/videocaps/main/db1-ast/db/db.c
team/oej/videocaps/main/db1-ast/hash/hash.c
team/oej/videocaps/main/db1-ast/hash/hash_bigkey.c
team/oej/videocaps/main/db1-ast/hash/hash_buf.c
team/oej/videocaps/main/db1-ast/hash/hash_func.c
team/oej/videocaps/main/db1-ast/hash/hash_log2.c
team/oej/videocaps/main/db1-ast/hash/hash_page.c
team/oej/videocaps/main/db1-ast/hash/hsearch.c
team/oej/videocaps/main/db1-ast/include/ndbm.h
team/oej/videocaps/main/db1-ast/mpool/mpool.c
team/oej/videocaps/main/db1-ast/recno/rec_close.c
team/oej/videocaps/main/db1-ast/recno/rec_delete.c
team/oej/videocaps/main/db1-ast/recno/rec_get.c
team/oej/videocaps/main/db1-ast/recno/rec_open.c
team/oej/videocaps/main/db1-ast/recno/rec_put.c
team/oej/videocaps/main/db1-ast/recno/rec_search.c
team/oej/videocaps/main/db1-ast/recno/rec_seq.c
team/oej/videocaps/main/db1-ast/recno/rec_utils.c
team/oej/videocaps/main/dnsmgr.c
team/oej/videocaps/main/enum.c
team/oej/videocaps/main/file.c
team/oej/videocaps/main/frame.c
team/oej/videocaps/main/http.c
team/oej/videocaps/main/indications.c
team/oej/videocaps/main/logger.c
team/oej/videocaps/main/manager.c
team/oej/videocaps/main/pbx.c
team/oej/videocaps/main/rtp.c
team/oej/videocaps/main/stdtime/localtime.c
team/oej/videocaps/main/term.c
team/oej/videocaps/main/udptl.c
team/oej/videocaps/main/utils.c
team/oej/videocaps/makeopts.in
team/oej/videocaps/pbx/ael/ael.flex
team/oej/videocaps/pbx/ael/ael.tab.c
team/oej/videocaps/pbx/ael/ael.tab.h
team/oej/videocaps/pbx/ael/ael_lex.c
team/oej/videocaps/pbx/pbx_ael.c
team/oej/videocaps/pbx/pbx_config.c
team/oej/videocaps/pbx/pbx_dundi.c
team/oej/videocaps/res/res_config_odbc.c
team/oej/videocaps/res/res_features.c
team/oej/videocaps/res/res_jabber.c
team/oej/videocaps/res/res_monitor.c
team/oej/videocaps/res/res_musiconhold.c
team/oej/videocaps/res/res_realtime.c
team/oej/videocaps/res/res_snmp.c
team/oej/videocaps/sounds/Makefile
team/oej/videocaps/utils/ael_main.c
team/oej/videocaps/utils/astman.c
Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 22 10:47:37 2007
@@ -1,1 +1,1 @@
-/trunk:1-48972
+/trunk:1-51358
Modified: team/oej/videocaps/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/.cleancount?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/.cleancount (original)
+++ team/oej/videocaps/.cleancount Mon Jan 22 10:47:37 2007
@@ -1,1 +1,1 @@
-27
+28
Modified: team/oej/videocaps/BUGS
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/BUGS?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/BUGS (original)
+++ team/oej/videocaps/BUGS Mon Jan 22 10:47:37 2007
@@ -10,7 +10,7 @@
learn how you can contribute by acting as a bug marshall
please see:
- http://www.digium.com/index.php?menu=bugguidelines
+ http://www.asterisk.org/developers/bug-guidelines
If you would like to submit a feature request, please
resist the temptation to post it to the bug tracker.
Modified: team/oej/videocaps/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/CHANGES?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/CHANGES (original)
+++ team/oej/videocaps/CHANGES Mon Jan 22 10:47:37 2007
@@ -6,11 +6,6 @@
prompts within the Voicemail application by changing them in voicemail.conf
* enable https support for builtin web server.
See configs/http.conf.sample for details.
- * add a new option, match_auth_username, to sip.conf,
- to improve the matching of incoming requests.
- If set, and the incoming request carries authentication info,
- the username to match in the users list is taken from there
- rather than from the From: field.
* Argument support for Gosub application
* MailboxExists converted to dialplan function
* Ability to set process limits without restarting Asterisk
@@ -65,3 +60,19 @@
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
* Added the URI redirect option for the built-in HTTP server
+ * Added the trunkmaxsize configuration option to chan_iax2.
+ * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+ * Added the parkedcalltransfers option to features.conf
+ * Added 's' option to Page application.
+
+SIP changes
+-----------
+ * The default SIP useragent= identifier now includes the Asterisk version
+ * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
+ If set, and the incoming request carries authentication info,
+ the username to match in the users list is taken from the Digest header
+ rather than from the From: field. This feature is considered experimental.
+ * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
+ since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+ * The "localmask" setting was removed in version 1.2 and the reminder about it
+ being removed is now also removed.
Modified: team/oej/videocaps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/Makefile (original)
+++ team/oej/videocaps/Makefile Mon Jan 22 10:47:37 2007
@@ -59,6 +59,10 @@
export STRIP
export DOWNLOAD
export OSARCH
+export CURSES_DIR
+export NCURSES_DIR
+export TERMCAP_DIR
+export TINFO_DIR
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -73,7 +77,7 @@
# Create OPTIONS variable
OPTIONS=
-ASTTOPDIR:=$(shell pwd)
+ASTTOPDIR:=$(CURDIR)
# Overwite config files on "make samples"
OVERWRITE=y
@@ -223,7 +227,7 @@
ASTERISKVERSION:=$(shell build_tools/make_version .)
ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+ ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
RPMVERSION=unknown
@@ -312,10 +316,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AST_LIBS="$(AST_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+ @ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" AUDIO_LIBS="$(AUDIO_LIBS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -534,27 +538,20 @@
echo "astrundir => $(ASTVARRUNDIR)" ; \
echo "astlogdir => $(ASTLOGDIR)" ; \
echo "" ; \
+ echo ";[options]" ; \
+ echo ";internal_timing = yes" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
echo ";astctlpermissions = 0660" ; \
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
echo ";astctl = asterisk.ctl" ; \
- echo ";[options]" ; \
- echo ";internal_timing = yes" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
fi
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
- done
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
- cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
- done
+ build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@@ -679,7 +676,7 @@
- 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
- @env -i && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ @CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
@echo "Generating input for menuselect ..."
Modified: team/oej/videocaps/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/Makefile.rules?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/Makefile.rules (original)
+++ team/oej/videocaps/Makefile.rules Mon Jan 22 10:47:37 2007
@@ -39,17 +39,25 @@
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
ifeq ($(AST_DEVMODE),yes)
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
else
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(ASTCFLAGS)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+endif
+
+%.o: %.s
+ $(ECHO_PREFIX) echo " [AS] $< -> $@"
+ifeq ($(AST_DEVMODE),yes)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+else
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
endif
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
ifeq ($(AST_DEVMODE),yes)
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
else
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(ASTCFLAGS)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
endif
%.c: %.y
@@ -62,12 +70,12 @@
%.so: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
-%.soo: %.oo
+%.so: %.oo
$(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $(SOLINK) $^ $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLDFLAGS) $^ $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
Modified: team/oej/videocaps/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/UPGRADE.txt?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/UPGRADE.txt (original)
+++ team/oej/videocaps/UPGRADE.txt Mon Jan 22 10:47:37 2007
@@ -17,3 +17,17 @@
not include it, but really, you should make sure that all execution
paths within your macros end in "return;".
+Core:
+
+* The 'languageprefix' option in asterisk.conf is now deprecated, and
+ the default sound file layout for non-English sounds is the 'new
+ style' layout introduced in Asterisk 1.4 (and used by the automatic
+ sound file installer in the Makefile).
+
+Applications:
+
+* The voicemail configuration values 'maxmessage' and 'minmessage' have
+ been changed to 'maxsecs' and 'minsecs' to clarify their purpose and
+ to make them more distinguishable from 'maxmsgs', which sets folder
+ size. The old variables will continue to work in this version, albeit
+ with a deprecation warning.
Modified: team/oej/videocaps/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/acinclude.m4?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/acinclude.m4 (original)
+++ team/oej/videocaps/acinclude.m4 Mon Jan 22 10:47:37 2007
@@ -34,6 +34,7 @@
PBX_$1=0
AC_SUBST([$1_LIB])
AC_SUBST([$1_INCLUDE])
+AC_SUBST([$1_DIR])
AC_SUBST([PBX_$1])
])
@@ -123,12 +124,15 @@
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] )
+ 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] )
+ AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
fi
fi
if test "x${$1_HEADER_FOUND}" = "x0" ; then
@@ -704,3 +708,245 @@
rm -f conftest.sed
])# AST_PROG_SED
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl @summary figure out how to build C programs using POSIX threads
+dnl
+dnl This macro figures out how to build C programs using POSIX threads.
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl C compiler flags that are needed. (The user can also force certain
+dnl compiler flags/libs to be tested by setting these environment
+dnl variables.)
+dnl
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl multi-threaded programs (defaults to the value of CC otherwise).
+dnl (This is necessary on AIX to use the special cc_r compiler alias.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these
+dnl flags, but also link it with them as well. e.g. you should link
+dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use
+dnl these variables in your default LIBS, CFLAGS, and CC:
+dnl
+dnl LIBS="$PTHREAD_LIBS $LIBS"
+dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl CC="$PTHREAD_CC"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl default action will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or
+dnl if you have any other suggestions or comments. This macro was based
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+dnl We are also grateful for the helpful feedback of numerous users.
+dnl
+dnl @category InstalledPackages
+dnl @author Steven G. Johnson <stevenj at alum.mit.edu>
+dnl @version 2006-05-29
+dnl @license GPLWithACException
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+ ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ pthread-config)
+ AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+ if test x"$acx_pthread_config" = xno; then continue; fi
+ PTHREAD_CFLAGS="`pthread-config --cflags`"
+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [acx_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ attr_name=unknown
+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+ [attr_name=$attr; break])
+ done
+ AC_MSG_RESULT($attr_name)
+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+ [Define to necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ # More AIX lossage: must compile with xlc_r or cc_r
+ if test x"$GCC" != xyes; then
+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+ else
+ PTHREAD_CC=$CC
+ fi
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ acx_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
Modified: team/oej/videocaps/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_dial.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_dial.c (original)
+++ team/oej/videocaps/apps/app_dial.c Mon Jan 22 10:47:37 2007
@@ -1528,7 +1528,7 @@
peer->priority++;
ast_pbx_start(peer);
hanguptree(outgoing, NULL);
- res = 0;
+ res = 1;
goto done;
}
@@ -1703,8 +1703,12 @@
static int dial_exec(struct ast_channel *chan, void *data)
{
struct ast_flags peerflags;
+ int res = 0;
+
memset(&peerflags, 0, sizeof(peerflags));
- return dial_exec_full(chan, data, &peerflags);
+ res = dial_exec_full(chan, data, &peerflags);
+
+ return (res >= 0 ? 0 : -1);
}
static int retrydial_exec(struct ast_channel *chan, void *data)
@@ -1764,7 +1768,10 @@
if (ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_stop(chan);
- if ((res = dial_exec_full(chan, dialdata, &peerflags)) == 0) {
+ res = dial_exec_full(chan, dialdata, &peerflags);
+ if (res == 1) {
+ break;
+ } else if (res == 0) {
if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) {
if (!(res = ast_streamfile(chan, announce, chan->language)))
res = ast_waitstream(chan, AST_DIGIT_ANY);
@@ -1797,10 +1804,13 @@
}
if (loops == 0)
res = 0;
-
+ else if (res == 1)
+ res = 0;
+
if (ast_test_flag(chan, AST_FLAG_MOH))
ast_moh_stop(chan);
-done:
+
+ done:
ast_module_user_remove(u);
return res;
}
Modified: team/oej/videocaps/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_dictate.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_dictate.c (original)
+++ team/oej/videocaps/apps/app_dictate.c Mon Jan 22 10:47:37 2007
@@ -267,7 +267,8 @@
if (lastop != DFLAG_PLAY) {
lastop = DFLAG_PLAY;
ast_closestream(fs);
- fs = ast_openstream(chan, path, chan->language);
+ if (!(fs = ast_openstream(chan, path, chan->language)))
+ break;
ast_seekstream(fs, samples, SEEK_SET);
chan->stream = NULL;
}
Modified: team/oej/videocaps/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_flash.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_flash.c (original)
+++ team/oej/videocaps/apps/app_flash.c Mon Jan 22 10:47:37 2007
@@ -37,8 +37,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+#include "asterisk/zapata.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
Modified: team/oej/videocaps/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_meetme.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_meetme.c (original)
+++ team/oej/videocaps/apps/app_meetme.c Mon Jan 22 10:47:37 2007
@@ -38,8 +38,8 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
-#include <sys/ioctl.h>
-#include <zaptel/zaptel.h>
+
+#include "asterisk/zapata.h"
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -161,7 +161,7 @@
enum {
OPT_ARG_WAITMARKED = 0,
OPT_ARG_ARRAY_SIZE = 1,
-} meetme_option_args;
+};
AST_APP_OPTIONS(meetme_opts, {
AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
@@ -297,7 +297,6 @@
"other participants in the conference, all member stations are invited into\n"
"the bridge.\n";
-#define CONFIG_FILE_NAME "meetme.conf"
#define CONFIG_FILE_NAME_SLA "sla.conf"
/*! \brief The MeetMe Conference object */
@@ -379,9 +378,6 @@
ASTOBJ_CONTAINER_COMPONENTS(struct ast_sla);
} slas;
-static int audio_buffers; /*!< The number of audio buffers to be allocated on pseudo channels
- when in a conference
- */
/*! The number of audio buffers to be allocated on pseudo channels
* when in a conference */
static int audio_buffers;
@@ -1933,7 +1929,7 @@
user->user_no,
S_OR(user->chan->cid.cid_num, "<unknown>"),
S_OR(user->chan->cid.cid_name, "<unknown>"),
- (now - user->jointime));
+ (long)(now - user->jointime));
}
conf->users--;
@@ -2773,12 +2769,12 @@
return 0;
}
-static int meetmemute(struct mansession *s, struct message *m, int mute)
+static int meetmemute(struct mansession *s, const struct message *m, int mute)
{
struct ast_conference *conf;
struct ast_conf_user *user;
- char *confid = astman_get_header(m, "Meetme");
- char *userid = astman_get_header(m, "Usernum");
+ const char *confid = astman_get_header(m, "Meetme");
+ char *userid = ast_strdupa(astman_get_header(m, "Usernum"));
int userno;
if (ast_strlen_zero(confid)) {
@@ -2834,12 +2830,12 @@
return 0;
}
-static int action_meetmemute(struct mansession *s, struct message *m)
+static int action_meetmemute(struct mansession *s, const struct message *m)
{
return meetmemute(s, m, 1);
}
-static int action_meetmeunmute(struct mansession *s, struct message *m)
+static int action_meetmeunmute(struct mansession *s, const struct message *m)
{
return meetmemute(s, m, 0);
}
Modified: team/oej/videocaps/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_page.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_page.c (original)
+++ team/oej/videocaps/apps/app_page.c Mon Jan 22 10:47:37 2007
@@ -48,6 +48,7 @@
#include "asterisk/app.h"
#include "asterisk/chanvars.h"
#include "asterisk/utils.h"
+#include "asterisk/devicestate.h"
static const char *app_page= "Page";
@@ -61,19 +62,21 @@
"destroyed when the original caller leaves. Valid options are:\n"
" d - full duplex audio\n"
" q - quiet, do not play beep to caller\n"
-" r - record the page into a file (see 'r' for app_meetme)\n";
-
+" r - record the page into a file (see 'r' for app_meetme)\n"
+" s - only dial channel if devicestate says it is not in use\n";
enum {
PAGE_DUPLEX = (1 << 0),
PAGE_QUIET = (1 << 1),
PAGE_RECORD = (1 << 2),
+ PAGE_SKIP = (1 << 3),
} page_opt_flags;
AST_APP_OPTIONS(page_opts, {
AST_APP_OPTION('d', PAGE_DUPLEX),
AST_APP_OPTION('q', PAGE_QUIET),
AST_APP_OPTION('r', PAGE_RECORD),
+ AST_APP_OPTION('s', PAGE_SKIP),
});
struct calloutdata {
@@ -187,16 +190,25 @@
(ast_test_flag(&flags, PAGE_RECORD) ? "r" : "") );
while ((tech = strsep(&tmp, "&"))) {
+ int state = 0;
+
/* don't call the originating device */
if (!strcasecmp(tech, originator))
continue;
- if ((resource = strchr(tech, '/'))) {
- *resource++ = '\0';
- launch_page(chan, meetmeopts, tech, resource);
- } else {
+ if (!(resource = strchr(tech, '/'))) {
ast_log(LOG_WARNING, "Incomplete destination '%s' supplied.\n", tech);
+ continue;
}
+
+ /* Ensure device is not in use if skip option is enabled */
+ if (ast_test_flag(&flags, PAGE_SKIP) && (state = ast_device_state(tech)) != AST_DEVICE_NOT_INUSE) {
+ ast_log(LOG_WARNING, "Destination '%s' has device state '%s'.\n", tech, devstate2str(state));
+ continue;
+ }
+
+ *resource++ = '\0';
+ launch_page(chan, meetmeopts, tech, resource);
}
if (!ast_test_flag(&flags, PAGE_QUIET)) {
Modified: team/oej/videocaps/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/videocaps/apps/app_queue.c?view=diff&rev=51361&r1=51360&r2=51361
==============================================================================
--- team/oej/videocaps/apps/app_queue.c (original)
+++ team/oej/videocaps/apps/app_queue.c Mon Jan 22 10:47:37 2007
@@ -408,7 +408,7 @@
static AST_LIST_HEAD_STATIC(queues, call_queue);
-static int set_member_paused(char *queuename, char *interface, int paused);
+static int set_member_paused(const char *queuename, const char *interface, int paused);
static void set_queue_result(struct ast_channel *chan, enum queue_result res)
{
@@ -635,7 +635,7 @@
return 0;
}
-static struct member *create_queue_member(char *interface, const char *membername, int penalty, int paused)
[... 21503 lines stripped ...]
More information about the asterisk-commits
mailing list