[asterisk-commits] oej: branch oej/assam-early-media-focus-1.8 r369915 - in /team/oej/assam-earl...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jul 11 04:03:26 CDT 2012
Author: oej
Date: Wed Jul 11 04:03:20 2012
New Revision: 369915
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369915
Log:
Reset branch
Modified:
team/oej/assam-early-media-focus-1.8/ (props changed)
team/oej/assam-early-media-focus-1.8/apps/app_stack.c
team/oej/assam-early-media-focus-1.8/channels/chan_sip.c
team/oej/assam-early-media-focus-1.8/configs/sip_notify.conf.sample
team/oej/assam-early-media-focus-1.8/main/pbx.c
Propchange: team/oej/assam-early-media-focus-1.8/
------------------------------------------------------------------------------
automerge = Is-there-life-off-net?
Propchange: team/oej/assam-early-media-focus-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 11 04:03:20 2012
@@ -1,1 +1,1 @@
-/branches/1.8:1-369787
+/branches/1.8:1-369914
Modified: team/oej/assam-early-media-focus-1.8/apps/app_stack.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/assam-early-media-focus-1.8/apps/app_stack.c?view=diff&rev=369915&r1=369914&r2=369915
==============================================================================
--- team/oej/assam-early-media-focus-1.8/apps/app_stack.c (original)
+++ team/oej/assam-early-media-focus-1.8/apps/app_stack.c Wed Jul 11 04:03:20 2012
@@ -73,10 +73,14 @@
<parameter name="condition" required="true" />
<parameter name="destination" required="true" argsep=":">
<argument name="labeliftrue" hasparams="optional">
+ <para>Continue at <replaceable>labeliftrue</replaceable> if the condition is true.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
<argument name="arg1" required="true" multiple="true" />
<argument name="argN" />
</argument>
<argument name="labeliffalse" hasparams="optional">
+ <para>Continue at <replaceable>labeliffalse</replaceable> if the condition is false.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
<argument name="arg1" required="true" multiple="true" />
<argument name="argN" />
</argument>
@@ -93,6 +97,7 @@
<ref type="application">MacroIf</ref>
<ref type="function">IF</ref>
<ref type="application">GotoIf</ref>
+ <ref type="application">Goto</ref>
</see-also>
</application>
<application name="Return" language="en_US">
Modified: team/oej/assam-early-media-focus-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/assam-early-media-focus-1.8/channels/chan_sip.c?view=diff&rev=369915&r1=369914&r2=369915
==============================================================================
--- team/oej/assam-early-media-focus-1.8/channels/chan_sip.c (original)
+++ team/oej/assam-early-media-focus-1.8/channels/chan_sip.c Wed Jul 11 04:03:20 2012
@@ -7006,7 +7006,8 @@
break;
case AST_CONTROL_UPDATE_RTP_PEER: /* Absorb this since it is handled by the bridge */
break;
- case AST_CONTROL_FLASH: /* Absorb this since it is irrelevant to SIP. */
+ case AST_CONTROL_FLASH: /* We don't currently handle AST_CONTROL_FLASH here, but it is expected, so we don't need to warn either. */
+ res = -1;
break;
case -1:
res = -1;
Modified: team/oej/assam-early-media-focus-1.8/configs/sip_notify.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/assam-early-media-focus-1.8/configs/sip_notify.conf.sample?view=diff&rev=369915&r1=369914&r2=369915
==============================================================================
--- team/oej/assam-early-media-focus-1.8/configs/sip_notify.conf.sample (original)
+++ team/oej/assam-early-media-focus-1.8/configs/sip_notify.conf.sample Wed Jul 11 04:03:20 2012
@@ -16,6 +16,11 @@
[aastra-xml]
Event=>aastra-xml
+
+; Digium
+
+[digium-check-cfg]
+Event=>check-sync
; Linksys
Modified: team/oej/assam-early-media-focus-1.8/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/assam-early-media-focus-1.8/main/pbx.c?view=diff&rev=369915&r1=369914&r2=369915
==============================================================================
--- team/oej/assam-early-media-focus-1.8/main/pbx.c (original)
+++ team/oej/assam-early-media-focus-1.8/main/pbx.c Wed Jul 11 04:03:20 2012
@@ -234,7 +234,9 @@
</description>
<see-also>
<ref type="application">Exec</ref>
+ <ref type="application">ExecIf</ref>
<ref type="application">TryExec</ref>
+ <ref type="application">GotoIfTime</ref>
</see-also>
</application>
<application name="Goto" language="en_US">
@@ -278,10 +280,12 @@
<parameter name="condition" required="true" />
<parameter name="destination" required="true" argsep=":">
<argument name="labeliftrue">
- <para>Continue at <replaceable>labeliftrue</replaceable> if the condition is true.</para>
+ <para>Continue at <replaceable>labeliftrue</replaceable> if the condition is true.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
</argument>
<argument name="labeliffalse">
- <para>Continue at <replaceable>labeliffalse</replaceable> if the condition is false.</para>
+ <para>Continue at <replaceable>labeliffalse</replaceable> if the condition is false.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
</argument>
</parameter>
</syntax>
@@ -320,8 +324,14 @@
<argument name="timezone" required="false" />
</parameter>
<parameter name="destination" required="true" argsep=":">
- <argument name="labeliftrue" />
- <argument name="labeliffalse" />
+ <argument name="labeliftrue">
+ <para>Continue at <replaceable>labeliftrue</replaceable> if the condition is true.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
+ </argument>
+ <argument name="labeliffalse">
+ <para>Continue at <replaceable>labeliffalse</replaceable> if the condition is false.
+ Takes the form similar to Goto() of [[context,]extension,]priority.</para>
+ </argument>
</parameter>
</syntax>
<description>
@@ -337,6 +347,7 @@
</description>
<see-also>
<ref type="application">GotoIf</ref>
+ <ref type="application">Goto</ref>
<ref type="function">IFTIME</ref>
<ref type="function">TESTTIME</ref>
</see-also>
More information about the asterisk-commits
mailing list