sigh

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10446 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 84f0a9af444feeed6d5cba9a21c99313758eb30b..ea9e98c260a63f93a7d30913c65823f50b07606a 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -3290,8 +3290,12 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                        int tmp;
                                        /* move signal_ptr where we need it (right past Signal=) */
                                        signal_ptr = signal_ptr + 7;
-                                       tmp = atoi(signal_ptr);
-                                       dtmf.digit = switch_rfc2833_to_char(tmp);
+                                       if (is_dtmf(*signal_ptr)) {
+                                               dtmf.digit = *signal_ptr;
+                                       } else {
+                                               tmp = atoi(signal_ptr);
+                                               dtmf.digit = switch_rfc2833_to_char(tmp);
+                                       }
                                } else {
                                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n");
                                        goto fail;
@@ -3300,6 +3304,7 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
                                if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) {
                                        int tmp;
                                        signal_ptr += 9;
+                                       
                                        if ((tmp = atoi(signal_ptr)) <= 0) {
                                                tmp = switch_core_default_dtmf_duration(0);
                                        }

diff --git a/src/switch_utils.c b/src/switch_utils.c
index 8d3b23a27460c2cfbd019a763a8441ecb4c7ad07..ae3c6acc6e6612646fcd02f91e8976e0439bc626 100644 (file)
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -1128,9 +1128,6 @@ SWITCH_DECLARE(int) switch_build_uri(char *uri,
 SWITCH_DECLARE(char) switch_rfc2833_to_char(int event)
 {
        if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) {
-               if (is_dtmf(event)) {
-                       return (char) event;
-               }
                return RFC2833_CHARS[event];
        }
        return '\0';