[asterisk-commits] russell: branch group/sip_session_timers r93251 - in /team/group/sip_session_...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Dec 17 12:06:38 CST 2007 

Author: russell
Date: Mon Dec 17 12:06:36 2007
New Revision: 93251

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93251
Log:
resolve, reset

Added:
    team/group/sip_session_timers/channels/console_video.c
      - copied unchanged from r93224, trunk/channels/console_video.c
Removed:
    team/group/sip_session_timers/build_tools/prep_moduledeps
Modified:
    team/group/sip_session_timers/   (props changed)
    team/group/sip_session_timers/CHANGES
    team/group/sip_session_timers/Makefile
    team/group/sip_session_timers/Makefile.moddir_rules
    team/group/sip_session_timers/UPGRADE.txt
    team/group/sip_session_timers/apps/   (props changed)
    team/group/sip_session_timers/apps/Makefile
    team/group/sip_session_timers/build_tools/embed_modules.xml
    team/group/sip_session_timers/build_tools/make_version
    team/group/sip_session_timers/build_tools/menuselect-deps.in
    team/group/sip_session_timers/build_tools/prep_tarball
    team/group/sip_session_timers/cdr/   (props changed)
    team/group/sip_session_timers/cdr/Makefile
    team/group/sip_session_timers/channels/   (props changed)
    team/group/sip_session_timers/channels/Makefile
    team/group/sip_session_timers/channels/chan_h323.c
    team/group/sip_session_timers/channels/chan_iax2.c
    team/group/sip_session_timers/channels/chan_mgcp.c
    team/group/sip_session_timers/channels/chan_oss.c
    team/group/sip_session_timers/channels/chan_sip.c
    team/group/sip_session_timers/channels/chan_skinny.c
    team/group/sip_session_timers/channels/chan_unistim.c
    team/group/sip_session_timers/channels/iax2-provision.c
    team/group/sip_session_timers/codecs/   (props changed)
    team/group/sip_session_timers/codecs/Makefile
    team/group/sip_session_timers/configs/dundi.conf.sample
    team/group/sip_session_timers/configs/h323.conf.sample
    team/group/sip_session_timers/configs/iax.conf.sample
    team/group/sip_session_timers/configs/iaxprov.conf.sample
    team/group/sip_session_timers/configs/mgcp.conf.sample
    team/group/sip_session_timers/configs/oss.conf.sample
    team/group/sip_session_timers/configs/sip.conf.sample
    team/group/sip_session_timers/configs/skinny.conf.sample
    team/group/sip_session_timers/configs/unistim.conf.sample
    team/group/sip_session_timers/configure
    team/group/sip_session_timers/configure.ac
    team/group/sip_session_timers/doc/tex/qos.tex
    team/group/sip_session_timers/formats/   (props changed)
    team/group/sip_session_timers/formats/Makefile
    team/group/sip_session_timers/funcs/   (props changed)
    team/group/sip_session_timers/funcs/Makefile
    team/group/sip_session_timers/include/asterisk/autoconfig.h.in
    team/group/sip_session_timers/include/asterisk/file.h
    team/group/sip_session_timers/include/asterisk/netsock.h
    team/group/sip_session_timers/include/asterisk/rtp.h
    team/group/sip_session_timers/main/asterisk.c
    team/group/sip_session_timers/main/manager.c
    team/group/sip_session_timers/main/netsock.c
    team/group/sip_session_timers/main/rtp.c
    team/group/sip_session_timers/main/udptl.c
    team/group/sip_session_timers/makeopts.in
    team/group/sip_session_timers/pbx/   (props changed)
    team/group/sip_session_timers/pbx/Makefile
    team/group/sip_session_timers/pbx/pbx_dundi.c
    team/group/sip_session_timers/res/   (props changed)
    team/group/sip_session_timers/res/Makefile
    team/group/sip_session_timers/utils/   (props changed)

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/sip_session_timers/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec 17 12:06:36 2007
@@ -1,1 +1,1 @@
-/trunk:1-93123
+/trunk:1-93247

