try to pass the 'f' up from wanpipe and do something sane with it

diff --git a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
index 4d16eda0e0b6510f21e6ac9fdd61b9361103cc8f..8423aac34bf3174533190c5c46695c7b7799971a 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
+++ b/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c
@@ -1119,11 +1119,14 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event)
                                        event_id = ZAP_OOB_NOOP;
 
                                        //zap_log(ZAP_LOG_WARNING, "%d:%d queue hardware dtmf %s %s\n", zchan->span_id, zchan->chan_id, tmp_dtmf, 
-                                                       //tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT ? "on" : "off");
-                   if (tmp_dtmf[0] == 'f') {
-                           zap_log(ZAP_LOG_DEBUG, "Ignoring fax DTMF event\n");
-                           break;
-                   }
+                                       //tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT ? "on" : "off");
+                                       if (tmp_dtmf[0] == 'f') {
+                                               if (zap_test_flag(zchan, ZAP_CHANNEL_INUSE)) {
+                                                       zap_channel_queue_dtmf(zchan, tmp_dtmf);
+                                               }
+                                               break;
+                                       }
+
                     if (tdm_api.wp_tdm_cmd.event.wp_tdm_api_event_dtmf_type == WAN_EC_TONE_PRESENT) {
                                                zap_set_flag_locked(zchan, ZAP_CHANNEL_MUTE);
                                        }

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 945583ee07396cf5d3a355aead279f3945c583cc..924dcd2b9baa77808e11d345a0d1db2ad71272e9 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -322,7 +322,7 @@ SWITCH_DECLARE(unsigned char) switch_char_to_rfc2833(char key);
   \param key the key to test
   \return TRUE or FALSE
  */
-#define is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119 || key == 70)
+#define is_dtmf(key)  ((key > 47 && key < 58) || (key > 64 && key < 69) || (key > 96 && key < 101) || key == 35 || key == 42 || key == 87 || key == 119 || key == 70 || key == 102)
 
 #define end_of(_s) *(*_s == '\0' ? _s : _s + strlen(_s) - 1)
 #define end_of_p(_s) (*_s == '\0' ? _s : _s + strlen(_s) - 1)

diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 40214c423dabec6dae4eb8c588b751fea8c2967c..2c0e3c38f331429da0b5d37e7a46d6a7de0372ae 100644 (file)
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -2334,8 +2334,39 @@ typedef struct {
        switch_media_bug_t *bug;
        switch_core_session_t *session;
        int bug_running;
+       int detect_fax;
 } switch_tone_container_t;
 
+static switch_status_t tone_on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction)
+{
+       switch_channel_t *channel = switch_core_session_get_channel(session);
+       switch_tone_container_t *cont = switch_channel_get_private(channel, "_tone_detect_");
+       switch_event_t *event;
+       int i;
+
+       if (!cont || !cont->detect_fax || dtmf->digit != 'f') {
+               return SWITCH_STATUS_SUCCESS;
+       }
+
+       i = cont->detect_fax;
+
+       if (cont->list[i].callback) {
+               cont->list[i].callback(cont->session, cont->list[i].app, cont->list[i].data);
+       } else if (cont->list[i].app) {
+               if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", cont->list[i].app);
+                       switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data);
+                       switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
+                       switch_core_session_queue_private_event(cont->session, &event, SWITCH_FALSE);
+               }
+       }
+               
+       return SWITCH_STATUS_SUCCESS;
+
+}
+
+
 static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
 {
        switch_tone_container_t *cont = (switch_tone_container_t *) user_data;
@@ -2467,6 +2498,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_tone_detect_session(switch_core_
                        cont->list[i].up = 0;
                }
                switch_core_media_bug_remove(session, &cont->bug);
+               if (cont->detect_fax) {
+                       cont->detect_fax = 0;
+               }
                return SWITCH_STATUS_SUCCESS;
        }
        return SWITCH_STATUS_FALSE;
@@ -2481,7 +2515,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
        switch_status_t status;
        switch_tone_container_t *cont = switch_channel_get_private(channel, "_tone_detect_");
        char *p, *next;
-       int i = 0, ok = 0;
+       int i = 0, ok = 0, detect_fax = 0;
        switch_media_bug_flag_t bflags = 0;
        const char *var;
        switch_codec_implementation_t read_impl = { 0 };
@@ -2534,6 +2568,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
                        ok++;
                        cont->list[cont->index].map.freqs[i++] = this;
                }
+               if (!strncasecmp(p, "1100", 4)) {
+                       detect_fax = cont->index;
+               }
+
                if (next) {
                        p = next + 1;
                }
@@ -2545,6 +2583,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
                return SWITCH_STATUS_FALSE;
        }
 
+       cont->detect_fax = detect_fax;
+
        cont->list[cont->index].key = switch_core_session_strdup(session, key);
 
        if (app) {
@@ -2612,6 +2652,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
                switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s bug already running\n", switch_channel_get_name(channel));
        } else {
                cont->bug_running = 1;
+               if (cont->detect_fax) {
+                       switch_core_event_hook_add_send_dtmf(session, tone_on_dtmf);
+                       switch_core_event_hook_add_recv_dtmf(session, tone_on_dtmf);
+               }
+
                if ((status = switch_core_media_bug_add(session, "tone_detect", key,
                                                                                                tone_detect_callback, cont, timeout, bflags, &cont->bug)) != SWITCH_STATUS_SUCCESS) {
                        cont->bug_running = 0;