Don't pretend we support skinny-wait timeout (See #FS 477)

diff --git a/conf/vanilla/dialplan/skinny-patterns.xml b/conf/vanilla/dialplan/skinny-patterns.xml
index 9f5786d7313a450d2c972553629c88077adbcc5f..b37d8eed820f85f4eed8dd572f392bc42f4d2dd2 100644 (file)
--- a/conf/vanilla/dialplan/skinny-patterns.xml
+++ b/conf/vanilla/dialplan/skinny-patterns.xml
@@ -7,17 +7,17 @@
     The special applications:
     - skinny-process tells skinny to process the call (route, set call forwarding, ...)
     - skinny-drop tells skinny to drop the call
-    - skinny-wait tells skinny to wait 'data' seconds for more numbers before drop
+    - skinny-wait tells skinny to wait for more digits
 -->
 <!-- http://wiki.freeswitch.org/wiki/Mod_skinny -->
 <include>
   <context name="skinny-patterns">
     <!--
-    Wait 10 seconds for another digit by default
+    Wait for another digit by default
     -->
     <extension name="Default">
       <condition>
-        <action application="skinny-wait" data="10"/>
+        <action application="skinny-wait" />
       </condition>
     </extension>
 

diff --git a/src/mod/endpoints/mod_skinny/conf/dialplan/skinny-patterns.xml b/src/mod/endpoints/mod_skinny/conf/dialplan/skinny-patterns.xml
index 9f5786d7313a450d2c972553629c88077adbcc5f..b37d8eed820f85f4eed8dd572f392bc42f4d2dd2 100644 (file)
--- a/src/mod/endpoints/mod_skinny/conf/dialplan/skinny-patterns.xml
+++ b/src/mod/endpoints/mod_skinny/conf/dialplan/skinny-patterns.xml
@@ -7,17 +7,17 @@
     The special applications:
     - skinny-process tells skinny to process the call (route, set call forwarding, ...)
     - skinny-drop tells skinny to drop the call
-    - skinny-wait tells skinny to wait 'data' seconds for more numbers before drop
+    - skinny-wait tells skinny to wait for more digits
 -->
 <!-- http://wiki.freeswitch.org/wiki/Mod_skinny -->
 <include>
   <context name="skinny-patterns">
     <!--
-    Wait 10 seconds for another digit by default
+    Wait for another digit by default
     -->
     <extension name="Default">
       <condition>
-        <action application="skinny-wait" data="10"/>
+        <action application="skinny-wait" />
       </condition>
     </extension>
 

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index d20ad5835223a0ee1dc81fa7bf2cdbe06a5202d2..792895a3e4988c4c3ab012cb0a13d2e9e2f4efc5 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -698,6 +698,9 @@ switch_status_t channel_on_routing(switch_core_session_t *session)
                        case SKINNY_ACTION_WAIT:
                                /* for now, wait forever */
                                switch_channel_set_state(channel, CS_HIBERNATE);
+                               if (!zstr(data)) {
+                                       switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "skinny-wait doesn't support timeout yet (See #FS-477)");
+                               }
                                break;
                        case SKINNY_ACTION_DROP:
                        default: