From 5838050e4f24f74149d390a45c94867068b5a7ee Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Wed, 3 Apr 2013 20:55:27 +0200
Subject: [PATCH] Don't pretend we support skinny-wait timeout (See #FS 477)

---
 conf/vanilla/dialplan/skinny-patterns.xml                   | 6 +++---
 .../endpoints/mod_skinny/conf/dialplan/skinny-patterns.xml  | 6 +++---
 src/mod/endpoints/mod_skinny/mod_skinny.c                   | 3 +++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/conf/vanilla/dialplan/skinny-patterns.xml b/conf/vanilla/dialplan/skinny-patterns.xml
index 9f5786d731..b37d8eed82 100644
--- 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 9f5786d731..b37d8eed82 100644
--- 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 d20ad58352..792895a3e4 100644
--- 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: