- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11164 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 17:38:12 2009 New Revision: 11164 Log: Brian is getting new earrings Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 17:38:12 2009 @@ -44,11 +44,11 @@ typedef struct easyroute_results{ char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; char acctcode[17]; - char translated[17]; + char translated[17]; } easyroute_results_t; @@ -170,7 +170,7 @@ if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); } - } else { + } else { #endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); #ifdef SWITCH_HAVE_ODBC @@ -257,7 +257,7 @@ switch_set_string(results->acctcode, pdata.acctcode); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "DB Error Setting Default Route!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DB Error Setting Default Route!\n"); switch_set_string(results->limit, "9999"); switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); switch_set_string(results->group, ""); @@ -290,7 +290,7 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; route_lookup(destnum, &results); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "EASY ROUTE DEST: [%s]\n", results.dialstring); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring); switch_channel_set_variable(channel, "easy_destnum", results.destnum); switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); switch_channel_set_variable(channel, "easy_group", results.group); @@ -319,14 +319,34 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; + if (argc < 1 || argc > 2){ + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } if (!route_lookup(destnum, &results) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } - - stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); - stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + if (argc != 2){ + stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); + stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); + } else { + if (!strncasecmp(argv[1], "dialstring", 10)) { + stream->write_function(stream, "%s", results.dialstring); + } else if (!strncasecmp(argv[1], "translated", 10)) { + stream->write_function(stream, "%s", results.translated); + } else if (!strncasecmp(argv[1], "limit", 5)) { + stream->write_function(stream, "%s", results.limit); + } else if (!strncasecmp(argv[1], "group", 5)) { + stream->write_function(stream, "%s", results.group); + } else if (!strncasecmp(argv[1], "acctcode", 8)) { + stream->write_function(stream, "%s", results.acctcode); + } else { + stream->write_function(stream, "Invalid Input!\n"); + return SWITCH_STATUS_SUCCESS; + } + } } else { stream->write_function(stream, "Invalid Input!\n"); } @@ -354,7 +374,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown) { - switch_odbc_handle_connect(globals.master_odbc); + switch_odbc_handle_disconnect(globals.master_odbc); return SWITCH_STATUS_UNLOAD; }

1 0

[commit] r11075 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:27:54 2009 New Revision: 11075 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Tue Jan 13 18:27:54 2009 @@ -389,16 +389,16 @@ { switch_hash_index_t *hi; void *val; - const void *var; + const void *var; switch_core_session_t *session; - switch_channel_t *channel; + switch_channel_t *channel; int total = 0; switch_mutex_lock(node->mutex); for (hi = switch_hash_first(NULL, node->consumer_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &var, NULL, &val); session = (switch_core_session_t *) val; - channel = switch_core_session_get_channel(session); + channel = switch_core_session_get_channel(session); if (!switch_channel_test_flag(channel, CF_BRIDGED)) { total++; } @@ -1863,8 +1863,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q'", fifo_name, digest); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); switch_mutex_lock(globals.mutex); @@ -1895,8 +1895,8 @@ sql = switch_mprintf("delete from fifo_outbound where fifo_name='%q' and uuid = '%q' and hostname='%q'", fifo_name, digest, globals.hostname); switch_assert(sql); - fifo_execute_sql(sql, globals.sql_mutex); - free(sql); + fifo_execute_sql(sql, globals.sql_mutex); + free(sql); } #define FIFO_MEMBER_API_SYNTAX "[add <fifo_name> <originate_string> [<simo_count>] [<timeout>] [<lag>] | del <fifo_name> <originate_string>]" @@ -1956,7 +1956,7 @@ stream->write_function(stream, "%s", "+OK\n"); } else { stream->write_function(stream, "%s", "-ERR Invalid!\n"); - goto done; + goto done; } done:

1 0

[commit] r11074 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:25:47 2009 New Revision: 11074 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Jan 13 18:25:47 2009 @@ -603,14 +603,14 @@ SWITCH_STANDARD_APP(presence_function) { char *argv[6] = { 0 }; - int argc; - char *mydata = NULL; + int argc; + char *mydata = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); - return; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + return; + } if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); @@ -2105,7 +2105,7 @@ } - done: + done: if (dest && dest != template) { switch_safe_free(dest);

1 0

[commit] r11073 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:22:04 2009 New Revision: 11073 Log: clean up formatting Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Jan 13 18:22:04 2009 @@ -253,7 +253,7 @@ switch_event_destroy(&params); } - end: + end: switch_safe_free(group_name); @@ -485,7 +485,7 @@ stream->write_function(stream, "%s", digest); } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(url_decode_function) @@ -502,7 +502,7 @@ stream->write_function(stream, "%s", reply); switch_safe_free(data); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(eval_function) @@ -546,7 +546,7 @@ free(expanded); } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(module_exists_function) @@ -559,7 +559,7 @@ } } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(domain_exists_function) @@ -594,7 +594,7 @@ stream->write_function(stream, "%s", reply); switch_safe_free(data); - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } @@ -1151,7 +1151,7 @@ p++; } } - end: + end: if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); @@ -1194,7 +1194,7 @@ p++; } } - end: + end: if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); @@ -2270,7 +2270,7 @@ } } - bad: + bad: stream->write_function(stream, "-ERR Invalid syntax. USAGE: %s\n", SCHED_SYNTAX); @@ -2682,7 +2682,7 @@ holder.stream->write_function(holder.stream, "-ERR Cannot find format %s\n", as); } - end: + end: switch_safe_free(mydata); @@ -3100,17 +3100,17 @@ #define SYSTEM_SYNTAX "<command>" SWITCH_STANDARD_API(system_function) { - if (switch_strlen_zero(cmd)) { - stream->write_function(stream, "-USAGE: %s\n", SYSTEM_SYNTAX); - return SWITCH_STATUS_SUCCESS; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd); - if (switch_system(cmd, SWITCH_TRUE) < 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd); - } - stream->write_function(stream, "+OK\n"); - return SWITCH_STATUS_SUCCESS; + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "-USAGE: %s\n", SYSTEM_SYNTAX); + return SWITCH_STATUS_SUCCESS; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n", cmd); + if (switch_system(cmd, SWITCH_TRUE) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Failed to execute command: %s\n", cmd); + } + stream->write_function(stream, "+OK\n"); + return SWITCH_STATUS_SUCCESS; } SWITCH_STANDARD_API(strftime_tz_api_function) @@ -3246,7 +3246,7 @@ switch_console_set_complete("add fsctl shutdown restart asap"); switch_console_set_complete("add fsctl shutdown cancel"); switch_console_set_complete("add fsctl sps"); - switch_console_set_complete("add fsctl sync_clock"); + switch_console_set_complete("add fsctl sync_clock"); switch_console_set_complete("add fsctl reclaim_mem"); switch_console_set_complete("add fsctl max_sessions"); switch_console_set_complete("add fsctl max_dtmf_duration");

