January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11302 - freeswitch/trunk
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: robertj Date: Mon Jan 19 18:48:33 2009 New Revision: 11302 Log: Added mod_opal to old unsupported DevStudio 2005 solution. Modified: freeswitch/trunk/Freeswitch.2005.unsupported.sln Modified: freeswitch/trunk/Freeswitch.2005.unsupported.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2005.unsupported.sln (original) +++ freeswitch/trunk/Freeswitch.2005.unsupported.sln Mon Jan 19 18:48:33 2009 @@ -801,6 +801,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlparse", "libs\xmlrpc-c\Windows\xmlparse.vcproj", "{0D108721-EAE8-4BAF-8102-D8960EC93647}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opal", "src\mod\endpoints\mod_opal\mod_opal_2005.vcproj", "{426B1369-FDB7-4B18-A7EF-9C6A9097A130}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1321,6 +1323,12 @@ {0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.ActiveCfg = Release|Win32 {0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|Win32.Build.0 = Release|Win32 {0D108721-EAE8-4BAF-8102-D8960EC93647}.Release|x64.ActiveCfg = Release|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Debug|Win32.ActiveCfg = Debug|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Debug|Win32.Build.0 = Debug|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Debug|x64.ActiveCfg = Debug|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Release|Win32.ActiveCfg = Release|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Release|Win32.Build.0 = Release|Win32 + {426B1369-FDB7-4B18-A7EF-9C6A9097A130}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1341,6 +1349,7 @@ {3A5B9131-F20C-4A85-9447-6C1610941CEE} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {426B1369-FDB7-4B18-A7EF-9C6A9097A130} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}

1 0

[commit] r11301 - freeswitch/trunk/w32
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: robertj Date: Mon Jan 19 18:47:43 2009 New Revision: 11301 Log: Removed error on warning for compiles, as DevStudio 2005 is more or less deprecated keeping the warnings out is becoming less and less "maintained". Modified: freeswitch/trunk/w32/modules.vsprops Modified: freeswitch/trunk/w32/modules.vsprops ============================================================================== --- freeswitch/trunk/w32/modules.vsprops (original) +++ freeswitch/trunk/w32/modules.vsprops Mon Jan 19 18:47:43 2009 @@ -12,7 +12,6 @@ AdditionalIncludeDirectories=""$(SolutionDir)\src\include"" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;MOD_EXPORTS" WarningLevel="4" - WarnAsError="true" /> <Tool Name="VCLinkerTool"

1 0

[commit] r11300 - freeswitch/trunk
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Mon Jan 19 18:28:20 2009 New Revision: 11300 Log: make message more clear Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Mon Jan 19 18:28:20 2009 @@ -91,7 +91,7 @@ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." -echo " You need libtool version 1.5.14 or newer up to 1.9.x installed" +echo " You need libtool version 1.5.14 or newer (up to 1.9.x) installed. 2.x will not work! see http://jira.freeswitch.org/browse/FSBUILD-82" echo " libtool version 2.0 and above WILL NOT work." echo " to build FreeSWITCH from SVN." exit 1 @@ -115,7 +115,7 @@ echo "bootstrap: libtool version $lt_pversion (ok)" else echo "bootstrap: libtool version $lt_pversion found." -echo " You need libtool version 1.5.14 or newer installed" +echo " You need libtool version 1.5.14 or newer (up to 1.9.x) installed. 2.x will not work! see http://jira.freeswitch.org/browse/FSBUILD-82" echo " to build FreeSWITCH from SVN." exit 1

1 0

[commit] r11299 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Mon Jan 19 18:21:58 2009 New Revision: 11299 Log: refactor Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 19 18:21:58 2009 @@ -83,6 +83,8 @@ uint8_t early_media; uint8_t answered; uint8_t dead; + uint32_t per_channel_timelimit_sec; + uint32_t per_channel_progress_timelimit_sec; } originate_status_t; @@ -211,8 +213,6 @@ } static int check_per_channel_timeouts(originate_status_t *originate_status, - uint32_t *per_channel_timelimit_sec, - uint32_t *per_channel_progress_timelimit_sec, int max, time_t start) { @@ -221,7 +221,7 @@ for (i = 0; i < max; i++) { if (originate_status[i].peer_channel && switch_channel_get_state(originate_status[i].peer_channel) < CS_HANGUP) { - if (per_channel_progress_timelimit_sec[i] && elapsed > per_channel_progress_timelimit_sec[i] && + if (originate_status[i].per_channel_progress_timelimit_sec && elapsed > originate_status[i].per_channel_progress_timelimit_sec && !( switch_channel_test_flag(originate_status[i].peer_channel, CF_RING_READY) || switch_channel_test_flag(originate_status[i].peer_channel, CF_ANSWERED) || @@ -231,7 +231,7 @@ switch_channel_hangup(originate_status[i].peer_channel, SWITCH_CAUSE_PROGRESS_TIMEOUT); x++; } - if (per_channel_timelimit_sec[i] && elapsed > per_channel_timelimit_sec[i]) { + if (originate_status[i].per_channel_timelimit_sec && elapsed > originate_status[i].per_channel_timelimit_sec) { switch_channel_hangup(originate_status[i].peer_channel, SWITCH_CAUSE_ALLOTTED_TIMEOUT); x++; } @@ -857,8 +857,6 @@ char *fail_on_single_reject_var = NULL; char *loop_data = NULL; uint32_t progress_timelimit_sec = 0; - uint32_t per_channel_timelimit_sec[MAX_PEERS] = { 0 }; - uint32_t per_channel_progress_timelimit_sec[MAX_PEERS] = { 0 }; const char *cid_tmp; originate_global_t oglobals = { 0 }; @@ -1422,7 +1420,7 @@ if (val > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg timeout to %d\n", switch_channel_get_name(originate_status[0].peer_channel), val); - per_channel_timelimit_sec[i] = (uint32_t) val; + originate_status[i].per_channel_timelimit_sec = (uint32_t) val; } } @@ -1431,7 +1429,7 @@ if (val > 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg progress timeout to %d\n", switch_channel_get_name(originate_status[0].peer_channel), val); - per_channel_progress_timelimit_sec[i] = (uint32_t) val; + originate_status[i].per_channel_progress_timelimit_sec = (uint32_t) val; } } } @@ -1506,7 +1504,7 @@ switch_yield(100000); } - check_per_channel_timeouts(originate_status, per_channel_timelimit_sec, per_channel_progress_timelimit_sec, and_argc, start); + check_per_channel_timeouts(originate_status, and_argc, start); if (valid_channels == 0) { @@ -1634,7 +1632,7 @@ } /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ - check_per_channel_timeouts(originate_status, per_channel_timelimit_sec, per_channel_progress_timelimit_sec, and_argc, start); + check_per_channel_timeouts(originate_status, and_argc, start); if (oglobals.session && switch_core_session_private_event_count(oglobals.session)) { switch_ivr_parse_all_events(oglobals.session);

1 0

[commit] r11297 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 17:30:41 2009 New Revision: 11297 Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 19 17:30:41 2009 @@ -252,6 +252,15 @@ if (oglobals) { switch_channel_set_private(channel, "_oglobals_", NULL); + + if (!oglobals->progress) { + oglobals->progress = 1; + } + + if (!oglobals->ring_ready) { + oglobals->ring_ready = 1; + } + oglobals->early_ok = 1; } } @@ -409,12 +418,15 @@ } } - if (!oglobals->progress) { - oglobals->progress = 1; - } + if (!oglobals->monitor_early_media_ring) { + + if (!oglobals->progress) { + oglobals->progress = 1; + } - if (!oglobals->ring_ready) { - oglobals->ring_ready = 1; + if (!oglobals->ring_ready) { + oglobals->ring_ready = 1; + } } }