Modified: team/group/sip_session_timers/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/CHANGES?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/CHANGES (original)
+++ team/group/sip_session_timers/CHANGES Mon Dec 17 12:06:36 2007
@@ -11,7 +11,7 @@
   * Added the URI redirect option for the built-in HTTP server
   * The output of CallerID in Manager events is now more consistent.
      CallerIDNum is used for number and CallerIDName for name.
-  * enable https support for builtin web server.
+  * Enable https support for builtin web server.
      See configs/http.conf.sample for details.
   * Added a new action, GetConfigJSON, which can return the contents of an
      Asterisk configuration file in JSON format.  This is intended to help
@@ -27,6 +27,11 @@
   * Added 'DBDel' and 'DBDelTree' manager commands.
   * cdr_manager now reports events via the "cdr" level, separating it from
      the very verbose "call" level.
+  * Manager users are now stored in memory. If you change the manager account
+    list (delete or add accounts) you need to reload manager.
+  * Added Masquerade manager event for when a masquerade happens between
+     two channels.
+  * Added "manager reload" command for the CLI
 
 Dialplan functions
 ------------------
@@ -101,6 +106,9 @@
   * A new option called "callcounter" (global/peer/user level) enables call counters needed
     for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
     used to enable this functionality).
+  * New settings for timer T1 and timer B on a global level or per device. This makes it 
+    possible to force timeout faster on non-responsive SIP servers. These settings are
+    considered advanced, so don't use them unless you have a problem.
 
 IAX2 changes
 ------------
@@ -109,10 +117,23 @@
   * Added support for OSP.  The token is set and retrieved through the CHANNEL()
      dialplan function.
 
+XMPP Google Talk/Jingle changes
+-------------------------------
+  * Added the bindaddr option to gtalk.conf.
+
 Skinny changes
 -------------
   * Added skinny show device, skinny show line, and skinny show settings CLI commands.
   * Proper codec support in chan_skinny.
+  * Added settings for IP and Ethernet QoS requests
+
+MGCP changes
+------------
+  * Added separate settings for media QoS in mgcp.conf
+
+OSS Channel changes
+-------------------
+  * Added experimental support for video under X windows
 
 DUNDi changes
 -------------
@@ -325,7 +346,6 @@
 
 Miscellaneous 
 -------------
-  * Added the bindaddr option to gtalk.conf.
   * Ability to use libcap to set high ToS bits when non-root
      on Linux. If configure is unable to find libcap then you
      can use --with-cap to specify the path.
@@ -337,8 +357,6 @@
      command to be run after rotation.  This is primarily useful with
      rotatestrategry=rotate, to allow a limit on the number of logfiles kept
      and to ensure that the oldest log file gets deleted.
-  * Added Masquerade manager event for when a masquerade happens between
-     two channels.
   * Added maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.

Modified: team/group/sip_session_timers/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/Makefile?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/Makefile (original)
+++ team/group/sip_session_timers/Makefile Mon Dec 17 12:06:36 2007
@@ -79,6 +79,7 @@
 export INSTALL
 export STRIP
 export DOWNLOAD
+export AWK
 export GREP
 export ID
 
@@ -250,10 +251,10 @@
   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif
 
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
 
 ifneq ($(wildcard .version),)
-  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%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
@@ -279,6 +280,7 @@
 MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
 MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
 MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
@@ -295,6 +297,15 @@
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
 
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE=$(MAKE) --quiet
+else
+SUBMAKE=$(MAKE) --quiet --no-print-directory
+endif
+
 # This is used when generating the doxygen documentation
 ifneq ($(DOT),:)
   HAVEDOT=yes
@@ -311,9 +322,6 @@
 	mK=" make"
 endif
 
-# comment to print directories during submakes
-PRINT_DIR?= --no-print-directory
-
 all: _all
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, and +"  
@@ -335,13 +343,17 @@
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
-	@echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+	@echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LDFLAGS):
-	@echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+	@echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LIBS):
-	@echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+	@echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+	@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
 
 makeopts.embed_rules: menuselect.makeopts
 	@echo "Generating embedded module rules ..."
@@ -378,30 +390,22 @@
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then : ; else \
-		mv $@.tmp $@ ; \
-	fi
+	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
 include/asterisk/version.h:
 	@build_tools/make_version_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then : ; else \