1 0

[commit] r11072 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 18:18:00 2009 New Revision: 11072 Log: clean up a little more Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 18:18:00 2009 @@ -44,11 +44,11 @@ typedef struct easyroute_results{ char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; + char destnum[16]; + char dialstring[256]; + char group[16]; char acctcode[17]; - char translated[17]; + char translated[17]; } easyroute_results_t; @@ -170,7 +170,7 @@ if (switch_odbc_handle_exec(globals.master_odbc, "select count(*) from gateways", NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot find SQL Database! (Where\'s the gateways table\?\?)\n"); } - } else { + } else { #endif switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); #ifdef SWITCH_HAVE_ODBC

1 0

[commit] r11163 - freeswitch/trunk/build
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 17:16:12 2009 New Revision: 11163 Log: more info Modified: freeswitch/trunk/build/Makefile Modified: freeswitch/trunk/build/Makefile ============================================================================== --- freeswitch/trunk/build/Makefile (original) +++ freeswitch/trunk/build/Makefile Tue Jan 13 17:16:12 2009 @@ -14,6 +14,9 @@ @echo " + (uhd-sounds includes hd-sounds, sounds) +" @echo " + (hd-sounds includes sounds) +" @echo " + ------------------------------------ +" + @echo " + $(MAKE) cd-sounds-install +" + @echo " + $(MAKE) cd-moh-install +" + @echo " + +" @echo " + $(MAKE) uhd-sounds-install +" @echo " + $(MAKE) uhd-moh-install +" @echo " + +"

1 0

[commit] r11162 - in freeswitch/trunk: src/mod/formats/mod_local_stream support-d
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: brian Date: Tue Jan 13 15:43:55 2009 New Revision: 11162 Log: buffer regressions Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Jan 13 15:43:55 2009 @@ -183,7 +183,7 @@ fname = path_buf; fh.prebuf = source->prebuf; - fh.pre_buffer_datalen = 65536; + fh.pre_buffer_datalen = source->prebuf; if (switch_core_file_open(&fh, (char *) fname, @@ -206,16 +206,23 @@ while (RUNNING) { switch_core_timer_next(&timer); olen = source->samples; + int is_open = switch_test_flag((&fh), SWITCH_FILE_OPEN); - if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) { - switch_core_file_close(&fh); - break; + if (is_open) { + if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS || !olen) { + switch_core_file_close(&fh); + } + + switch_buffer_write(audio_buffer, abuf, olen * 2); } - switch_buffer_write(audio_buffer, abuf, olen * 2); used = switch_buffer_inuse(audio_buffer); - if (used >= source->prebuf || (source->total && used > source->samples * 2)) { + if (!used && !is_open) { + break; + } + + if (!is_open || used >= source->prebuf || (source->total && used > source->samples * 2)) { used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); if (source->total) { @@ -285,6 +292,9 @@ char *alt_path = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; + /* already buffering a step back, so always disable it */ + handle->pre_buffer_datalen = 0; + if (switch_test_flag(handle, SWITCH_FILE_FLAG_WRITE)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This format does not support writing!\n"); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Tue Jan 13 15:43:55 2009 @@ -7,7 +7,7 @@ ;(setq cperl-hairy t) (global-unset-key "\C-h") (global-set-key "\C-h" 'delete-backward-char) -(load "/usr/share/emacs/site-lisp/rng-auto.el") +;(load "/usr/share/emacs/site-lisp/rng-auto.el") (require 'cc-mode) (defun my-build-tab-stop-list (width)

1 0

[commit] r11071 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: silik0n Date: Tue Jan 13 16:43:25 2009 New Revision: 11071 Log: useless comments Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 13 16:43:25 2009 @@ -332,15 +332,6 @@ stream->write_function(stream, "Number \tLimit \tGroup \tAcctCode \tDialstring\n"); stream->write_function(stream, "%-10s\t%-10s\t%-10s\t%-10s\t%s\n", destnum, results.limit, results.group, results.acctcode, results.dialstring); } else { - - /* char limit[16]; - char destnum[16]; - char dialstring[256]; - char group[16]; - char acctcode[17]; - char translated[17]; - */ - if (!strncasecmp(argv[1], "dialstring", 10)) { stream->write_function(stream, "%s", results.dialstring); } else if (!strncasecmp(argv[1], "translated", 10)) {

1 0

[commit] r11161 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: anthm Date: Tue Jan 13 13:02:48 2009 New Revision: 11161 Log: reset rtp media timer when we get a reinvite Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Jan 13 13:02:48 2009 @@ -168,7 +168,7 @@ SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session); SWITCH_DECLARE(switch_port_t) switch_rtp_get_remote_port(switch_rtp_t *rtp_session); - +SWITCH_DECLARE(void) switch_rtp_reset_media_timer(switch_rtp_t *rtp_session); SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max); /*! Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Jan 13 13:02:48 2009 @@ -1817,6 +1817,10 @@ switch_assert(tech_pvt != NULL); switch_mutex_lock(tech_pvt->sofia_mutex); + if (switch_rtp_ready(tech_pvt->rtp_session)) { + switch_rtp_reset_media_timer(tech_pvt->rtp_session); + } + if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) { switch_set_flag_locked(tech_pvt, TFLAG_SECURE); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jan 13 13:02:48 2009 @@ -608,6 +608,11 @@ rtp_session->max_missed_packets = max; } +SWITCH_DECLARE(void) switch_rtp_reset_media_timer(switch_rtp_t *rtp_session) +{ + rtp_session->missed_count = 0; +} + SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session) { return switch_strlen_zero(rtp_session->remote_host_str) ? "0.0.0.0" : rtp_session->remote_host_str;

1 0

[commit] r11160 - in freeswitch/trunk/src: . mod/endpoints/mod_portaudio
by FreeSWITCH SVN 13 Jan '09

13 Jan '09

Author: anthm Date: Tue Jan 13 11:56:35 2009 New Revision: 11160 Log: MODENDP-169 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Jan 13 11:56:35 2009 @@ -801,6 +801,7 @@ } globals.indev = globals.outdev = globals.ringdev = -1; + globals.sample_rate = 8000; if ((settings = switch_xml_child(cfg, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { @@ -821,7 +822,7 @@ globals.sample_rate = atoi(val); } else if (!strcmp(var, "codec-ms")) { int tmp = atoi(val); - if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + if (switch_check_interval(globals.sample_rate, tmp)) { globals.codec_ms = tmp; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Jan 13 11:56:35 2009 @@ -1007,6 +1007,13 @@ return SWITCH_STATUS_SUCCESS; } +static void ping_socket(switch_rtp_t *rtp_session) +{ + uint32_t o = UINT_MAX; + switch_size_t len = sizeof(o); + switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); +} + SWITCH_DECLARE(void) switch_rtp_break(switch_rtp_t *rtp_session) { if (!switch_rtp_ready(rtp_session)) { @@ -1023,9 +1030,7 @@ } if (rtp_session->sock_input) { - uint32_t o = UINT_MAX; - switch_size_t len = sizeof(o); - switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) &o, &len); + ping_socket(rtp_session); } switch_mutex_unlock(rtp_session->flag_mutex); } @@ -1037,6 +1042,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO); if (rtp_session->sock_input) { + ping_socket(rtp_session); switch_socket_shutdown(rtp_session->sock_input, SWITCH_SHUTDOWN_READWRITE); } if (rtp_session->sock_output && rtp_session->sock_output != rtp_session->sock_input) {

1 0