1 0

[commit] r11295 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 17:15:59 2009 New Revision: 11295 Log: monitor_media function Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 19 17:15:59 2009 @@ -97,6 +97,8 @@ uint8_t sent_ring; uint8_t progress; uint8_t return_ring_ready; + uint8_t monitor_early_media_ring; + uint8_t monitor_early_media_fail; } originate_global_t; @@ -239,6 +241,25 @@ return x; } +static switch_bool_t monitor_callback(switch_core_session_t *session, const char *app, const char *data) +{ + if (app) { + switch_channel_t *channel = switch_core_session_get_channel(session); + if (!strcmp(app, "fail")) { + switch_channel_hangup(channel, data ? switch_channel_str2cause(data) : SWITCH_CAUSE_USER_BUSY); + } else if (!strcmp(app, "ring")) { + originate_global_t *oglobals = (originate_global_t *) switch_channel_get_private(channel, "_oglobals_"); + + if (oglobals) { + switch_channel_set_private(channel, "_oglobals_", NULL); + oglobals->early_ok = 1; + } + } + } + + return SWITCH_FALSE; +} + static uint8_t check_channel_status(originate_global_t *oglobals, originate_status_t *originate_status, uint32_t len) { @@ -276,8 +297,118 @@ if (oglobals->early_ok) { pindex = i; } + + if (oglobals->monitor_early_media_fail) { + const char *var = switch_channel_get_variable(originate_status[i].peer_channel, "monitor_early_media_fail"); + if (!switch_strlen_zero(var)) { + char *fail_array[128] = {0}; + int fail_count = 0; + char *fail_data = strdup(var); + int fx; + + switch_assert(fail_data); + fail_count = switch_separate_string(fail_data, '!', fail_array, (sizeof(fail_array) / sizeof(fail_array[0]))); + + for(fx = 0; fx < fail_count; fx++) { + char *cause = fail_array[fx]; + int hits = 2; + char *p, *q; + + if (!(p = strchr(cause, ':'))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + *p++ = '\0'; + + + if (!p) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + + + if (!(hits = atoi(p))) { + hits = 2; + } + + + if (!(p = strchr(p, ':'))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + *p++ = '\0'; + + if (!p) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + + for(q = p; q && *q; q++) { + if (*q == '+') { + *q = ','; + } + } + + switch_ivr_tone_detect_session(originate_status[i].peer_session, + "monitor_early_media_fail", + p, "r", 0, hits, "fail", cause, monitor_callback); + + } + + switch_safe_free(fail_data); + + } + } + + if (oglobals->monitor_early_media_ring) { + const char *var = switch_channel_get_variable(originate_status[i].peer_channel, "monitor_early_media_ring"); + if (!switch_strlen_zero(var)) { + char *ring_array[128] = {0}; + int ring_count = 0; + char *ring_data = strdup(var); + int fx; + + switch_assert(ring_data); + ring_count = switch_separate_string(ring_data, '!', ring_array, (sizeof(ring_array) / sizeof(ring_array[0]))); + + for(fx = 0; fx < ring_count; fx++) { + int hits = 2; + char *p = ring_array[fx], *q; + + if (!(hits = atoi(p))) { + hits = 2; + } + + if (!(p = strchr(p, ':'))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + *p++ = '\0'; + + if (!p) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n"); + continue; + } + + for(q = p; q && *q; q++) { + if (*q == '+') { + *q = ','; + } + } + + switch_channel_set_private(originate_status[i].peer_channel, "_oglobals_", oglobals); + switch_ivr_tone_detect_session(originate_status[i].peer_session, + "monitor_early_media_ring", + p, "r", 0, hits, "ring", NULL, monitor_callback); + + } + + switch_safe_free(ring_data); + + } + } } - + if (!oglobals->progress) { oglobals->progress = 1; } @@ -619,7 +750,7 @@ } } - done: + done: if (ringback.fh) { switch_core_file_close(ringback.fh); @@ -796,7 +927,7 @@ /* Some channel are created from an originating channel and some aren't so not all outgoing calls have a way to get params so we will normalize dialstring params and channel variables (when there is an originator) into an event that we will use as a pseudo hash to consult for params as needed. - */ + */ if (ovars) { var_event = ovars; @@ -824,6 +955,10 @@ ok = 1; } else if (!strcasecmp((char *) hi->name, "ignore_early_media")) { ok = 1; + } else if (!strcasecmp((char *) hi->name, "monitor_early_media_ring")) { + ok = 1; + } else if (!strcasecmp((char *) hi->name, "monitor_early_media_fail")) { + ok = 1; } else if (!strcasecmp((char *) hi->name, "return_ring_ready")) { ok = 1; } else if (!strcasecmp((char *) hi->name, "ring_ready")) { @@ -849,16 +984,16 @@ switch_channel_variable_last(caller_channel); } /* - if ((hi = switch_channel_variable_first(caller_channel))) { - for (; hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &vval); - if (vvar && vval) { - switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, (void *) vvar, (char *) vval); - } - } - switch_channel_variable_last(caller_channel); - } - */ + if ((hi = switch_channel_variable_first(caller_channel))) { + for (; hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, (void *) vvar, (char *) vval); + } + } + switch_channel_variable_last(caller_channel); + } + */ } if (vars) { /* Parse parameters specified from the dialstring */ @@ -936,6 +1071,16 @@ oglobals.early_ok = 0; } + if ((var_val = switch_event_get_header(var_event, "monitor_early_media_ring"))) { + oglobals.early_ok = 0; + oglobals.monitor_early_media_ring = 1; + } + + if ((var_val = switch_event_get_header(var_event, "monitor_early_media_fail"))) { + oglobals.early_ok = 0; + oglobals.monitor_early_media_fail = 1; + } + if ((var_val = switch_event_get_header(var_event, "return_ring_ready")) && switch_true(var_val)) { oglobals.return_ring_ready = 1; } @@ -1359,7 +1504,7 @@ } - endfor1: + endfor1: if (caller_channel) { if (switch_channel_test_flag(caller_channel, CF_PROXY_MODE) || switch_channel_test_flag(caller_channel, CF_PROXY_MEDIA)) { @@ -1698,6 +1843,12 @@ (oglobals.return_ring_ready && switch_channel_test_flag(peer_channel, CF_RING_READY)) ) { *bleg = peer_session; + + if (oglobals.monitor_early_media_ring || oglobals.monitor_early_media_fail) { + switch_ivr_stop_tone_detect_session(peer_session); + switch_channel_set_private(peer_channel, "_oglobals_", NULL); + } + status = SWITCH_STATUS_SUCCESS; } else { status = SWITCH_STATUS_FALSE;

1 0

[commit] r11294 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 15:49:07 2009 New Revision: 11294 Log: tweak Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 19 15:49:07 2009 @@ -1590,7 +1590,7 @@ if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { rtp_session->dtmf_data.in_digit_seq = in_digit_seq; - + rtp_session->dtmf_data.in_digit_sanity = 2000; #ifdef DEBUG_2833 printf("read: %c %u %u %u %u %d %d %s\n",

1 0

[commit] r11293 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 15:12:20 2009 New Revision: 11293 Log: FSCORE-273 Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jan 19 15:12:20 2009 @@ -1374,110 +1374,6 @@ goto end; } -#ifdef DEBUG_2833 - if (rtp_session->dtmf_data.in_digit_sanity && !(rtp_session->dtmf_data.in_digit_sanity % 100)) { - printf("sanity %d\n", rtp_session->dtmf_data.in_digit_sanity); - } -#endif - - if (rtp_session->dtmf_data.in_digit_sanity && !--rtp_session->dtmf_data.in_digit_sanity) { - rtp_session->dtmf_data.last_digit = 0; - rtp_session->dtmf_data.in_digit_ts = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed DTMF sanity check.\n"); - } - - /* RFC2833 ... like all RFC RE: VoIP, guaranteed to drive you to insanity! - We know the real rules here, but if we enforce them, it's an interop nightmare so, - we put up with as much as we can so we don't have to deal with being punished for - doing it right. Nice guys finish last! - */ - if (bytes && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) && - !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { - unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; - int end = packet[1] & 0x80 ? 1 : 0; - uint16_t duration = (packet[2] << 8) + packet[3]; - char key = switch_rfc2833_to_char(packet[0]); - uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); - uint32_t ts = htonl(rtp_session->recv_msg.header.ts); - - if (in_digit_seq < rtp_session->dtmf_data.in_digit_seq) { - if (rtp_session->dtmf_data.in_digit_seq - in_digit_seq > 100) { - rtp_session->dtmf_data.in_digit_seq = 0; - } - } - - if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { - - rtp_session->dtmf_data.in_digit_seq = in_digit_seq; - -#ifdef DEBUG_2833 - - printf("read: %c %u %u %u %u %d %d %s\n", - key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, - ts, duration, rtp_session->recv_msg.header.m, end, end && !rtp_session->dtmf_data.in_digit_ts ? "ignored" : ""); -#endif - - if (rtp_session->dtmf_data.last_duration > duration && ts == rtp_session->dtmf_data.in_digit_ts) { - rtp_session->dtmf_data.flip++; - } - - if (end) { - if (rtp_session->dtmf_data.in_digit_ts) { - switch_dtmf_t dtmf = { key, duration }; - - if (ts > rtp_session->dtmf_data.in_digit_ts) { - dtmf.duration += (ts - rtp_session->dtmf_data.in_digit_ts); - } - if (rtp_session->dtmf_data.flip) { - dtmf.duration += rtp_session->dtmf_data.flip * 0xFFFF; - rtp_session->dtmf_data.flip = 0; -#ifdef DEBUG_2833 - printf("you're welcome!\n"); -#endif - } - -#ifdef DEBUG_2833 - printf("done digit=%c ts=%u start_ts=%u dur=%u ddur=%u\n", - dtmf.digit, ts, rtp_session->dtmf_data.in_digit_ts, duration, dtmf.duration); -#endif - switch_rtp_queue_rfc2833_in(rtp_session, &dtmf); - rtp_session->dtmf_data.last_digit = rtp_session->dtmf_data.first_digit; - - rtp_session->dtmf_data.in_digit_ts = 0; - rtp_session->dtmf_data.in_digit_sanity = 0; - do_cng = 1; - } else { - if (!switch_rtp_ready(rtp_session)) { - goto end; - } - switch_cond_next(); - goto recvfrom; - } - - } else if (!rtp_session->dtmf_data.in_digit_ts) { - rtp_session->dtmf_data.in_digit_ts = ts; - rtp_session->dtmf_data.first_digit = key; - rtp_session->dtmf_data.in_digit_sanity = 2000; - } - - rtp_session->dtmf_data.last_duration = duration; -#ifdef DEBUG_2833 - } else { - printf("drop: %c %u %u %u %u %d %d\n", - key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, rtp_session->recv_msg.header.m, end); -#endif - } - } - - if (rtp_session->dtmf_data.in_digit_ts) { - if (!switch_rtp_ready(rtp_session)) { - goto end; - } - switch_cond_next(); - goto recvfrom; - } - - if (rtp_session->max_missed_packets) { if (bytes) { rtp_session->missed_count = 0; @@ -1659,6 +1555,109 @@ } +#ifdef DEBUG_2833 + if (rtp_session->dtmf_data.in_digit_sanity && !(rtp_session->dtmf_data.in_digit_sanity % 100)) { + printf("sanity %d\n", rtp_session->dtmf_data.in_digit_sanity); + } +#endif + + if (rtp_session->dtmf_data.in_digit_sanity && !--rtp_session->dtmf_data.in_digit_sanity) { + rtp_session->dtmf_data.last_digit = 0; + rtp_session->dtmf_data.in_digit_ts = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed DTMF sanity check.\n"); + } + + /* RFC2833 ... like all RFC RE: VoIP, guaranteed to drive you to insanity! + We know the real rules here, but if we enforce them, it's an interop nightmare so, + we put up with as much as we can so we don't have to deal with being punished for + doing it right. Nice guys finish last! + */ + if (bytes && !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PROXY_MEDIA) && + !switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { + unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; + int end = packet[1] & 0x80 ? 1 : 0; + uint16_t duration = (packet[2] << 8) + packet[3]; + char key = switch_rfc2833_to_char(packet[0]); + uint16_t in_digit_seq = ntohs((uint16_t) rtp_session->recv_msg.header.seq); + uint32_t ts = htonl(rtp_session->recv_msg.header.ts); + + if (in_digit_seq < rtp_session->dtmf_data.in_digit_seq) { + if (rtp_session->dtmf_data.in_digit_seq - in_digit_seq > 100) { + rtp_session->dtmf_data.in_digit_seq = 0; + } + } + + if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { + + rtp_session->dtmf_data.in_digit_seq = in_digit_seq; + +#ifdef DEBUG_2833 + + printf("read: %c %u %u %u %u %d %d %s\n", + key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, + ts, duration, rtp_session->recv_msg.header.m, end, end && !rtp_session->dtmf_data.in_digit_ts ? "ignored" : ""); +#endif + + if (rtp_session->dtmf_data.last_duration > duration && ts == rtp_session->dtmf_data.in_digit_ts) { + rtp_session->dtmf_data.flip++; + } + + if (end) { + if (rtp_session->dtmf_data.in_digit_ts) { + switch_dtmf_t dtmf = { key, duration }; + + if (ts > rtp_session->dtmf_data.in_digit_ts) { + dtmf.duration += (ts - rtp_session->dtmf_data.in_digit_ts); + } + if (rtp_session->dtmf_data.flip) { + dtmf.duration += rtp_session->dtmf_data.flip * 0xFFFF; + rtp_session->dtmf_data.flip = 0; +#ifdef DEBUG_2833 + printf("you're welcome!\n"); +#endif + } + +#ifdef DEBUG_2833 + printf("done digit=%c ts=%u start_ts=%u dur=%u ddur=%u\n", + dtmf.digit, ts, rtp_session->dtmf_data.in_digit_ts, duration, dtmf.duration); +#endif + switch_rtp_queue_rfc2833_in(rtp_session, &dtmf); + rtp_session->dtmf_data.last_digit = rtp_session->dtmf_data.first_digit; + + rtp_session->dtmf_data.in_digit_ts = 0; + rtp_session->dtmf_data.in_digit_sanity = 0; + do_cng = 1; + } else { + if (!switch_rtp_ready(rtp_session)) { + goto end; + } + switch_cond_next(); + goto recvfrom; + } + + } else if (!rtp_session->dtmf_data.in_digit_ts) { + rtp_session->dtmf_data.in_digit_ts = ts; + rtp_session->dtmf_data.first_digit = key; + rtp_session->dtmf_data.in_digit_sanity = 2000; + } + + rtp_session->dtmf_data.last_duration = duration; +#ifdef DEBUG_2833 + } else { + printf("drop: %c %u %u %u %u %d %d\n", + key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, rtp_session->recv_msg.header.m, end); +#endif + } + } + + if (rtp_session->dtmf_data.in_digit_ts) { + if (!switch_rtp_ready(rtp_session)) { + goto end; + } + switch_cond_next(); + goto recvfrom; + } + timer_check: if (do_cng) {

1 0

[commit] r11292 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: mikej Date: Mon Jan 19 15:11:01 2009 New Revision: 11292 Log: fix windows build Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 19 15:11:01 2009 @@ -239,15 +239,15 @@ return x; } -static uint8_t check_channel_status(originate_global_t *oglobals, originate_status_t *originate_status, int len) +static uint8_t check_channel_status(originate_global_t *oglobals, originate_status_t *originate_status, uint32_t len) { uint32_t i; - oglobals->hups = 0; - oglobals->idx = IDX_NADA; - int rval = 0; + uint8_t rval = 0; switch_channel_t *caller_channel = NULL; int pindex = -1; + oglobals->hups = 0; + oglobals->idx = IDX_NADA; if (oglobals->session) { caller_channel = switch_core_session_get_channel(oglobals->session); @@ -1024,9 +1024,9 @@ } for (r = 0; r < or_argc; r++) { - oglobals.hups = 0; char *p, *end = NULL; const char *var_begin, *var_end; + oglobals.hups = 0; reason = SWITCH_CAUSE_NONE; memset(peer_names, 0, sizeof(peer_names));

1 0

[commit] r11291 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: brian Date: Mon Jan 19 14:58:01 2009 New Revision: 11291 Log: fix MODAPP-198 Seems pgsql doesn't return things in the expected order but this will fix that just in case Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Jan 19 14:58:01 2009 @@ -1739,8 +1739,8 @@ case MSG_NEW: { switch_snprintf(sql, sizeof(sql), - "select * from voicemail_msgs where username='%s' and domain='%s' and read_epoch=0 order by read_flags", myid, - domain_name); + "select * from voicemail_msgs where username='%s' and domain='%s' and read_epoch=0" + " order by read_flags, created_epoch", myid, domain_name); total_messages = total_new_messages; heard_auto_new = heard_auto_saved = 1; } @@ -1749,8 +1749,8 @@ default: { switch_snprintf(sql, sizeof(sql), - "select * from voicemail_msgs where username='%s' and domain='%s' and read_epoch !=0 order by read_flags", myid, - domain_name); + "select * from voicemail_msgs where username='%s' and domain='%s' and read_epoch !=0" + " order by read_flags, created_epoch", myid, domain_name); total_messages = total_saved_messages; heard_auto_new = heard_auto_saved = 1; } @@ -3276,7 +3276,8 @@ vm_execute_sql(profile, sql, profile->mutex); free(sql); - sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); + sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' and file_path like '%%%s' order by created_epoch", + user, domain, file); memset(&holder, 0, sizeof(holder)); holder.profile = profile; holder.stream = stream; @@ -3298,7 +3299,8 @@ ref = switch_event_get_header(stream->param_event, "http-referer"); } - sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' and file_path like '%%%s'", user, domain, file); + sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' and file_path like '%%%s' order by created_epoch", + user, domain, file); memset(&holder, 0, sizeof(holder)); holder.profile = profile; holder.stream = stream; @@ -3562,7 +3564,7 @@ x_tmp = switch_xml_add_child_d(holder.x_channel, "ttl", 0); switch_xml_set_txt_d(x_tmp, "15"); - sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' order by read_flags", user, domain); + sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' order by read_flags, created_epoch", user, domain); vm_execute_sql_callback(profile, profile->mutex, sql, rss_callback, &holder); xmlstr = switch_xml_toxml(holder.xml, SWITCH_TRUE); @@ -3601,7 +3603,7 @@ cbt.buf = buf; cbt.len = sizeof(buf); - sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' order by read_flags", user, domain); + sql = switch_mprintf("select * from voicemail_msgs where username='%s' and domain='%s' order by read_flags, created_epoch", user, domain); vm_execute_sql_callback(profile, profile->mutex, sql, web_callback, &holder); switch_safe_free(sql);

1 0