-		mv $@.tmp $@ ; \
-	fi
+	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
 include/asterisk/buildopts.h: menuselect.makeopts
 	@build_tools/make_buildopts_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then : ; else \
-		mv $@.tmp $@ ; \
-	fi
+	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
 include/asterisk/build.h:
 	@build_tools/make_build_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then : ; else \
-		mv $@.tmp $@ ; \
-	fi
+	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
 
 $(SUBDIRS_CLEAN):
@@ -790,10 +794,18 @@
 
 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 configure
 	@echo "Generating input for menuselect ..."
-	@build_tools/prep_moduledeps > $@
+	@echo "<?xml version=\"1.0\"?>" > $@
+	@echo >> $@
+	@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+	@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+	@cat build_tools/cflags.xml >> $@
+	@cat build_tools/embed_modules.xml >> $@
+	@cat sounds/sounds.xml >> $@
+	@echo "</menu>" >> $@
 
 pdf: asterisk.pdf
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: team/group/sip_session_timers/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/Makefile.moddir_rules?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/Makefile.moddir_rules (original)
+++ team/group/sip_session_timers/Makefile.moddir_rules Mon Dec 17 12:06:36 2007
@@ -41,33 +41,19 @@
 # Use MODULE_EXCLUDE to specify additional modules to exclude.
 
 ifneq ($(MODULE_PREFIX),)
-    # Compute the lowercase and uppercase directory name. The former
-    # is used as a key in MENUSELECT_EMBED, the latter is part of
-    # the name of the MENUSELECT_* variable containing the exclude list
-    # generated by menuselect.
-    A:=$(notdir $(CURDIR))
-    B:=$(shell echo $A | tr "[a-z]" "[A-Z]")
-    # MENUSELECT_$(L) contains the list of modules excluded by menuselect.
-    # MODULE_EXCLUDE contains the locally generated exclude list
-    L:=$(MENUSELECT_$(B)) $(MODULE_EXCLUDE)
-    # construct the list of C and CC modules from the content of the directory
-    C_MODS:=
-    CC_MODS:=
-    C_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.c,%,$(wildcard $(pre)*.c))))
-    CC_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.cc,%,$(wildcard $(pre)*.cc))))
+    ALL_C_MODS:=$(patsubst %.c,%,$(wildcard $(MODULE_PREFIX)_*.c))
+    ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard $(MODULE_PREFIX)_*.cc))
+
+    C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+    CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
 
     # and store in the list of embedded or loadable modules
-    ifneq ($(findstring $(A),$(MENUSELECT_EMBED)),)
+    ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
 	EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
     else
 	LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
     endif
 endif
-# debugging
-# x:=$(shell echo 'in $(B)' >&2)
-# x:=$(shell echo 'filtered out $(L)' >&2)
-# x:=$(shell echo 'C_MODS= $(C_MODS)' >&2)
-# x:=$(shell sleep 2)
 
 # Both C++ and C++ sources need their module name in AST_MODULE
 # We also pass whatever _INCLUDE list is generated by menuselect
@@ -92,7 +78,7 @@
 
 modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 
-.PHONY: clean uninstall _all
+.PHONY: clean uninstall _all moduleinfo makeopts
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
@@ -137,6 +123,40 @@
 
 uninstall::
 
+dist-clean::
+	rm -f .*.moduleinfo .moduleinfo
+	rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+	@cat $^ >> $@
+	@echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+	@cat $<
+
+.%.makeopts: %.c
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@cat $^ > $@
+
+makeopts: .makeopts
+	@cat $<
+
 ifneq ($(wildcard .*.d),)
    include .*.d
 endif

Modified: team/group/sip_session_timers/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/UPGRADE.txt?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/UPGRADE.txt (original)
+++ team/group/sip_session_timers/UPGRADE.txt Mon Dec 17 12:06:36 2007
@@ -132,6 +132,9 @@
 * chan_local.c: the comma delimiter inside the channel name has been changed to a
   semicolon, in order to make the Local channel driver compatible with the comma
   delimiter change in applications.
+* H323: The "tos" setting has changed name to "tos_audio" and "cos" to "cos_audio"
+  to be compatible with settings in sip.conf. The "tos" and "cos" configuration
+  is deprecated and will stop working in the next release of Asterisk.
 
 Configuration:
 

