[svn-commits] oej: branch oej/pinelonely-meetme-single-user-hangup-1.8 r405032 - in /team/o...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Jan 7 10:14:31 CST 2014


Author: oej
Date: Tue Jan  7 10:13:53 2014
New Revision: 405032

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405032
Log:
We want to get back in the game.

Modified:
    team/oej/pinelonely-meetme-single-user-hangup-1.8/   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/BSDmakefile   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/CHANGES
    team/oej/pinelonely-meetme-single-user-hangup-1.8/Makefile
    team/oej/pinelonely-meetme-single-user-hangup-1.8/README-SERIOUSLY.bestpractices.txt
    team/oej/pinelonely-meetme-single-user-hangup-1.8/UPGRADE.txt
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/chan_ooh323.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/memheap.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooCapability.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooSocket.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooTimer.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooq931.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/perutil.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323cDriver.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/res_config_mysql.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_chanspy.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_meetme.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_mixmonitor.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_page.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_playback.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_queue.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_saycounted.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_sms.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_stack.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_voicemail.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/autoconf/ast_ext_lib.m4
    team/oej/pinelonely-meetme-single-user-hangup-1.8/build_tools/prep_tarball
    team/oej/pinelonely-meetme-single-user-hangup-1.8/build_tools/sha1sum-sh   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/cdr/cdr_adaptive_odbc.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/cel/cel_custom.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/cel/cel_pgsql.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_alsa.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_dahdi.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_iax2.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_mgcp.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_misdn.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_multicast_rtp.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_sip.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/chan_unistim.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/iax2-parser.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/misdn/isdn_msg_parser.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sig_analog.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sig_pri.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sig_pri.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sig_ss7.c   (contents, props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sig_ss7.h   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sip/dialplan_functions.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sip/include/sip.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/channels/sip/reqresp_parser.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/codecs/Makefile
    team/oej/pinelonely-meetme-single-user-hangup-1.8/codecs/ilbc/doCPLC.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/asterisk.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/chan_dahdi.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/extconfig.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/h323.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/iax.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/indications.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/queues.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/res_curl.conf.sample   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/sip.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configs/sla.conf.sample
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configure
    team/oej/pinelonely-meetme-single-user-hangup-1.8/configure.ac
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/mysql/musiconhold.sql   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/mysql/queue_log.sql   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/mysql/sippeers.sql
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/mysql/voicemail_data.sql   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/mysql/voicemail_messages.sql   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/contrib/realtime/postgresql/realtime.sql
    team/oej/pinelonely-meetme-single-user-hangup-1.8/default.exports
    team/oej/pinelonely-meetme-single-user-hangup-1.8/doc/Makefile   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_channel.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_config.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_curl.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_db.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_dialgroup.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_env.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_global.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_lock.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_math.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_realtime.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_shell.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/funcs/func_strings.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/astmm.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/autoconfig.h.in
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/bridging_features.h   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/bridging_technology.h   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/frame.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/lock.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/logger.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/pbx.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/rtp_engine.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/select.h   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/test.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/include/asterisk/utils.h
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/abstract_jb.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/app.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/asterisk.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/asterisk.exports.in
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/astfd.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/astmm.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/astobj2.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/cdr.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/cel.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/channel.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/cli.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/config.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/data.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/devicestate.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/editline/readline.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/editline/term.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/event.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/features.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/heap.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/http.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/indications.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/jitterbuf.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/loader.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/lock.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/logger.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/manager.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/pbx.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/rtp_engine.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/say.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/slinfactory.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/tcptls.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/test.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/threadstorage.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/translate.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/utils.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/main/xmldoc.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/makeopts.in
    team/oej/pinelonely-meetme-single-user-hangup-1.8/pbx/pbx_dundi.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/pbx/pbx_loopback.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/pbx/pbx_spool.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_agi.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_calendar.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_config_curl.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_config_ldap.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_fax_spandsp.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_jabber.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_musiconhold.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_mutestream.c   (contents, props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_rtp_asterisk.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_rtp_multicast.c   (contents, props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_security_log.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_srtp.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_timing_kqueue.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/res/res_timing_pthread.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/sounds/Makefile
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_dlinklists.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_expr.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_func_file.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_hashtab_thrash.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_linkedlists.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_locale.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_poll.c   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/tests/test_substitution.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/   (props changed)
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/Makefile
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/ael_main.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/check_expr.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/clicompat.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/conf2ael.c
    team/oej/pinelonely-meetme-single-user-hangup-1.8/utils/extconf.c

Propchange: team/oej/pinelonely-meetme-single-user-hangup-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/pinelonely-meetme-single-user-hangup-1.8/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan  7 10:13:53 2014
@@ -24,3 +24,4 @@
 makeopts.embed_rules
 aclocal.m4
 update.log
+doxygen.log

Propchange: team/oej/pinelonely-meetme-single-user-hangup-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan  7 10:13:53 2014
@@ -1,1 +1,1 @@
-/branches/1.8:1-382186
+/branches/1.8:1-405018

Propchange: team/oej/pinelonely-meetme-single-user-hangup-1.8/BSDmakefile
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Jan  7 10:13:53 2014
@@ -1,1 +1,1 @@
-'Date Author Id Revision Yoyo'
+Author Date Id Revision

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/CHANGES?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/CHANGES (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/CHANGES Tue Jan  7 10:13:53 2014
@@ -7,6 +7,15 @@
 === and the other UPGRADE files for older releases.
 ===
 ======================================================================
+
+------------------------------------------------------------------------------
+--- Functionality changes since Asterisk 1.8.19.1 ----------------------------
+------------------------------------------------------------------------------
+
+App_queue
+---------
+ * App_queue will now play periodic announcements for the caller that
+   holds the first position in the queue while waiting for answer.
 
 ------------------------------------------------------------------------------
 --- Functionality changes since Asterisk 1.8.12.0 ----------------------------

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/Makefile?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/Makefile (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/Makefile Tue Jan  7 10:13:53 2014
@@ -170,7 +170,7 @@
   _ASTCFLAGS+=-Wall
 endif
 
-_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_NESTED_FUNCTIONS) $(DEBUG)
 
 ifeq ($(AST_DEVMODE),yes)
   _ASTCFLAGS+=-Werror
@@ -289,7 +289,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
+_all: .lastclean makeopts $(SUBDIRS) doc/core-en_US.xml
 
 makeopts: configure
 	@echo "****"
@@ -350,30 +350,30 @@
 $(OTHER_SUBDIRS):
 	+ at _ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
-defaults.h: makeopts
+defaults.h: makeopts .lastclean
 	@build_tools/make_defaults_h > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-main/version.c: FORCE
+main/version.c: FORCE .lastclean
 	@build_tools/make_version_c > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/version.h: FORCE
+include/asterisk/version.h: FORCE .lastclean
 	@build_tools/make_version_h > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/buildopts.h: menuselect.makeopts
+include/asterisk/buildopts.h: menuselect.makeopts .lastclean
 	@build_tools/make_buildopts_h > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
-include/asterisk/build.h:
-	@build_tools/make_build_h > $@.tmp
-	@cmp -s $@.tmp $@ || mv $@.tmp $@
-	@rm -f $@.tmp
+# build.h must depend on .lastclean, or parallel make may wipe it out after it's
+# been created.
+include/asterisk/build.h: .lastclean
+	@build_tools/make_build_h > $@
 
 $(SUBDIRS_CLEAN):
 	+@$(SUBMAKE) -C $(@:-clean=) clean
@@ -420,7 +420,7 @@
 	done
 	$(MAKE) -C sounds install
 
-doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+doc/core-en_US.xml: .lastclean $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
 	@printf "Building Documentation For: "
 	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
 	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
@@ -761,8 +761,8 @@
 # .cleancount is the global clean count, and .lastclean is the 
 # last clean count we had
 
-cleantest:
-	@cmp -s .cleancount .lastclean || $(MAKE) clean
+.lastclean: .cleancount
+	@$(MAKE) clean
 
 $(SUBDIRS_UNINSTALL):
 	+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
@@ -875,7 +875,6 @@
 .PHONY: distclean
 .PHONY: all
 .PHONY: prereqs
-.PHONY: cleantest
 .PHONY: uninstall
 .PHONY: _uninstall
 .PHONY: uninstall-all

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/README-SERIOUSLY.bestpractices.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/README-SERIOUSLY.bestpractices.txt?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/README-SERIOUSLY.bestpractices.txt (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/README-SERIOUSLY.bestpractices.txt Tue Jan  7 10:13:53 2014
@@ -25,6 +25,9 @@
 
 * Manager Class Authorizations:
         Recognizing potential issues with certain classes of authorization
+
+* Avoid Privilege Escalations:
+        Disable the ability to execute functions that may escalate privileges
 
 ----------------
 Additional Links
@@ -344,3 +347,24 @@
 not running Asterisk as root, can prevent serious problems from arising when
 allowing external connections to originate calls into Asterisk.
 
+===========================
+Avoid Privilege Escalations
+===========================
+
+External control protocols, such as Manager, often have the ability to get and
+set channel variables; which allows the execution of dialplan functions.
+
+Dialplan functions within Asterisk are incredibly powerful, which is wonderful
+for building applications using Asterisk. But during the read or write
+execution, certain diaplan functions do much more. For example, reading the
+SHELL() function can execute arbitrary commands on the system Asterisk is
+running on. Writing to the FILE() function can change any file that Asterisk has
+write access to.
+
+When these functions are executed from an external protocol, that execution
+could result in a privilege escalation. Asterisk can inhibit the execution of
+these functions, if live_dangerously in the [options] section of asterisk.conf
+is set to no.
+
+For backwards compatibility, live_dangerously defaults to yes, and must be
+explicitly set to no to enable this privilege escalation protection.

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/UPGRADE.txt?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/UPGRADE.txt (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/UPGRADE.txt Tue Jan  7 10:13:53 2014
@@ -17,6 +17,44 @@
 === UPGRADE-1.6.txt -- Upgrade info for 1.4 to 1.6
 ===
 ===========================================================
+from 1.8.23.0 to 1.8.24.0:
+* res_agi will now properly indicate if there was an error in streaming an
+  audio file.  The result code will be -1 and the result returned from the
+  the function will be RESULT_FAILURE instead of the prior behavior of always
+  returning RESULT_SUCCESS even if there was an error. 
+
+* The option "register_retry_403" has been added to chan_sip to work around
+  servers that are known to erroneously send 403 in response to valid
+  REGISTER requests and allows Asterisk to continue attepmting to connect.
+
+* Certain dialplan functions have been marked as 'dangerous', and may only be
+  executed from the dialplan. Execution from extenal sources (AMI's GetVar and
+  SetVar actions; etc.) may be inhibited by setting live_dangerously in the
+  [options] section of asterisk.conf to no. SHELL(), channel locking, and direct
+  file read/write functions are marked as dangerous. DB_DELETE() and
+  REALTIME_DESTROY() are marked as dangerous for reads, but can now safely
+  accept writes (which ignore the provided value).
+
+from 1.8.22.0 to 1.8.23.0:
+* The default settings for chan_sip are now overriden properly by the general
+  settings in sip.conf.  Please look over your settings upon upgrading.
+
+* It is now possible to play the Queue prompts to the first user waiting in a call queue.
+  Note that this may impact the ability for agents to talk with users, as a prompt may
+  still be playing when an agent connects to the user. This ability is disabled by
+  default but can be enabled on an individual queue using the 'announce-to-first-user'
+  option.
+
+from 1.8.21.0 to 1.8.22.0:
+* Added the 'n' option to MeetMe to prevent application of the DENOISE function
+  to a channel joining a conference. Some channel drivers that vary the number
+  of audio samples in a voice frame will experience significant quality problems
+  if a denoiser is attached to the channel; this option gives them the ability
+  to remove the denoiser without having to unload func_speex.
+
+* The Registry AMI event for SIP registrations will now always include the
+  Username field. A previous bug fix missed an instance where it was not
+  included; that has been corrected in this release.
 
 from 1.8.20.0 to 1.8.20.1:
 * Asterisk would previously not output certain error messages when a remote

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/chan_ooh323.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/chan_ooh323.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/chan_ooh323.c Tue Jan  7 10:13:53 2014
@@ -286,6 +286,8 @@
 int onCallCleared(ooCallData *call);
 void onModeChanged(ooCallData *call, int t38mode);
 
+extern OOH323EndPoint gH323ep;
+
 static char gLogFile[256] = DEFAULT_LOGFILE;
 static int  gPort = 1720;
 static char gIP[20];
@@ -629,6 +631,7 @@
 		ooh323_destroy(p);
 		ast_mutex_unlock(&iflock);
 		ast_log(LOG_ERROR, "Destination format is not supported\n");
+		*cause = AST_CAUSE_INVALID_NUMBER_FORMAT;
 		return NULL;
 	}
 
@@ -671,6 +674,10 @@
 			ast_mutex_unlock(&p->lock);
 			ooh323_destroy(p);
 			ast_mutex_unlock(&iflock);
+			return NULL;
+		} else if (gH323ep.gkClient && gH323ep.gkClient->state != GkClientRegistered) {
+			ast_log(LOG_ERROR, "Gatekeeper client is configured but not registered\n");
+			*cause = AST_CAUSE_NORMAL_TEMPORARY_FAILURE;
 			return NULL;
 		}
 		p->g729onlyA = g729onlyA;

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/memheap.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/memheap.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/memheap.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/memheap.c Tue Jan  7 10:13:53 2014
@@ -726,7 +726,7 @@
    OSMemLink** ppMemLink;
    OSMemBlk* pMemBlk;
    OSMemElemDescr* pElem;
-   OSMemLink* pMemLink, *pPrevMemLink = 0;
+   OSMemLink* pMemLink;
    void *newMem_p;
    unsigned nbytes, nunits;
 
@@ -758,7 +758,6 @@
          *(int*)(((char*)pMemLink) + sizeof (OSMemLink)) = nbytes_;
          return pMemLink->pMemBlk;
       }
-      pPrevMemLink = pMemLink;
    }
 
    /* Round number of bytes to nearest 8-byte boundary */

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooCapability.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooCapability.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooCapability.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooCapability.c Tue Jan  7 10:13:53 2014
@@ -1104,14 +1104,12 @@
    (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir)
 {
    H245AudioCapability *pAudio=NULL;
-   OOCapParams *params;
    if(!epCap || !epCap->params)
    {
      OOTRACEERR1("Error:Invalid capability parameters to "
                  "ooCapabilityCreateSimpleCapability.\n");
      return NULL;
    }
-   params =(OOCapParams*)epCap->params;
    pAudio = (H245AudioCapability*)memAlloc(pctxt, 
                                                 sizeof(H245AudioCapability));
    if(!pAudio)
@@ -1228,7 +1226,6 @@
    (ooH323EpCapability *epCap, OOCTXT* pctxt, int dir)
 {
    H245DataApplicationCapability *pT38=NULL;
-   OOCapParams *params;
    H245DataMode_application *pT38app;
    if(!epCap || !epCap->params)
    {
@@ -1236,7 +1233,6 @@
                  "ooCapabilityCreateSimpleCapability.\n");
      return NULL;
    }
-   params =(OOCapParams*)epCap->params;
    pT38 = (H245DataApplicationCapability*)memAlloc(pctxt, 
                                                 sizeof(H245DataApplicationCapability));
    if(!pT38)

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooSocket.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooSocket.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooSocket.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooSocket.c Tue Jan  7 10:13:53 2014
@@ -234,7 +234,7 @@
 int ooSocketCreateUDP (OOSOCKET* psocket) 
 {
    int on;
-   struct linger linger;
+   /*struct linger linger;*/
 
    OOSOCKET sock = socket (AF_INET,
                              SOCK_DGRAM,
@@ -252,9 +252,9 @@
       OOTRACEERR1("Error:Failed to set socket option SO_REUSEADDR\n");
       return ASN_E_INVSOCKET;
    }
-   linger.l_onoff = 1;
+   /*linger.l_onoff = 1;
    linger.l_linger = 0;
-   /*if (setsockopt (sock, SOL_SOCKET, SO_LINGER, 
+   if (setsockopt (sock, SOL_SOCKET, SO_LINGER,
                  (const char* ) &linger, sizeof (linger)) == -1)
       return ASN_E_INVSOCKET;
    */

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooTimer.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooTimer.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooTimer.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooTimer.c Tue Jan  7 10:13:53 2014
@@ -101,7 +101,6 @@
 void ooTimerFireExpired (OOCTXT* pctxt, DList *pList)
 {
    OOTimer* pTimer;
-   int stat;
 
    while (pList->count > 0) {
       pTimer = (OOTimer*) pList->head->data;
@@ -113,7 +112,7 @@
           */
          if (pTimer->reRegister) ooTimerReset (pctxt, pList, pTimer);
 
-         stat = (*pTimer->timeoutCB)(pTimer->cbData);
+         (*pTimer->timeoutCB)(pTimer->cbData);
 
          if (!pTimer->reRegister) {
             ooTimerDelete (pctxt, pList, pTimer);

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooq931.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooq931.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/ooq931.c Tue Jan  7 10:13:53 2014
@@ -2183,7 +2183,7 @@
    ooAliases *pNewAlias=NULL, *alias=NULL;
    struct timespec ts;
    struct timeval tv;
-   int i=0, irand=0, ret = OO_OK;
+   int i=0, irand=0;
    /* Note: We keep same callToken, for new call which is going
       to replace an existing call, thus treating it as a single call.*/
 
@@ -2235,7 +2235,7 @@
    {
      /* No need to check registration status here as it is already checked for
         MakeCall command */
-      ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, fwdedCall, FALSE);
+      ooGkClientSendAdmissionRequest(gH323ep.gkClient, fwdedCall, FALSE);
       fwdedCall->callState = OO_CALL_WAITING_ADMISSION;
       ast_mutex_lock(&fwdedCall->Lock);
 	  tv = ast_tvnow();
@@ -2249,7 +2249,7 @@
    }
    if (fwdedCall->callState < OO_CALL_CLEAR) {
       ast_mutex_lock(&fwdedCall->Lock);
-      ret = ooH323CallAdmitted (fwdedCall);
+      ooH323CallAdmitted (fwdedCall);
       ast_mutex_unlock(&fwdedCall->Lock);
    }
 
@@ -2276,7 +2276,6 @@
 
 int ooH323MakeCall(char *dest, char *callToken, ooCallOptions *opts)
 {
-   OOCTXT *pctxt;
    OOH323CallData *call;
    int ret=OO_OK, i=0, irand=0;
    char tmp[30]="\0";
@@ -2303,7 +2302,6 @@
       return OO_FAILED;
    }
 
-   pctxt = call->pctxt;
    if(opts)
    {
       if(opts->fastStart)

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/perutil.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/perutil.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/perutil.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323c/src/perutil.c Tue Jan  7 10:13:53 2014
@@ -168,7 +168,7 @@
 int checkSizeConstraint(OOCTXT* pctxt, int size)
 {
    Asn1SizeCnst* pSize;
-   ASN1UINT lower, upper;
+   ASN1UINT upper;
    ASN1BOOL extbit;
    int      stat;
 
@@ -186,7 +186,6 @@
 
    pSize = getSizeConstraint (pctxt, extbit);
 
-   lower = (pSize) ? pSize->lower : 0;
    upper = (pSize) ? pSize->upper : ASN1UINT_MAX;
 
    if (upper < (ASN1UINT)size) {

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323cDriver.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323cDriver.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/ooh323cDriver.c Tue Jan  7 10:13:53 2014
@@ -100,8 +100,10 @@
 	pfds[0].fd = mycthread->thePipe[0];
 	pfds[0].events = POLLIN;
 	ooSocketPoll(pfds, 1, SEC_TO_HOLD_THREAD * 1000);
-	if (ooPDRead(pfds, 1, mycthread->thePipe[0]))
+	if (ooPDRead(pfds, 1, mycthread->thePipe[0])) {
 		res = read(mycthread->thePipe[0], &c, 1);
+		(void) res;/* Shut up compiler: Set but not used and unused return value of read. */
+	}
 
  	ast_mutex_lock(&callThreadsLock);
 	ast_mutex_lock(&mycthread->lock);
@@ -182,6 +184,7 @@
 	cur->inUse = TRUE;
 	cur->call = call;
 	res = write(cur->thePipe[1], &c, 1);
+	(void) res;/* Shut up compiler: Set but not used and unused return value of write. */
 	ast_mutex_unlock(&cur->lock);
 
  }

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/res_config_mysql.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/res_config_mysql.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/addons/res_config_mysql.c Tue Jan  7 10:13:53 2014
@@ -937,7 +937,7 @@
 		return NULL;
 	}
 
-	ast_str_set(&sql, 0, "SELECT category, var_name, var_val, cat_metric FROM %s WHERE filename='%s' and commented=0 ORDER BY filename, cat_metric desc, var_metric asc, category, var_name, var_val, id", table, file);
+	ast_str_set(&sql, 0, "SELECT category, var_name, var_val, cat_metric FROM %s WHERE filename='%s' and commented=0 ORDER BY filename, category, cat_metric desc, var_metric asc, var_name, var_val, id", table, file);
 
 	ast_debug(1, "MySQL RealTime: Static SQL: %s\n", ast_str_buffer(sql));
 

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_chanspy.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_chanspy.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_chanspy.c Tue Jan  7 10:13:53 2014
@@ -363,7 +363,7 @@
 	OPTION_NAME              = (1 << 12),   /* Say the name of the person on whom we will spy */
 	OPTION_DTMF_SWITCH_MODES = (1 << 13),   /* Allow numeric DTMF to switch between chanspy modes */
 	OPTION_DTMF_EXIT         = (1 << 14),	/* Set DTMF to exit, added for DAHDIScan integration */
-	OPTION_DTMF_CYCLE        = (1 << 15),	/* Custom DTMF for cycling next avaliable channel, (default is '*') */
+	OPTION_DTMF_CYCLE        = (1 << 15),	/* Custom DTMF for cycling next available channel, (default is '*') */
 	OPTION_DAHDI_SCAN        = (1 << 16),	/* Scan groups in DAHDIScan mode */
 	OPTION_STOP              = (1 << 17),
 	OPTION_EXITONHANGUP      = (1 << 18),   /* Hang up when the spied-on channel hangs up. */

Modified: team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_meetme.c?view=diff&rev=405032&r1=405031&r2=405032
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_meetme.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-1.8/apps/app_meetme.c Tue Jan  7 10:13:53 2014
@@ -136,6 +136,14 @@
 						specify a musiconhold class to use. If one is not provided, it will use the
 						channel's currently set music class, or <literal>default</literal>.</para>
 						<argument name="class" required="true" />
+					</option>
+					<option name="n">
+						<para>Disable the denoiser. By default, if <literal>func_speex</literal> is loaded, Asterisk
+						will apply a denoiser to channels in the MeetMe conference. However, channel
+						drivers that present audio with a varying rate will experience degraded
+						performance with a denoiser attached. This parameter allows a channel joining
+						the conference to choose not to have a denoiser attached without having to
+						unload <literal>func_speex</literal>.</para>
 					</option>
 					<option name="o">
 						<para>Set talker optimization - treats talkers who aren't speaking as
@@ -622,8 +630,10 @@
 #define CONFFLAG_NO_AUDIO_UNTIL_UP  (1ULL << 31)
 /*! If set play an intro announcement at start of conference */
 #define CONFFLAG_INTROMSG           (1ULL << 32)
+/*! If set, don't enable a denoiser for the channel */
+#define CONFFLAG_DONT_DENOISE       (1ULL << 33)
 /*! If there's only one person left in a conference when someone leaves, kill the conference */
-#define CONFFLAG_KILL_LAST_MAN_STANDING ((uint64_t)1 << 33)
+#define CONFFLAG_KILL_LAST_MAN_STANDING ((uint64_t)1 << 34)
 
 enum {
 	OPT_ARG_WAITMARKED = 0,
@@ -652,6 +662,7 @@
 	AST_APP_OPTION('k', CONFFLAG_KILL_LAST_MAN_STANDING ),
 	AST_APP_OPTION_ARG('M', CONFFLAG_MOH, OPT_ARG_MOH_CLASS ),
 	AST_APP_OPTION('m', CONFFLAG_STARTMUTED ),
+	AST_APP_OPTION('n', CONFFLAG_DONT_DENOISE ),
 	AST_APP_OPTION('o', CONFFLAG_OPTIMIZETALKER ),
 	AST_APP_OPTION('P', CONFFLAG_ALWAYSPROMPT ),
 	AST_APP_OPTION_ARG('p', CONFFLAG_KEYEXIT, OPT_ARG_EXITKEYS ),
@@ -828,17 +839,26 @@
 	/*! This option uses the values in the sla_hold_access enum and sets the
 	 * access control type for hold on this station. */
 	unsigned int hold_access:1;
-	/*! Use count for inside sla_station_exec */
-	unsigned int ref_count;
+	/*! Mark used during reload processing */
+	unsigned int mark:1;
 };
 
+/*!
+ * \brief A reference to a station
+ *
+ * This struct looks near useless at first glance.  However, its existence
+ * in the list of stations in sla_trunk means that this station references
+ * that trunk.  We use the mark to keep track of whether it needs to be
+ * removed from the sla_trunk's list of stations during a reload.
+ */
 struct sla_station_ref {
 	AST_LIST_ENTRY(sla_station_ref) entry;
 	struct sla_station *station;
+	/*! Mark used during reload processing */
+	unsigned int mark:1;
 };
 
 struct sla_trunk {
-	AST_RWLIST_ENTRY(sla_trunk) entry;
 	AST_DECLARE_STRING_FIELDS(
 		AST_STRING_FIELD(name);
 		AST_STRING_FIELD(device);
@@ -862,10 +882,16 @@
 	/*! Whether this trunk is currently on hold, meaning that once a station
 	 *  connects to it, the trunk channel needs to have UNHOLD indicated to it. */
 	unsigned int on_hold:1;
-	/*! Use count for inside sla_trunk_exec */
-	unsigned int ref_count;
+	/*! Mark used during reload processing */
+	unsigned int mark:1;
 };
 
+/*!
+ * \brief A station's reference to a trunk
+ *
+ * An sla_station keeps a list of trunk_refs.  This holds metadata about the
+ * stations usage of the trunk.
+ */
 struct sla_trunk_ref {
 	AST_LIST_ENTRY(sla_trunk_ref) entry;
 	struct sla_trunk *trunk;
@@ -879,10 +905,12 @@
 	 *  station.  This takes higher priority than a ring delay set at
 	 *  the station level. */
 	unsigned int ring_delay;
+	/*! Mark used during reload processing */
+	unsigned int mark:1;
 };
 
-static AST_RWLIST_HEAD_STATIC(sla_stations, sla_station);

[... 12412 lines stripped ...]



More information about the svn-commits mailing list