提交 0cb51fb3 authored 作者: Anthony Minessale's avatar Anthony Minessale

sigh

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10446 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 770b94c4
...@@ -3290,8 +3290,12 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t ...@@ -3290,8 +3290,12 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
int tmp; int tmp;
/* move signal_ptr where we need it (right past Signal=) */ /* move signal_ptr where we need it (right past Signal=) */
signal_ptr = signal_ptr + 7; signal_ptr = signal_ptr + 7;
tmp = atoi(signal_ptr); if (is_dtmf(*signal_ptr)) {
dtmf.digit = switch_rfc2833_to_char(tmp); dtmf.digit = *signal_ptr;
} else {
tmp = atoi(signal_ptr);
dtmf.digit = switch_rfc2833_to_char(tmp);
}
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n");
goto fail; goto fail;
...@@ -3300,6 +3304,7 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t ...@@ -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))) { if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) {
int tmp; int tmp;
signal_ptr += 9; signal_ptr += 9;
if ((tmp = atoi(signal_ptr)) <= 0) { if ((tmp = atoi(signal_ptr)) <= 0) {
tmp = switch_core_default_dtmf_duration(0); tmp = switch_core_default_dtmf_duration(0);
} }
......
...@@ -1128,9 +1128,6 @@ SWITCH_DECLARE(int) switch_build_uri(char *uri, ...@@ -1128,9 +1128,6 @@ SWITCH_DECLARE(int) switch_build_uri(char *uri,
SWITCH_DECLARE(char) switch_rfc2833_to_char(int event) SWITCH_DECLARE(char) switch_rfc2833_to_char(int event)
{ {
if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) { if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) {
if (is_dtmf(event)) {
return (char) event;
}
return RFC2833_CHARS[event]; return RFC2833_CHARS[event];
} }
return '\0'; return '\0';
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论