Propchange: team/group/sip_session_timers/apps/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 12:06:36 2007
@@ -1,8 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
 *.i
+*.makeopts
+*.moduleinfo
 *.s
-*.d
-*.a
 *.so
 modules.link
-*.eo
-*.eoo

Modified: team/group/sip_session_timers/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/apps/Makefile?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/apps/Makefile (original)
+++ team/group/sip_session_timers/apps/Makefile Mon Dec 17 12:06:36 2007
@@ -11,10 +11,10 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
 
-#interesting files in this directory start with app_
-MODULE_PREFIX=app_
+MODULE_PREFIX=app
+MENUSELECT_CATEGORY=APPS
+MENUSELECT_DESCRIPTION=Applications
 
-# create extra MENUSELECT_DEPENDS entries.
 MENUSELECT_OPTS_app_directory:=$(MENUSELECT_OPTS_app_voicemail)
 ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_OPTS_app_voicemail)),)
   MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE)

Modified: team/group/sip_session_timers/build_tools/embed_modules.xml
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/build_tools/embed_modules.xml?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/build_tools/embed_modules.xml (original)
+++ team/group/sip_session_timers/build_tools/embed_modules.xml Mon Dec 17 12:06:36 2007
@@ -1,26 +1,26 @@
 	<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
-		<member name="apps" displayname="Applications" remove_on_change="apps/*.o">
+		<member name="APPS" displayname="Applications" remove_on_change="apps/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="cdr" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
+		<member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="channels" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
+		<member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="codecs" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
+		<member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="formats" displayname="File Formats" remove_on_change="formats/*.o">
+		<member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="funcs" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
+		<member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="pbx" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
+		<member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="res" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
+		<member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
 			<depend>gnu_ld</depend>
 		</member>
 	</category>

Modified: team/group/sip_session_timers/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/build_tools/make_version?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/build_tools/make_version (original)
+++ team/group/sip_session_timers/build_tools/make_version Mon Dec 17 12:06:36 2007
@@ -3,7 +3,7 @@
 if [ -f ${1}/.version ]; then
 	cat ${1}/.version
 elif [ -d .svn ]; then
-    PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
+    PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
     BRANCH=0
     TEAM=0
     TAG=0

Modified: team/group/sip_session_timers/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/build_tools/menuselect-deps.in?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/build_tools/menuselect-deps.in (original)
+++ team/group/sip_session_timers/build_tools/menuselect-deps.in Mon Dec 17 12:06:36 2007
@@ -42,3 +42,4 @@
 MISDN=@PBX_MISDN@
 SUPPSERV=@PBX_SUPPSERV@
 GNU_LD=@GNU_LD@
+WINARCH=@WINARCH@

Modified: team/group/sip_session_timers/build_tools/prep_tarball
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/build_tools/prep_tarball?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/build_tools/prep_tarball (original)
+++ team/group/sip_session_timers/build_tools/prep_tarball Mon Dec 17 12:06:36 2007
@@ -5,7 +5,8 @@
 #
 # It will be executed from the top-level directory of the project.
 
-make -C sounds all MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget
+make -C sounds MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-FREEPLAY-WAV WGET=wget DOWNLOAD=wget all
+make AWK=awk GREP=grep menuselect-tree
 
 VERSION=`cat .version`
 sed -i -e "s/ASTERISKVERSION/${VERSION}/" doc/tex/asterisk.tex

Propchange: team/group/sip_session_timers/cdr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 12:06:36 2007
@@ -1,8 +1,10 @@
+*.a
+*.d
+*.eo
+*.eoo
 *.i
+*.makeopts
+*.moduleinfo
 *.s
-*.d
-*.a
 *.so
 modules.link
-*.eo
-*.eoo

Modified: team/group/sip_session_timers/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/cdr/Makefile?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/cdr/Makefile (original)
+++ team/group/sip_session_timers/cdr/Makefile Mon Dec 17 12:06:36 2007
@@ -11,7 +11,9 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
 
-MODULE_PREFIX=cdr_
+MODULE_PREFIX=cdr
+MENUSELECT_CATEGORY=CDR
+MENUSELECT_DESCRIPTION=Call Detail Recording
 
 all: _all
 

