[svn-commits] phsultan: branch phsultan/rtmp-support r294987 - in /team/phsultan/rtmp-suppo...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Nov 14 15:50:10 CST 2010
Author: phsultan
Date: Sun Nov 14 15:49:15 2010
New Revision: 294987
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294987
Log:
resolve conflict, enable automerge
Added:
team/phsultan/rtmp-support/BSDmakefile
- copied unchanged from r294912, trunk/BSDmakefile
team/phsultan/rtmp-support/contrib/realtime/mysql/voicemail_data.sql
- copied unchanged from r294912, trunk/contrib/realtime/mysql/voicemail_data.sql
team/phsultan/rtmp-support/contrib/realtime/mysql/voicemail_messages.sql
- copied unchanged from r294912, trunk/contrib/realtime/mysql/voicemail_messages.sql
team/phsultan/rtmp-support/contrib/scripts/ast_tls_cert
- copied unchanged from r294912, trunk/contrib/scripts/ast_tls_cert
team/phsultan/rtmp-support/doc/README.txt
- copied unchanged from r294912, trunk/doc/README.txt
team/phsultan/rtmp-support/funcs/func_frame_trace.c
- copied unchanged from r294912, trunk/funcs/func_frame_trace.c
team/phsultan/rtmp-support/include/asterisk/framehook.h
- copied unchanged from r294912, trunk/include/asterisk/framehook.h
team/phsultan/rtmp-support/include/asterisk/select.h
- copied unchanged from r294912, trunk/include/asterisk/select.h
team/phsultan/rtmp-support/main/framehook.c
- copied unchanged from r294912, trunk/main/framehook.c
team/phsultan/rtmp-support/static-http/mantest.html
- copied unchanged from r294912, trunk/static-http/mantest.html
team/phsultan/rtmp-support/tests/test_poll.c
- copied unchanged from r294912, trunk/tests/test_poll.c
Removed:
team/phsultan/rtmp-support/doc/CCSS_architecture.pdf
team/phsultan/rtmp-support/doc/CODING-GUIDELINES
team/phsultan/rtmp-support/doc/HOWTO_collect_debug_information.txt
team/phsultan/rtmp-support/doc/India-CID.txt
team/phsultan/rtmp-support/doc/PEERING
team/phsultan/rtmp-support/doc/advice_of_charge.txt
team/phsultan/rtmp-support/doc/asterisk-mib.txt
team/phsultan/rtmp-support/doc/backtrace.txt
team/phsultan/rtmp-support/doc/building_queues.txt
team/phsultan/rtmp-support/doc/callfiles.txt
team/phsultan/rtmp-support/doc/chan_sip-perf-testing.txt
team/phsultan/rtmp-support/doc/cli.txt
team/phsultan/rtmp-support/doc/codec-64bit.txt
team/phsultan/rtmp-support/doc/database_transactions.txt
team/phsultan/rtmp-support/doc/datastores.txt
team/phsultan/rtmp-support/doc/digium-mib.txt
team/phsultan/rtmp-support/doc/distributed_devstate-XMPP.txt
team/phsultan/rtmp-support/doc/distributed_devstate.txt
team/phsultan/rtmp-support/doc/externalivr.txt
team/phsultan/rtmp-support/doc/followme.txt
team/phsultan/rtmp-support/doc/google-soc2009-ideas.txt
team/phsultan/rtmp-support/doc/hoard.txt
team/phsultan/rtmp-support/doc/jabber.txt
team/phsultan/rtmp-support/doc/janitor-projects.txt
team/phsultan/rtmp-support/doc/jingle.txt
team/phsultan/rtmp-support/doc/ldap.txt
team/phsultan/rtmp-support/doc/macroexclusive.txt
team/phsultan/rtmp-support/doc/manager_1_1.txt
team/phsultan/rtmp-support/doc/modules.txt
team/phsultan/rtmp-support/doc/osp.txt
team/phsultan/rtmp-support/doc/queue.txt
team/phsultan/rtmp-support/doc/realtimetext.txt
team/phsultan/rtmp-support/doc/res_config_sqlite.txt
team/phsultan/rtmp-support/doc/rtp-packetization.txt
team/phsultan/rtmp-support/doc/sip-retransmit.txt
team/phsultan/rtmp-support/doc/siptls.txt
team/phsultan/rtmp-support/doc/smdi.txt
team/phsultan/rtmp-support/doc/sms.txt
team/phsultan/rtmp-support/doc/snmp.txt
team/phsultan/rtmp-support/doc/speechrec.txt
team/phsultan/rtmp-support/doc/ss7.txt
team/phsultan/rtmp-support/doc/tex/
team/phsultan/rtmp-support/doc/timing.txt
team/phsultan/rtmp-support/doc/unistim.txt
team/phsultan/rtmp-support/doc/valgrind.txt
team/phsultan/rtmp-support/doc/video.txt
team/phsultan/rtmp-support/doc/video_console.txt
team/phsultan/rtmp-support/doc/voicemail_odbc_postgresql.txt
Modified:
team/phsultan/rtmp-support/ (props changed)
team/phsultan/rtmp-support/CHANGES
team/phsultan/rtmp-support/Makefile
team/phsultan/rtmp-support/UPGRADE-1.8.txt
team/phsultan/rtmp-support/UPGRADE.txt
team/phsultan/rtmp-support/addons/app_mysql.c
team/phsultan/rtmp-support/addons/chan_mobile.c
team/phsultan/rtmp-support/addons/chan_ooh323.c
team/phsultan/rtmp-support/addons/ooh323c/src/ooSocket.h
team/phsultan/rtmp-support/addons/ooh323c/src/oochannels.c
team/phsultan/rtmp-support/addons/ooh323c/src/ooh245.c
team/phsultan/rtmp-support/addons/ooh323c/src/ooh323.c
team/phsultan/rtmp-support/addons/res_config_mysql.c
team/phsultan/rtmp-support/apps/app_adsiprog.c
team/phsultan/rtmp-support/apps/app_chanspy.c
team/phsultan/rtmp-support/apps/app_dial.c
team/phsultan/rtmp-support/apps/app_directed_pickup.c
team/phsultan/rtmp-support/apps/app_followme.c
team/phsultan/rtmp-support/apps/app_getcpeid.c
team/phsultan/rtmp-support/apps/app_macro.c
team/phsultan/rtmp-support/apps/app_meetme.c
team/phsultan/rtmp-support/apps/app_queue.c
team/phsultan/rtmp-support/apps/app_sms.c
team/phsultan/rtmp-support/apps/app_speech_utils.c
team/phsultan/rtmp-support/apps/app_stack.c
team/phsultan/rtmp-support/apps/app_voicemail.c
team/phsultan/rtmp-support/autoconf/ast_ext_lib.m4
team/phsultan/rtmp-support/build_tools/prep_tarball
team/phsultan/rtmp-support/cdr/cdr_pgsql.c
team/phsultan/rtmp-support/channels/chan_agent.c
team/phsultan/rtmp-support/channels/chan_dahdi.c
team/phsultan/rtmp-support/channels/chan_gtalk.c
team/phsultan/rtmp-support/channels/chan_h323.c
team/phsultan/rtmp-support/channels/chan_iax2.c
team/phsultan/rtmp-support/channels/chan_jingle.c
team/phsultan/rtmp-support/channels/chan_local.c
team/phsultan/rtmp-support/channels/chan_mgcp.c
team/phsultan/rtmp-support/channels/chan_misdn.c
team/phsultan/rtmp-support/channels/chan_phone.c
team/phsultan/rtmp-support/channels/chan_sip.c
team/phsultan/rtmp-support/channels/chan_skinny.c
team/phsultan/rtmp-support/channels/chan_usbradio.c
team/phsultan/rtmp-support/channels/console_video.c
team/phsultan/rtmp-support/channels/misdn/ie.c
team/phsultan/rtmp-support/channels/misdn/isdn_msg_parser.c
team/phsultan/rtmp-support/channels/sig_analog.c
team/phsultan/rtmp-support/channels/sig_analog.h
team/phsultan/rtmp-support/channels/sig_pri.c
team/phsultan/rtmp-support/channels/sig_pri.h
team/phsultan/rtmp-support/channels/sip/include/sip.h
team/phsultan/rtmp-support/codecs/codec_dahdi.c
team/phsultan/rtmp-support/codecs/gsm/Makefile
team/phsultan/rtmp-support/configs/calendar.conf.sample
team/phsultan/rtmp-support/configs/cdr_pgsql.conf.sample
team/phsultan/rtmp-support/configs/chan_dahdi.conf.sample
team/phsultan/rtmp-support/configs/features.conf.sample
team/phsultan/rtmp-support/configs/gtalk.conf.sample
team/phsultan/rtmp-support/configs/http.conf.sample
team/phsultan/rtmp-support/configs/jabber.conf.sample
team/phsultan/rtmp-support/configs/manager.conf.sample
team/phsultan/rtmp-support/configs/musiconhold.conf.sample
team/phsultan/rtmp-support/configs/phoneprov.conf.sample
team/phsultan/rtmp-support/configs/queues.conf.sample
team/phsultan/rtmp-support/configs/res_config_mysql.conf.sample
team/phsultan/rtmp-support/configs/res_fax.conf.sample
team/phsultan/rtmp-support/configs/res_ldap.conf.sample
team/phsultan/rtmp-support/configs/sip.conf.sample
team/phsultan/rtmp-support/configure
team/phsultan/rtmp-support/configure.ac
team/phsultan/rtmp-support/contrib/init.d/rc.debian.asterisk
team/phsultan/rtmp-support/contrib/init.d/rc.suse.asterisk
team/phsultan/rtmp-support/contrib/scripts/asterisk.ldif
team/phsultan/rtmp-support/contrib/scripts/get_mp3_source.sh
team/phsultan/rtmp-support/contrib/scripts/install_prereq
team/phsultan/rtmp-support/formats/format_wav.c
team/phsultan/rtmp-support/funcs/func_aes.c
team/phsultan/rtmp-support/funcs/func_channel.c
team/phsultan/rtmp-support/funcs/func_env.c
team/phsultan/rtmp-support/funcs/func_strings.c
team/phsultan/rtmp-support/include/asterisk/acl.h
team/phsultan/rtmp-support/include/asterisk/astobj2.h
team/phsultan/rtmp-support/include/asterisk/autoconfig.h.in
team/phsultan/rtmp-support/include/asterisk/calendar.h
team/phsultan/rtmp-support/include/asterisk/channel.h
team/phsultan/rtmp-support/include/asterisk/cli.h
team/phsultan/rtmp-support/include/asterisk/compat.h
team/phsultan/rtmp-support/include/asterisk/compiler.h
team/phsultan/rtmp-support/include/asterisk/features.h
team/phsultan/rtmp-support/include/asterisk/frame.h
team/phsultan/rtmp-support/include/asterisk/jabber.h
team/phsultan/rtmp-support/include/asterisk/jingle.h
team/phsultan/rtmp-support/include/asterisk/localtime.h
team/phsultan/rtmp-support/include/asterisk/module.h
team/phsultan/rtmp-support/include/asterisk/pbx.h
team/phsultan/rtmp-support/include/asterisk/poll-compat.h
team/phsultan/rtmp-support/include/asterisk/rtp_engine.h
team/phsultan/rtmp-support/include/asterisk/stun.h
team/phsultan/rtmp-support/include/asterisk/timing.h
team/phsultan/rtmp-support/main/acl.c
team/phsultan/rtmp-support/main/app.c
team/phsultan/rtmp-support/main/ast_expr2.c
team/phsultan/rtmp-support/main/ast_expr2.h
team/phsultan/rtmp-support/main/ast_expr2.y
team/phsultan/rtmp-support/main/asterisk.c
team/phsultan/rtmp-support/main/asterisk.exports.in
team/phsultan/rtmp-support/main/cdr.c
team/phsultan/rtmp-support/main/channel.c
team/phsultan/rtmp-support/main/cli.c
team/phsultan/rtmp-support/main/db.c
team/phsultan/rtmp-support/main/devicestate.c
team/phsultan/rtmp-support/main/dnsmgr.c
team/phsultan/rtmp-support/main/features.c
team/phsultan/rtmp-support/main/file.c
team/phsultan/rtmp-support/main/http.c
team/phsultan/rtmp-support/main/indications.c
team/phsultan/rtmp-support/main/loader.c
team/phsultan/rtmp-support/main/logger.c
team/phsultan/rtmp-support/main/manager.c
team/phsultan/rtmp-support/main/netsock2.c
team/phsultan/rtmp-support/main/pbx.c
team/phsultan/rtmp-support/main/poll.c
team/phsultan/rtmp-support/main/rtp_engine.c
team/phsultan/rtmp-support/main/say.c
team/phsultan/rtmp-support/main/stdtime/localtime.c
team/phsultan/rtmp-support/main/strcompat.c
team/phsultan/rtmp-support/main/stun.c
team/phsultan/rtmp-support/main/timing.c
team/phsultan/rtmp-support/makeopts.in
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-ntest10
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test1
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test19
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test2
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test3
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test4
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-test5
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-vtest13
team/phsultan/rtmp-support/pbx/ael/ael-test/ref.ael-vtest17
team/phsultan/rtmp-support/pbx/pbx_config.c
team/phsultan/rtmp-support/pbx/pbx_dundi.c
team/phsultan/rtmp-support/pbx/pbx_loopback.c
team/phsultan/rtmp-support/pbx/pbx_realtime.c
team/phsultan/rtmp-support/pbx/pbx_spool.c
team/phsultan/rtmp-support/res/ael/ael.tab.c
team/phsultan/rtmp-support/res/ael/ael.tab.h
team/phsultan/rtmp-support/res/ael/ael_lex.c
team/phsultan/rtmp-support/res/ael/pval.c
team/phsultan/rtmp-support/res/ais/clm.c
team/phsultan/rtmp-support/res/ais/evt.c
team/phsultan/rtmp-support/res/res_agi.c
team/phsultan/rtmp-support/res/res_ais.c
team/phsultan/rtmp-support/res/res_calendar.c
team/phsultan/rtmp-support/res/res_calendar_caldav.c
team/phsultan/rtmp-support/res/res_calendar_ews.c
team/phsultan/rtmp-support/res/res_calendar_exchange.c
team/phsultan/rtmp-support/res/res_calendar_icalendar.c
team/phsultan/rtmp-support/res/res_config_ldap.c
team/phsultan/rtmp-support/res/res_jabber.c
team/phsultan/rtmp-support/res/res_musiconhold.c
team/phsultan/rtmp-support/res/res_pktccops.c
team/phsultan/rtmp-support/res/res_rtp_asterisk.c
team/phsultan/rtmp-support/res/res_srtp.c
team/phsultan/rtmp-support/res/res_stun_monitor.c
team/phsultan/rtmp-support/res/res_timing_timerfd.c
team/phsultan/rtmp-support/sounds/Makefile
team/phsultan/rtmp-support/sounds/sounds.xml
team/phsultan/rtmp-support/tests/test_event.c
team/phsultan/rtmp-support/tests/test_time.c
team/phsultan/rtmp-support/tests/test_utils.c
Propchange: team/phsultan/rtmp-support/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/phsultan/rtmp-support/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Nov 14 15:49:15 2010
@@ -1,1 +1,1 @@
-/trunk:1-284586
+/trunk:1-294986
Modified: team/phsultan/rtmp-support/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/CHANGES?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/CHANGES (original)
+++ team/phsultan/rtmp-support/CHANGES Sun Nov 14 15:49:15 2010
@@ -15,6 +15,15 @@
Asterisk Manager Interface
--------------------------
* PeerStatus now includes Address and Port.
+
+Asterisk HTTP Server
+--------------------------
+ * The HTTP Server can bind to IPv6 addresses.
+
+CLI Changes
+-----------
+ * New 'gtalk show settings' command showing the current settings loaded from
+ gtalk.conf.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
@@ -83,6 +92,9 @@
available in device configurations as well as in the dial plan.
* Addition of the 'subscribe_network_change' option for turning on and off
res_stun_monitor module support in chan_sip.
+ * Addition of the 'auth_options_requests' option for turning on and off
+ authentication for OPTIONS requests in chan_sip.
+
IAX2 Changes
-----------
@@ -103,6 +115,12 @@
to none.
* PacketCable NCS 1.0 support has been added for Docsis/Eurodocsis Networks.
See configs/res_pktccops.conf for more information.
+
+XMPP Google Talk/Jingle changes
+-------------------------------
+ * Added the externip option to gtalk.conf.
+ * Added the stunaddr option to gtalk.conf which allows for the automatic
+ retrieval of the external ip from a stun server.
Applications
------------
@@ -179,6 +197,7 @@
* Voicemail now runs the externnotify script when pollmailboxes is activated and
notices a change.
* Voicemail now includes rdnis within msgXXXX.txt file.
+ * Added 'D' command to ExternalIVR full details in doc/externalivr.txt
Dialplan Functions
------------------
@@ -192,7 +211,7 @@
setting various connected line and redirecting party information.
* CALLERID and CONNECTEDLINE dialplan functions have been extended to
support ISDN subaddressing.
- * The CHANNEL() function now supports the "name" option.
+ * The CHANNEL() function now supports the "name" and "checkhangup" options.
* For DAHDI channels, the CHANNEL() dialplan function now allows
the dialplan to request changes in the configuration of the active
echo canceller on the channel (if any), for the current call only.
@@ -246,6 +265,7 @@
allows for high resolution times for billsec and duration fields.
* FILE() now supports line-mode and writing.
* Added FIELDNUM(), which returns the 1-based offset of a field in a list.
+ * FRAME_TRACE(), for tracking internal ast_frames on a channel.
Dialplan Variables
------------------
@@ -432,6 +452,7 @@
conform more closely to similar events.
* Added a new eventfilter option per user to allow whitelisting and blacklisting
of events.
+ * Added optional parkinglot variable for park command.
Channel Event Logging
---------------------
@@ -1511,6 +1532,8 @@
* Added cli command 'features reload' to reload call features from features.conf
* Moved into core asterisk binary.
* Changed the default setting for featuredigittimeout to 2000 ms from 500 ms.
+ * Added the ability for custom parking lots to be configured with their own
+ parking extension with the parkext option.
Language Support Changes
------------------------
Modified: team/phsultan/rtmp-support/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/Makefile?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/Makefile (original)
+++ team/phsultan/rtmp-support/Makefile Sun Nov 14 15:49:15 2010
@@ -124,46 +124,6 @@
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3
-# Define standard directories for various platforms
-# These apply if they are not redefined in asterisk.conf
-ifeq ($(OSARCH),SunOS)
- ASTETCDIR=/var/etc/asterisk
- ASTLIBDIR=/opt/asterisk/lib
- ASTVARLIBDIR=/var/opt/asterisk
- ASTDBDIR=$(ASTVARLIBDIR)
- ASTKEYDIR=$(ASTVARLIBDIR)
- ASTSPOOLDIR=/var/spool/asterisk
- ASTLOGDIR=/var/log/asterisk
- ASTHEADERDIR=/opt/asterisk/include
- ASTSBINDIR=/opt/asterisk/sbin
- ASTVARRUNDIR=/var/run/asterisk
- ASTMANDIR=/opt/asterisk/man
-else
- ASTETCDIR=$(sysconfdir)/asterisk
- ASTLIBDIR=$(libdir)/asterisk
- ASTHEADERDIR=$(includedir)/asterisk
- ASTSBINDIR=$(sbindir)
- ASTSPOOLDIR=$(localstatedir)/spool/asterisk
- ASTLOGDIR=$(localstatedir)/log/asterisk
- ASTVARRUNDIR=$(localstatedir)/run/asterisk
- ASTMANDIR=$(mandir)
-ifneq ($(findstring BSD,$(OSARCH)),)
- ASTVARLIBDIR=$(prefix)/share/asterisk
- ASTVARRUNDIR=$(localstatedir)/run/asterisk
- ASTDBDIR=$(localstatedir)/db/asterisk
-else
- ASTVARLIBDIR=$(localstatedir)/lib/asterisk
- ASTDBDIR=$(ASTVARLIBDIR)
-endif
-ifneq ($(findstring darwin,$(OSARCH)),)
- ASTVARRUNDIR=/Library/Application Support/Asterisk/Run
-endif
- ASTKEYDIR=$(ASTVARLIBDIR)
-endif
-ifeq ($(ASTDATADIR),)
- ASTDATADIR:=$(ASTVARLIBDIR)
-endif
-
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
@@ -489,7 +449,7 @@
rm -rf doc/api
rm -f build_tools/menuselect-deps
-datafiles: _all
+datafiles: _all doc/core-en_US.xml
CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
@@ -498,6 +458,7 @@
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
done
+ $(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
if [ -d doc/tex/asterisk ] ; then \
$(INSTALL) -d $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
for n in doc/tex/asterisk/* ; do \
@@ -961,14 +922,6 @@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
-pdf: asterisk.pdf
-asterisk.pdf:
- $(MAKE) -C doc/tex asterisk.pdf
-
-txt: asterisk.txt
-asterisk.txt:
- $(MAKE) -C doc/tex asterisk.txt
-
.PHONY: menuselect
.PHONY: main
.PHONY: sounds
@@ -981,7 +934,6 @@
.PHONY: uninstall
.PHONY: _uninstall
.PHONY: uninstall-all
-.PHONY: pdf
.PHONY: dont-optimize
.PHONY: badshell
.PHONY: installdirs
Modified: team/phsultan/rtmp-support/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/UPGRADE-1.8.txt?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/UPGRADE-1.8.txt (original)
+++ team/phsultan/rtmp-support/UPGRADE-1.8.txt Sun Nov 14 15:49:15 2010
@@ -19,6 +19,13 @@
===========================================================
From 1.6.2 to 1.8:
+
+* A couple of CLI commands in res_ais were changed back to their original form:
+ "ais show clm members" --> "ais clm show members"
+ "ais show evt event channels" --> "ais evt show event channels"
+
+* The default value for 'autofill' and 'shared_lastcall' in queues.conf has
+ been changed to 'yes'.
* The default value for the alwaysauthreject option in sip.conf has been changed
from "no" to "yes".
Modified: team/phsultan/rtmp-support/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/UPGRADE.txt?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/UPGRADE.txt (original)
+++ team/phsultan/rtmp-support/UPGRADE.txt Sun Nov 14 15:49:15 2010
@@ -21,6 +21,15 @@
From 1.8 to 1.10:
+HTTP:
+ - A bindaddr must be specified in order for the HTTP server
+ to run. Previous versions would default to 0.0.0.0 if no
+ bindaddr was specified.
+
+Gtalk:
+ - The default value for 'context' and 'parkinglots' in gtalk.conf has
+ been changed to 'default', previously they were empty.
+
===========================================================
===========================================================
Modified: team/phsultan/rtmp-support/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/app_mysql.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/app_mysql.c (original)
+++ team/phsultan/rtmp-support/addons/app_mysql.c Sun Nov 14 15:49:15 2010
@@ -57,10 +57,10 @@
"Syntax:\n"
" MYSQL(Set timeout <num>)\n"
" Set the connection timeout, in seconds.\n"
-" MYSQL(Connect connid dhhost dbuser dbpass dbname)\n"
+" MYSQL(Connect connid dhhost dbuser dbpass dbname [dbcharset])\n"
" Connects to a database. Arguments contain standard MySQL parameters\n"
-" passed to function mysql_real_connect. Connection identifer returned\n"
-" in ${connid}\n"
+" passed to function mysql_real_connect. Optional parameter dbcharset\n"
+" defaults to 'latin1'. Connection identifer returned in ${connid}\n"
" MYSQL(Query resultid ${connid} query-string)\n"
" Executes standard MySQL query contained in query-string using established\n"
" connection identified by ${connid}. Result of query is stored in ${resultid}.\n"
@@ -80,7 +80,7 @@
/*
EXAMPLES OF USE :
-exten => s,2,MYSQL(Connect connid localhost asterisk mypass credit)
+exten => s,2,MYSQL(Connect connid localhost asterisk mypass credit utf8)
exten => s,3,MYSQL(Query resultid ${connid} SELECT username,credit FROM credit WHERE callerid=${CALLERIDNUM})
exten => s,4,MYSQL(Fetch fetchid ${resultid} datavar1 datavar2)
exten => s,5,GotoIf(${fetchid}?6:8)
@@ -315,6 +315,7 @@
AST_APP_ARG(dbuser);
AST_APP_ARG(dbpass);
AST_APP_ARG(dbname);
+ AST_APP_ARG(dbcharset);
);
MYSQL *mysql;
int timeout;
@@ -322,7 +323,7 @@
AST_NONSTANDARD_APP_ARGS(args, data, ' ');
- if (args.argc != 6) {
+ if (args.argc < 6) {
ast_log(LOG_WARNING, "MYSQL_connect is missing some arguments\n");
return -1;
}
@@ -335,6 +336,14 @@
ctimeout = pbx_builtin_getvar_helper(chan, "MYSQL_TIMEOUT");
if (ctimeout && sscanf(ctimeout, "%30d", &timeout) == 1) {
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&timeout);
+ }
+ if(args.dbcharset && strlen(args.dbcharset) > 2){
+ char set_names[255];
+ char statement[512];
+ snprintf(set_names, sizeof(set_names), "SET NAMES %s", args.dbcharset);
+ mysql_real_escape_string(mysql, statement, set_names, sizeof(set_names));
+ mysql_options(mysql, MYSQL_INIT_COMMAND, set_names);
+ mysql_options(mysql, MYSQL_SET_CHARSET_NAME, args.dbcharset);
}
if (! mysql_real_connect(mysql, args.dbhost, args.dbuser, args.dbpass, args.dbname, 0, NULL,
Modified: team/phsultan/rtmp-support/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/chan_mobile.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/chan_mobile.c (original)
+++ team/phsultan/rtmp-support/addons/chan_mobile.c Sun Nov 14 15:49:15 2010
@@ -2232,7 +2232,7 @@
*/
state = 0;
s = strlen(buf);
- for (i = 0; i < s && s != 6; i++) {
+ for (i = 0; i < s && state != 6; i++) {
switch (state) {
case 0: /* search for start of the number section (,) */
if (buf[i] == ',') {
Modified: team/phsultan/rtmp-support/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/chan_ooh323.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/chan_ooh323.c (original)
+++ team/phsultan/rtmp-support/addons/chan_ooh323.c Sun Nov 14 15:49:15 2010
@@ -188,6 +188,7 @@
struct OOH323Regex *rtpmask; /* rtp ip regexp */
char rtpmaskstr[120];
int rtdrcount, rtdrinterval; /* roundtripdelayreq */
+ int faststart, h245tunneling; /* faststart & h245 tunneling */
struct ooh323_pvt *next; /* Next entity */
} *iflist = NULL;
@@ -214,6 +215,7 @@
struct OOH323Regex *rtpmask;
char rtpmaskstr[120];
int rtdrcount, rtdrinterval;
+ int faststart, h245tunneling;
struct ooh323_user *next;
};
@@ -241,6 +243,7 @@
struct OOH323Regex *rtpmask;
char rtpmaskstr[120];
int rtdrcount,rtdrinterval;
+ int faststart, h245tunneling;
struct ooh323_peer *next;
};
@@ -636,6 +639,8 @@
p->dtmfcodec = peer->dtmfcodec;
p->t38support = peer->t38support;
p->rtptimeout = peer->rtptimeout;
+ p->faststart = peer->faststart;
+ p->h245tunneling = peer->h245tunneling;
if (peer->rtpmask && peer->rtpmaskstr[0]) {
p->rtpmask = peer->rtpmask;
ast_copy_string(p->rtpmaskstr, peer->rtpmaskstr, sizeof(p->rtpmaskstr));
@@ -665,6 +670,8 @@
p->capability = gCapability;
p->rtdrinterval = gRTDRInterval;
p->rtdrcount = gRTDRCount;
+ p->faststart = gFastStart;
+ p->h245tunneling = gTunneling;
memcpy(&p->prefs, &gPrefs, sizeof(struct ast_codec_pref));
p->username = strdup(dest);
@@ -914,10 +921,9 @@
ast_verbose("--- ooh323_call- %s\n", dest);
- if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED))
- {
+ if ((ast->_state != AST_STATE_DOWN) && (ast->_state != AST_STATE_RESERVED)) {
ast_log(LOG_WARNING, "ooh323_call called on %s, neither down nor "
- "reserved\n", ast->name);
+ "reserved\n", ast->name);
return -1;
}
ast_mutex_lock(&p->lock);
@@ -972,6 +978,8 @@
destination[sizeof(destination)-1]='\0';
opts.transfercap = ast->transfercapability;
+ opts.fastStart = p->faststart;
+ opts.tunneling = p->h245tunneling;
for (i=0;i<480 && !isRunning(p->callToken);i++) usleep(12000);
@@ -1758,6 +1766,18 @@
p->dtmfcodec = user->dtmfcodec;
p->t38support = user->t38support;
p->rtptimeout = user->rtptimeout;
+ p->h245tunneling = user->h245tunneling;
+ p->faststart = user->faststart;
+
+ if (p->faststart)
+ OO_SETFLAG(call->flags, OO_M_FASTSTART);
+ else
+ OO_CLRFLAG(call->flags, OO_M_FASTSTART);
+ if (p->h245tunneling)
+ OO_SETFLAG(call->flags, OO_M_TUNNELING);
+ else
+ OO_CLRFLAG(call->flags, OO_M_TUNNELING);
+
if (user->rtpmask && user->rtpmaskstr[0]) {
p->rtpmask = user->rtpmask;
ast_copy_string(p->rtpmaskstr, user->rtpmaskstr,
@@ -2165,6 +2185,8 @@
user->dtmfmode = gDTMFMode;
user->dtmfcodec = gDTMFCodec;
user->t38support = gT38Support;
+ user->faststart = gFastStart;
+ user->h245tunneling = gTunneling;
/* set default context */
ast_copy_string(user->context, gContext, sizeof(user->context));
ast_copy_string(user->accountcode, gAccountcode, sizeof(user->accountcode));
@@ -2182,6 +2204,10 @@
sizeof(user->accountcode)-1);
} else if (!strcasecmp(v->name, "roundtrip")) {
sscanf(v->value, "%d,%d", &user->rtdrcount, &user->rtdrinterval);
+ } else if (!strcasecmp(v->name, "faststart")) {
+ user->faststart = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "h245tunneling")) {
+ user->h245tunneling = ast_true(v->value);
} else if (!strcasecmp(v->name, "rtptimeout")) {
user->rtptimeout = atoi(v->value);
if (user->rtptimeout < 0)
@@ -2270,6 +2296,8 @@
peer->dtmfmode = gDTMFMode;
peer->dtmfcodec = gDTMFCodec;
peer->t38support = gT38Support;
+ peer->faststart = gFastStart;
+ peer->h245tunneling = gTunneling;
peer->port = 1720;
if (0 == friend_type) {
peer->mFriend = 1;
@@ -2316,6 +2344,10 @@
peer->outgoinglimit = 0;
} else if (!strcasecmp(v->name, "accountcode")) {
ast_copy_string(peer->accountcode, v->value, sizeof(peer->accountcode));
+ } else if (!strcasecmp(v->name, "faststart")) {
+ peer->faststart = ast_true(v->value);
+ } else if (!strcasecmp(v->name, "h245tunneling")) {
+ peer->h245tunneling = ast_true(v->value);
} else if (!strcasecmp(v->name, "rtptimeout")) {
peer->rtptimeout = atoi(v->value);
if(peer->rtptimeout < 0)
@@ -2779,6 +2811,8 @@
if (peer) {
sprintf(ip_port, "%s:%d", peer->ip, peer->port);
ast_cli(a->fd, "%-15.15s%s\n", "Name: ", peer->name);
+ ast_cli(a->fd, "%s:%s,%s\n", "FastStart/H.245 Tunneling", peer->faststart?"yes":"no",
+ peer->h245tunneling?"yes":"no");
ast_cli(a->fd, "%-15.15s%s", "Format Prefs: ", "(");
print_codec_to_cli(a->fd, &peer->prefs);
ast_cli(a->fd, ")\n");
@@ -2922,6 +2956,8 @@
if (user) {
ast_cli(a->fd, "%-15.15s%s\n", "Name: ", user->name);
+ ast_cli(a->fd, "%s:%s,%s\n", "FastStart/H.245 Tunneling", user->faststart?"yes":"no",
+ user->h245tunneling?"yes":"no");
ast_cli(a->fd, "%-15.15s%s", "Format Prefs: ", "(");
print_codec_to_cli(a->fd, &user->prefs);
ast_cli(a->fd, ")\n");
Modified: team/phsultan/rtmp-support/addons/ooh323c/src/ooSocket.h
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/ooh323c/src/ooSocket.h?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/ooh323c/src/ooSocket.h (original)
+++ team/phsultan/rtmp-support/addons/ooh323c/src/ooSocket.h Sun Nov 14 15:49:15 2010
@@ -23,6 +23,7 @@
#define _OOSOCKET_H_
#include "asterisk/poll-compat.h"
+#include "asterisk/compiler.h"
#ifdef _WIN32_WCE
#include <winsock.h>
@@ -329,9 +330,9 @@
* returns.
* @return Completion status of operation: 0 (ASN_OK) = success,
* negative return value is error.
- */
+ */
EXTERN int ooSocketSelect(int nfds, fd_set *readfds, fd_set *writefds,
- fd_set *exceptfds, struct timeval * timeout);
+ fd_set *exceptfds, struct timeval * timeout) attribute_deprecated;
EXTERN int ooSocketPoll(struct pollfd *pfds, int nfds, int timeout);
Modified: team/phsultan/rtmp-support/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/ooh323c/src/oochannels.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/ooh323c/src/oochannels.c (original)
+++ team/phsultan/rtmp-support/addons/ooh323c/src/oochannels.c Sun Nov 14 15:49:15 2010
@@ -15,6 +15,7 @@
*****************************************************************************/
#include "asterisk.h"
#include "asterisk/lock.h"
+#include "asterisk/poll-compat.h"
#include "ooports.h"
#include "oochannels.h"
@@ -981,7 +982,7 @@
ASN1OCTET message[MAXMSGLEN], message1[MAXMSGLEN];
int len;
Q931Message *pmsg;
- OOCTXT *pctxt = call->pctxt;
+ OOCTXT *pctxt = call->msgctxt;
struct timeval timeout;
@@ -1115,6 +1116,7 @@
initializePrintHandler(&printHandler, "Received H.2250 Message");
setEventHandler (pctxt, &printHandler);
+ setPERBuffer (pctxt, message, len, TRUE);
ret = ooQ931Decode (call, pmsg, len, message, 1);
if(ret != OO_OK) {
OOTRACEERR3("Error:Failed to decode received H.2250 message. (%s, %s)\n",
@@ -1980,22 +1982,12 @@
OOBOOL ooChannelsIsConnectionOK(OOH323CallData *call, OOSOCKET sock)
{
- struct timeval to;
- fd_set readfds;
- int ret = 0, nfds=0;
-
- to.tv_sec = 0;
- to.tv_usec = 500;
- FD_ZERO(&readfds);
-
- FD_SET(sock, &readfds);
- if(nfds < (int)sock)
- nfds = (int)sock;
-
- nfds++;
-
- ret = ooSocketSelect(nfds, &readfds, NULL, NULL, &to);
-
+ struct timeval to = { .tv_usec = 500 };
+ struct pollfd pfds = { .fd = sock, .events = POLLIN };
+ int ret = 0;
+
+ ret = ast_poll2(&pfds, 1, &to);
+
if(ret == -1)
{
OOTRACEERR3("Error in select ...broken pipe check(%s, %s)\n",
@@ -2003,9 +1995,8 @@
return FALSE;
}
- if(FD_ISSET(sock, &readfds))
- {
- char buf[2];
+ if (pfds.events & POLLIN) {
+ char buf[2];
if(ooSocketRecvPeek(sock, (ASN1OCTET*) buf, 2) == 0)
{
OOTRACEWARN3("Broken pipe detected. (%s, %s)", call->callType,
Modified: team/phsultan/rtmp-support/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/ooh323c/src/ooh245.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/ooh323c/src/ooh245.c (original)
+++ team/phsultan/rtmp-support/addons/ooh323c/src/ooh245.c Sun Nov 14 15:49:15 2010
@@ -957,10 +957,8 @@
/*Since Cap exchange and MasterSlave Procedures are done */
if(gH323ep.h323Callbacks.openLogicalChannels)
gH323ep.h323Callbacks.openLogicalChannels(call);
- else{
- if(!ooGetTransmitLogicalChannel(call))
- ooOpenLogicalChannels(call);
- }
+ if(!ooGetTransmitLogicalChannel(call))
+ ooOpenLogicalChannels(call);
#if 0
if(!call->logicalChans){
if(!gH323ep.h323Callbacks.openLogicalChannels)
@@ -2114,10 +2112,8 @@
{
if(gH323ep.h323Callbacks.openLogicalChannels)
gH323ep.h323Callbacks.openLogicalChannels(call);
- else{
- if(!ooGetTransmitLogicalChannel(call))
- ooOpenLogicalChannels(call);
- }
+ if(!ooGetTransmitLogicalChannel(call))
+ ooOpenLogicalChannels(call);
#if 0
if(!call->logicalChans){
if(!gH323ep.h323Callbacks.openLogicalChannels)
@@ -3141,10 +3137,8 @@
if(gH323ep.h323Callbacks.openLogicalChannels)
gH323ep.h323Callbacks.openLogicalChannels(call);
- else{
- if(!ooGetTransmitLogicalChannel(call))
- ooOpenLogicalChannels(call);
- }
+ if(!ooGetTransmitLogicalChannel(call))
+ ooOpenLogicalChannels(call);
#if 0
if(!call->logicalChans){
if(!gH323ep.h323Callbacks.openLogicalChannels)
Modified: team/phsultan/rtmp-support/addons/ooh323c/src/ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/phsultan/rtmp-support/addons/ooh323c/src/ooh323.c?view=diff&rev=294987&r1=294986&r2=294987
==============================================================================
--- team/phsultan/rtmp-support/addons/ooh323c/src/ooh323.c (original)
+++ team/phsultan/rtmp-support/addons/ooh323c/src/ooh323.c Sun Nov 14 15:49:15 2010
@@ -751,9 +751,18 @@
}
- /* Retrieve the H.245 control channel address from the connect msg */
+ /* Retrieve tunneling info/H.245 control channel address from the connect msg */
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
+ if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ OO_CLRFLAG (call->flags, OO_M_TUNNELING);
+ OOTRACEINFO3("Tunneling is disabled for call due to remote reject tunneling"
+ " (%s, %s)\n", call->callType, call->callToken);
+ }
+ }
if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING) &&
callProceeding->m.h245AddressPresent) {
OOTRACEINFO3("Tunneling and h245address provided."
"Using Tunneling for H.245 messages (%s, %s)\n",
@@ -801,6 +810,7 @@
}
}
}
+
return OO_OK;
}
@@ -970,16 +980,27 @@
}
- /* Retrieve the H.245 control channel address from the connect msg */
+ /* Retrieve tunneling info/H.245 control channel address from the connect msg */
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
+ if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ OO_CLRFLAG (call->flags, OO_M_TUNNELING);
+ OOTRACEINFO3("Tunneling is disabled for call due to remote reject tunneling"
+ " (%s, %s)\n", call->callType, call->callToken);
+ }
+ }
if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
- alerting->m.h245AddressPresent) {
- OOTRACEINFO3("Tunneling and h245address provided."
- "Giving preference to Tunneling (%s, %s)\n",
- call->callType, call->callToken);
- }
- else if(alerting->m.h245AddressPresent)
- {
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ if (alerting->m.h245AddressPresent)
+ OOTRACEINFO3("Tunneling and h245address provided."
+ "Giving preference to Tunneling (%s, %s)\n",
+ call->callType, call->callToken);
+ ret =ooSendTCSandMSD(call);
+ if (ret != OO_OK)
+ return ret;
+
+ } else if(alerting->m.h245AddressPresent) {
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING))
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
@@ -1019,12 +1040,11 @@
return OO_FAILED;
}
}
- } else if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
- ret =ooSendTCSandMSD(call);
+ } else if (!call->pH245Channel && !call->h245listener) {
+ ret = ooSendStartH245Facility(call);
if (ret != OO_OK)
return ret;
}
-
return OO_OK;
}
@@ -1195,15 +1215,26 @@
}
/* Retrieve the H.245 control channel address from the connect msg */
+ /* Retrieve tunneling info/H.245 control channel address from the connect msg */
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ !q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
+ if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ OO_CLRFLAG (call->flags, OO_M_TUNNELING);
+ OOTRACEINFO3("Tunneling is disabled for call due to remote reject tunneling"
+ " (%s, %s)\n", call->callType, call->callToken);
+ }
+ }
if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
- progress->m.h245AddressPresent) {
- OOTRACEINFO3("Tunneling and h245address provided."
- "Giving preference to Tunneling (%s, %s)\n",
- call->callType, call->callToken);
- }
- else if(progress->m.h245AddressPresent)
- {
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ if (progress->m.h245AddressPresent)
+ OOTRACEINFO3("Tunneling and h245address provided."
+ "Giving preference to Tunneling (%s, %s)\n",
[... 29238 lines stripped ...]
More information about the svn-commits
mailing list