Propchange: team/group/sip_session_timers/channels/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 17 12:06:36 2007
@@ -1,10 +1,12 @@
+*.a
+*.d
+*.eo
+*.eoo
 *.i
+*.makeopts
+*.moduleinfo
+*.oo
 *.s
-*.d
-*.a
 *.so
-*.oo
 gentone
 modules.link
-*.eo
-*.eoo

Modified: team/group/sip_session_timers/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/Makefile?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/Makefile (original)
+++ team/group/sip_session_timers/channels/Makefile Mon Dec 17 12:06:36 2007
@@ -11,7 +11,9 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
 
-MODULE_PREFIX=chan_
+MODULE_PREFIX=chan
+MENUSELECT_CATEGORY=CHANNELS
+MENUSELECT_DESCRIPTION=Channel Drivers
 
 ifeq ($(OSARCH),OpenBSD)
   PTLIB=-lpt_OpenBSD_x86_r
@@ -33,11 +35,6 @@
 ifeq ($(OSARCH),NetBSD)
   PTLIB=-lpt_NetBSD_x86_r
   H323LIB=-lh323_NetBSD_x86_r
-endif
-
-MODULE_EXCLUDE:=
-ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  MODULE_EXCLUDE+= chan_oss chan_unistim
 endif
 
 ifeq ($(wildcard h323/libchanh323.a),)

Modified: team/group/sip_session_timers/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_h323.c?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/chan_h323.c (original)
+++ team/group/sip_session_timers/channels/chan_h323.c Mon Dec 17 12:06:36 2007
@@ -970,7 +970,7 @@
 	if (h323debug)
 		ast_debug(1, "Created RTP channel\n");
 
-	ast_rtp_setqos(pvt->rtp, tos, cos);
+	ast_rtp_setqos(pvt->rtp, tos, cos, "H323 RTP");
 
 	if (h323debug)
 		ast_debug(1, "Setting NAT on RTP to %d\n", pvt->options.nat);
@@ -2904,13 +2904,23 @@
 			} else {
 				memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
 			}
-		} else if (!strcasecmp(v->name, "tos")) {
+		} else if (!strcasecmp(v->name, "tos")) {	/* Needs to be removed in next release */
+			ast_log(LOG_WARNING, "The \"tos\" setting is deprecated in this version of Asterisk. Please change to \"tos_audio\".\n");
 			if (ast_str2tos(v->value, &tos)) {
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, for more info read doc/qos.tex\n", v->lineno);			
-			}
-		} else if (!strcasecmp(v->name, "cos")) {		
+				ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, refer to QoS documentation\n", v->lineno);			
+			}
+		} else if (!strcasecmp(v->name, "tos_audio")) {
+			if (ast_str2tos(v->value, &tos)) {
+				ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, refer to QoS documentation\n", v->lineno);			
+			}
+		} else if (!strcasecmp(v->name, "cos")) {
+			ast_log(LOG_WARNING, "The \"cos\" setting is deprecated in this version of Asterisk. Please change to \"cos_audio\".\n");
 			if (ast_str2cos(v->value, &cos)) {
-				ast_log(LOG_WARNING, "Invalid cos value at line %d, for more info read doc/qos.tex\n", v->lineno);			
+				ast_log(LOG_WARNING, "Invalid cos_audio value at line %d, refer to QoS documentation\n", v->lineno);			
+			}
+		} else if (!strcasecmp(v->name, "cos_audio")) {
+			if (ast_str2cos(v->value, &cos)) {
+				ast_log(LOG_WARNING, "Invalid cos_audio value at line %d, refer to QoS documentation\n", v->lineno);			
 			}
 		} else if (!strcasecmp(v->name, "gatekeeper")) {
 			if (!strcasecmp(v->value, "DISABLE")) {

Modified: team/group/sip_session_timers/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_iax2.c?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/chan_iax2.c (original)
+++ team/group/sip_session_timers/channels/chan_iax2.c Mon Dec 17 12:06:36 2007
@@ -10422,13 +10422,13 @@
 	tosval = ast_variable_retrieve(cfg, "general", "tos");
 	if (tosval) {
 		if (ast_str2tos(tosval, &tos))
-			ast_log(LOG_WARNING, "Invalid tos value, see doc/qos.tex for more information.\n");
+			ast_log(LOG_WARNING, "Invalid tos value, refer to QoS documentation\n");
 	}
 	/* Seed initial cos value */
 	tosval = ast_variable_retrieve(cfg, "general", "cos");
 	if (tosval) {
 		if (ast_str2cos(tosval, &cos))
-			ast_log(LOG_WARNING, "Invalid cos value, see doc/qos.tex for more information.\n");
+			ast_log(LOG_WARNING, "Invalid cos value, refer to QoS documentation\n");
 	}
 	while(v) {
 		if (!strcasecmp(v->name, "bindport")){ 
@@ -10601,10 +10601,10 @@
 				ast_context_create(NULL, regcontext, "IAX2");
 		} else if (!strcasecmp(v->name, "tos")) {
 			if (ast_str2tos(v->value, &tos))
-				ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/qos.tex for more information.'\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid tos value at line %d, refer to QoS documentation\n", v->lineno);
 		} else if (!strcasecmp(v->name, "cos")) {
 			if (ast_str2cos(v->value, &cos))
-				ast_log(LOG_WARNING, "Invalid cos value at line %d, see doc/qos.tex for more information.'\n", v->lineno);
+				ast_log(LOG_WARNING, "Invalid cos value at line %d, refer to QoS documentation\n", v->lineno);
 		} else if (!strcasecmp(v->name, "accountcode")) {
 			ast_copy_string(accountcode, v->value, sizeof(accountcode));
 		} else if (!strcasecmp(v->name, "mohinterpret")) {

Modified: team/group/sip_session_timers/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_mgcp.c?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/chan_mgcp.c (original)
+++ team/group/sip_session_timers/channels/chan_mgcp.c Mon Dec 17 12:06:36 2007
@@ -153,8 +153,9 @@
 static ast_group_t cur_pickupgroup = 0;
 
 static unsigned int tos = 0;
-
+static unsigned int tos_audio = 0;
 static unsigned int cos = 0;
+static unsigned int cos_audio = 0;
 
 static int immediate = 0;
 
@@ -2591,8 +2592,10 @@
 	sub->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
 	if (sub->rtp && sub->owner)
 		ast_channel_set_fd(sub->owner, 0, ast_rtp_fd(sub->rtp));
-	if (sub->rtp)
+	if (sub->rtp) {
+		ast_rtp_setqos(sub->rtp, tos_audio, cos_audio, "MGCP RTP");
 		ast_rtp_setnat(sub->rtp, sub->nat);
+	}
 #if 0
 	ast_rtp_set_callback(p->rtp, rtpready);
 	ast_rtp_set_data(p->rtp, p);
@@ -4097,10 +4100,16 @@
 				capability &= ~format;
 		} else if (!strcasecmp(v->name, "tos")) {
 			if (ast_str2tos(v->value, &tos))
-			    ast_log(LOG_WARNING, "Invalid tos value at line %d, see doc/qos.tex for more information.\n", v->lineno);
+			    ast_log(LOG_WARNING, "Invalid tos value at line %d, refer to QoS documentation\n", v->lineno);
+		} else if (!strcasecmp(v->name, "tos_audio")) {
+			if (ast_str2tos(v->value, &tos_audio))
+			    ast_log(LOG_WARNING, "Invalid tos_audio value at line %d, refer to QoS documentation\n", v->lineno);
 		} else if (!strcasecmp(v->name, "cos")) {				
 			if (ast_str2cos(v->value, &cos))
-			    ast_log(LOG_WARNING, "Invalid cos value at line %d, see doc/qos.tex for more information.\n", v->lineno);
+			    ast_log(LOG_WARNING, "Invalid cos value at line %d, refer to QoS documentation\n", v->lineno);
+		} else if (!strcasecmp(v->name, "cos_audio")) {				
+			if (ast_str2cos(v->value, &cos_audio))
+			    ast_log(LOG_WARNING, "Invalid cos_audio value at line %d, refer to QoS documentation\n", v->lineno);
 		} else if (!strcasecmp(v->name, "port")) {
 			if (sscanf(v->value, "%d", &ourport) == 1) {
 				bindaddr.sin_port = htons(ourport);
@@ -4184,7 +4193,7 @@
 		} else {
 			ast_verb(2, "MGCP Listening on %s:%d\n",
 					ast_inet_ntoa(bindaddr.sin_addr), ntohs(bindaddr.sin_port));
-			ast_netsock_set_qos(mgcpsock, tos, cos);
+			ast_netsock_set_qos(mgcpsock, tos, cos, "MGCP");
 		}
 	}
 	ast_mutex_unlock(&netlock);

Modified: team/group/sip_session_timers/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_oss.c?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/chan_oss.c (original)
+++ team/group/sip_session_timers/channels/chan_oss.c Mon Dec 17 12:06:36 2007
@@ -35,17 +35,16 @@
 
 /*** MODULEINFO
 	<depend>ossaudio</depend>
+	<conflict>winarch</conflict>
  ***/
 
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <ctype.h>
+#include <ctype.h>		/* isalnum() used here */
 #include <math.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/time.h>
+#include <sys/ioctl.h>		
 
 #ifdef __linux
 #include <linux/soundcard.h>
@@ -55,19 +54,13 @@
 #include <soundcard.h>
 #endif
 
-#include "asterisk/lock.h"
-#include "asterisk/frame.h"
+#include "asterisk/channel.h"
+#include "asterisk/file.h"
 #include "asterisk/callerid.h"
-#include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-#include "asterisk/config.h"
 #include "asterisk/cli.h"
-#include "asterisk/utils.h"
 #include "asterisk/causes.h"
-#include "asterisk/endian.h"
-#include "asterisk/stringfields.h"
-#include "asterisk/abstract_jb.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/app.h"
 

Modified: team/group/sip_session_timers/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/sip_session_timers/channels/chan_sip.c?view=diff&rev=93251&r1=93250&r2=93251
==============================================================================
--- team/group/sip_session_timers/channels/chan_sip.c (original)
+++ team/group/sip_session_timers/channels/chan_sip.c Mon Dec 17 12:06:36 2007
@@ -221,8 +221,8 @@
 
 #define DEFAULT_RETRANS              1000             /*!< How frequently to retransmit Default: 2 * 500 ms in RFC 3261 */
 #define MAX_RETRANS                  6                /*!< Try only 6 times for retransmissions, a total of 7 transmissions */
-#define SIP_TIMER_T1		     500              /* SIP timer T1 (according to RFC 3261) */
-#define SIP_TRANS_TIMEOUT            32000            /*!< SIP request timeout (rfc 3261) 64*T1 
+#define SIP_TIMER_T1                 500              /* SIP timer T1 (according to RFC 3261) */
+#define SIP_TRANS_TIMEOUT            64 * SIP_TIMER_T1/*!< SIP request timeout (rfc 3261) 64*T1 
                                                       \todo Use known T1 for timeout (peerpoke)
                                                       */
 #define DEFAULT_TRANS_TIMEOUT        -1               /* Use default SIP transaction timeout */
@@ -606,7 +606,7 @@
 #define DEFAULT_COS_SIP         4
 #define DEFAULT_COS_AUDIO       5
 #define DEFAULT_COS_VIDEO       6
-#define DEFAULT_COS_TEXT        0
+#define DEFAULT_COS_TEXT        5
 #define DEFAULT_ALLOW_EXT_DOM	TRUE
 #define DEFAULT_REALM		"asterisk"
 #define DEFAULT_NOTIFYRINGING	TRUE
@@ -697,7 +697,9 @@
 static char global_sdpowner[AST_MAX_EXTENSION];	/*!< SDP owner name for the SIP channel */
 static int allow_external_domains;	/*!< Accept calls to external SIP domains? */
 static int global_callevents;		/*!< Whether we send manager events or not */
+static int global_t1;			/*!< T1 time */
 static int global_t1min;		/*!< T1 roundtrip time minimum */
+static int global_timer_b;    /*!< Timer B - RFC 3261 Section 17.1.1.2 */
 static int global_regextenonqualify;  /*!< Whether to add/remove regexten when qualifying peers */
 static int global_autoframing;          /*!< Turn autoframing on or off. */
 static enum transfermodes global_allowtransfer;	/*!< SIP Refer restriction scheme */
@@ -1155,6 +1157,7 @@
 	char notext;				/*!< Text not supported  (?) */
 
 	int timer_t1;				/*!< SIP timer T1, ms rtt */
+	int timer_b;            /*!< SIP timer B, ms */
 	unsigned int sipoptions;		/*!< Supported SIP options on the other end */
 	unsigned int reqsipoptions;		/*!< Required SIP options on the other end */
 	struct ast_codec_pref prefs;		/*!< codec prefs */
@@ -1436,11 +1439,12 @@
 	struct ast_variable *chanvars;	/*!<  Variables to set for channel created by user */
 	struct sip_pvt *mwipvt;		/*!<  Subscription for MWI */
 	int autoframing;
-
 	enum st_mode st_mode_oper;      /*!< Mode of operation for Session-Timers           */
 	enum st_refresher st_ref;       /*!< Session-Timer refresher                        */
 	int st_min_se;                  /*!< Lowest threshold for session refresh interval  */
 	int st_max_se;                  /*!< Highest threshold for session refresh interval */
+	int timer_t1;		/*!<  The maximum T1 value for the peer */
+	int timer_b;      /*!<  The maximum timer B (transaction timeouts) */
 };
 
 
@@ -2616,8 +2620,10 @@
 static void sip_scheddestroy(struct sip_pvt *p, int ms)
 {
 	if (ms < 0) {
-		if (p->timer_t1 == 0)
-			p->timer_t1 = SIP_TIMER_T1;	/* Set timer T1 if not set (RFC 3261) */
+		if (p->timer_t1 == 0) {
+			p->timer_t1 = global_t1;	/* Set timer T1 if not set (RFC 3261) */
+			p->timer_b = global_timer_b;  /* Set timer B if not set (RFC 3261) */
+		}
 		ms = p->timer_t1 * 64;
 	}
 	if (sip_debug_test_pvt(p))
@@ -3566,8 +3572,19 @@
 
 	/* Set timer T1 to RTT for this peer (if known by qualify=) */
 	/* Minimum is settable or default to 100 ms */
+	/* If there is a maxms and lastms from a qualify use that over a manual T1
+	   value. Otherwise, use the peer's T1 value. */
 	if (peer->maxms && peer->lastms)
 		dialog->timer_t1 = peer->lastms < global_t1min ? global_t1min : peer->lastms;
+	else
+		dialog->timer_t1 = peer->timer_t1;
+
+	/* Set timer B to control transaction timeouts, the peer setting is the default and overrides
+	   the known timer */
+	if (peer->timer_b)
+		dialog->timer_b = peer->timer_b;
+	else
+		dialog->timer_b = 64 * dialog->timer_t1;
 
 	if ((ast_test_flag(&dialog->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) ||
 	    (ast_test_flag(&dialog->flags[0], SIP_DTMF) == SIP_DTMF_AUTO))
@@ -3598,7 +3615,8 @@
 	if (port)
 		*port++ = '\0';
 	dialog->sa.sin_family = AF_INET;
-	dialog->timer_t1 = SIP_TIMER_T1; /* Default SIP retransmission timer T1 (RFC 3261) */
+	dialog->timer_t1 = global_t1; /* Default SIP retransmission timer T1 (RFC 3261) */
+	dialog->timer_b = global_timer_b; /* Default SIP transaction timer B (RFC 3261) */
 	peer = find_peer(peername, NULL, 1);
 
 	if (peer) {
@@ -3750,7 +3768,7 @@
 		p->invitestate = INV_CALLING;
 	
 		/* Initialize auto-congest time */
-		p->initid = ast_sched_replace(p->initid, sched, SIP_TRANS_TIMEOUT, 
+		p->initid = ast_sched_replace(p->initid, sched, p->timer_b, 
 			auto_congest, dialog_ref(p));
 	}
 
@@ -5196,8 +5214,10 @@
 	p->st_cached_mode = 0;                  /* Session-Timers cached mode */
 	p->prefs = default_prefs;		/* Set default codecs for this call */
 
-	if (intended_method != SIP_OPTIONS)	/* Peerpoke has it's own system */

[... 20607 lines stripped ...]

More information about the asterisk-commits mailing list