February 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7634 - freeswitch/trunk/src/mod/applications/mod_limit
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:25:23 2008 New Revision: 7634 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Log: MODAPP-76 Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Feb 15 16:25:23 2008 @@ -353,7 +353,7 @@ assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + sql = switch_mprintf("insert into db_data (hostname, realm, data_key, data) values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); @@ -421,7 +421,7 @@ limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); - sql = switch_mprintf("insert into db_data values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); + sql = switch_mprintf("insert into db_data (hostname, realm, data_key, data) values('%q','%q','%q','%q');", globals.hostname, argv[1], argv[2], argv[3]); } else if (!strcasecmp(argv[0], "delete")) { sql = switch_mprintf("delete from db_data where realm='%q' and data_key='%q'", argv[1], argv[2]); } @@ -464,7 +464,7 @@ limit_execute_sql(sql, NULL); switch_safe_free(sql); - sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); + sql = switch_mprintf("insert into group_data (hostname, groupname, url) values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); assert(sql); limit_execute_sql(sql, NULL); switch_safe_free(sql); @@ -538,7 +538,7 @@ } if (!strcasecmp(argv[0], "insert")) { - sql = switch_mprintf("insert into group_data values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); + sql = switch_mprintf("insert into group_data (hostname, groupname, url) values('%q','%q','%q');", globals.hostname, argv[1], argv[2]); assert(sql); limit_execute_sql(sql, globals.mutex); switch_safe_free(sql); @@ -611,7 +611,7 @@ } switch_core_event_hook_add_state_change(session, hanguphook); - sql = switch_mprintf("insert into limit_data values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); + sql = switch_mprintf("insert into limit_data (hostname, realm, id, uuid) values('%q','%q','%q','%q');", globals.hostname, realm, id, switch_core_session_get_uuid(session)); limit_execute_sql(sql, NULL); switch_safe_free(sql);

1 0

[commit] r7633 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:16:39 2008 New Revision: 7633 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: make multicast event handler nonblocking Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Feb 15 16:16:39 2008 @@ -237,6 +237,7 @@ return SWITCH_STATUS_GENERR; } + switch_socket_opt_set(globals.udp_socket, SWITCH_SO_NONBLOCK, TRUE); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; @@ -247,10 +248,6 @@ { int x = 0; - if (globals.udp_socket) { - switch_socket_shutdown(globals.udp_socket, SWITCH_SHUTDOWN_READWRITE); - } - if (globals.running == 1) { globals.running = -1; while (x < 100000 && globals.running) { @@ -282,53 +279,62 @@ while (globals.running == 1) { char *myaddr; size_t len = MULTICAST_BUFFSIZE; + char *packet; + uint64_t host_hash = 0; + switch_status_t status; memset(buf, 0, len); - + switch_sockaddr_ip_get(&myaddr, globals.addr); + status = switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len); + + if (!len) { + if (SWITCH_STATUS_IS_BREAK(status)) { + switch_yield(100000); + continue; + } - if (switch_socket_recvfrom(addr, globals.udp_socket, 0, buf, &len) == SWITCH_STATUS_SUCCESS) { - char *packet; - uint64_t host_hash = 0; + break; + } - memcpy(&host_hash, buf, sizeof(host_hash)); - packet = buf + sizeof(host_hash); + memcpy(&host_hash, buf, sizeof(host_hash)); + packet = buf + sizeof(host_hash); - if (host_hash == globals.host_hash) { - continue; - } - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); - if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { - char *var, *val, *term = NULL, tmpname[128]; - switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes"); - var = packet; - while (*var) { - if ((val = strchr(var, ':')) != 0) { - *val++ = '\0'; - while (*val == ' ') { - val++; - } - if ((term = strchr(val, '\r')) != 0 || (term = strchr(val, '\n')) != 0) { - *term = '\0'; - while (*term == '\r' || *term == '\n') { - term++; - } + if (host_hash == globals.host_hash) { + continue; + } + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT %d\n--------------------------------\n%s\n", (int) len, packet); + if (switch_event_create_subclass(&local_event, SWITCH_EVENT_CUSTOM, MULTICAST_EVENT) == SWITCH_STATUS_SUCCESS) { + char *var, *val, *term = NULL, tmpname[128]; + switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, "Multicast", "yes"); + var = packet; + while (*var) { + if ((val = strchr(var, ':')) != 0) { + *val++ = '\0'; + while (*val == ' ') { + val++; + } + if ((term = strchr(val, '\r')) != 0 || (term = strchr(val, '\n')) != 0) { + *term = '\0'; + while (*term == '\r' || *term == '\n') { + term++; } - switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); - switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, tmpname, "%s", val); - var = term + 1; - } else { - break; } + switch_snprintf(tmpname, sizeof(tmpname), "Orig-%s", var); + switch_event_add_header(local_event, SWITCH_STACK_BOTTOM, tmpname, "%s", val); + var = term + 1; + } else { + break; } + } - if (var && strlen(var) > 1) { - switch_event_add_body(local_event, var); - } + if (var && strlen(var) > 1) { + switch_event_add_body(local_event, var); + } - switch_event_fire(&local_event); + switch_event_fire(&local_event); - } } + } globals.running = 0;

1 0

[commit] r7632 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:05:37 2008 New Revision: 7632 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: help SwK nuke some more telcos 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 Fri Feb 15 16:05:37 2008 @@ -1943,7 +1943,6 @@ case 603: return SWITCH_CAUSE_CALL_REJECTED; case 404: - return SWITCH_CAUSE_UNALLOCATED; case 485: case 604: return SWITCH_CAUSE_NO_ROUTE_DESTINATION;

1 0

[commit] r7631 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 16:03:51 2008 New Revision: 7631 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: help SwK nuke some more telcos Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Fri Feb 15 16:03:51 2008 @@ -280,7 +280,7 @@ if (tech_pvt->nh && !switch_test_flag(tech_pvt, TFLAG_BYE)) { if (switch_test_flag(tech_pvt, TFLAG_ANS)) { char reason[128] = ""; - if (cause < 128) { + if (cause > 1 && cause < 128) { switch_snprintf(reason, sizeof(reason), "Q.850;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } else { switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause));

1 0

[commit] r7630 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 15:42:58 2008 New Revision: 7630 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: allocate less Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Feb 15 15:42:58 2008 @@ -141,8 +141,6 @@ static void event_handler(switch_event_t *event) { - char *buf; - size_t len; uint8_t send = 0; if (globals.running != 1) { @@ -154,9 +152,6 @@ return; } - buf = (char *) malloc(MULTICAST_BUFFSIZE); - switch_assert(buf); - if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) { send = 1; } else if ((globals.event_list[(uint8_t) event->event_id])) { @@ -170,22 +165,22 @@ switch (event->event_id) { case SWITCH_EVENT_LOG: - goto end; + return; default: switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Multicast-Sender", "%s", globals.hostname); if (switch_event_serialize(event, &packet, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { + size_t len = strlen(packet) + sizeof(globals.host_hash); + char *buf = malloc(len + 1); + switch_assert(buf); memcpy(buf, &globals.host_hash, sizeof(globals.host_hash)); - switch_copy_string(buf + sizeof(globals.host_hash), packet, MULTICAST_BUFFSIZE - sizeof(globals.host_hash)); - len = strlen(packet) + sizeof(globals.host_hash);; - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "\nEVENT\n--------------------------------\n%s\n", buf); + switch_copy_string(buf + sizeof(globals.host_hash), packet, len - sizeof(globals.host_hash)); switch_socket_sendto(globals.udp_socket, globals.addr, 0, buf, &len); switch_safe_free(packet); + switch_safe_free(buf); } break; } } -end: - free(buf); return; }

1 0

[commit] r7629 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 15:33:16 2008 New Revision: 7629 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: can you seg me now? Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Feb 15 15:33:16 2008 @@ -145,14 +145,18 @@ size_t len; uint8_t send = 0; - buf = (char *) malloc(MULTICAST_BUFFSIZE); - switch_assert(buf); + if (globals.running != 1) { + return; + } if (event->subclass && !strcmp(event->subclass->name, MULTICAST_EVENT)) { /* ignore our own events to avoid ping pong */ return; } + buf = (char *) malloc(MULTICAST_BUFFSIZE); + switch_assert(buf); + if (globals.event_list[(uint8_t) SWITCH_EVENT_ALL]) { send = 1; } else if ((globals.event_list[(uint8_t) event->event_id])) { @@ -250,8 +254,6 @@ if (globals.udp_socket) { switch_socket_shutdown(globals.udp_socket, SWITCH_SHUTDOWN_READWRITE); - switch_socket_close(globals.udp_socket); - globals.udp_socket = NULL; } if (globals.running == 1) { @@ -262,6 +264,11 @@ } } + if (globals.udp_socket) { + switch_socket_close(globals.udp_socket); + globals.udp_socket = NULL; + } + switch_core_hash_destroy(&globals.event_hash); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r7628 - freeswitch/trunk/src
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 15:31:10 2008 New Revision: 7628 Modified: freeswitch/trunk/src/switch_rtp.c Log: move invalid check/handler up in switch_rtp Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Feb 15 15:31:10 2008 @@ -1043,6 +1043,26 @@ switch_core_timer_step(&rtp_session->timer); } + if (bytes && rtp_session->recv_msg.header.version != 2) { + uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; + if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { + handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); + } + + if (rtp_session->invalid_handler) { + rtp_session->invalid_handler(rtp_session, rtp_session->sock, (void *) &rtp_session->recv_msg, bytes, rtp_session->from_addr); + } + + memset(data, 0, 2); + data[0] = 65; + + rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD; + *flags |= SFF_CNG; + *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; + ret = 2 + rtp_header_len; + goto end; + } + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_RECV)) { int sbytes = (int) bytes; err_status_t stat = 0; @@ -1063,7 +1083,6 @@ stat = srtp_unprotect(rtp_session->recv_ctx, &rtp_session->recv_msg.header, &sbytes); - if (stat && rtp_session->recv_msg.header.pt != rtp_session->te && rtp_session->recv_msg.header.pt != rtp_session->cng_pt) { if (++rtp_session->srtp_errs >= MAX_SRTP_ERRS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, @@ -1225,26 +1244,6 @@ } } - if (bytes && rtp_session->recv_msg.header.version != 2) { - uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; - if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { - handle_ice(rtp_session, (void *) &rtp_session->recv_msg, bytes); - } - - if (rtp_session->invalid_handler) { - rtp_session->invalid_handler(rtp_session, rtp_session->sock, (void *) &rtp_session->recv_msg, bytes, rtp_session->from_addr); - } - - memset(data, 0, 2); - data[0] = 65; - - rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD; - *flags |= SFF_CNG; - *payload_type = (switch_payload_t)rtp_session->recv_msg.header.pt; - ret = 2 + rtp_header_len; - goto end; - } - if (bytes > 0) { rtp_session->missed_count = 0; }

1 0

[commit] r7627 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 15:29:49 2008 New Revision: 7627 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/conf/autoload_configs/logfile.conf.xml Log: thanks mcollins Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Fri Feb 15 15:29:49 2008 @@ -31,6 +31,22 @@ <map name="mod_sndfile.c" value="warning,info,debug"/> --> <map name="all" value="debug,info,notice,warning,err,crit,alert"/> + +  </mappings> <settings>  Modified: freeswitch/trunk/conf/autoload_configs/logfile.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/logfile.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/logfile.conf.xml Fri Feb 15 15:29:49 2008 @@ -15,6 +15,7 @@  <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings>

1 0

[commit] r7626 - in freeswitch/trunk/src: include mod/applications/mod_conference mod/codecs/mod_voipcodecs mod/endpoints/mod_alsa mod/endpoints/mod_portaudio mod/formats/mod_local_stream
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: brian Date: Fri Feb 15 15:11:44 2008 New Revision: 7626 Modified: freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: interval tweaks Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Fri Feb 15 15:11:44 2008 @@ -353,30 +353,30 @@ /*! deinitalize a codec handle using this implementation */ switch_core_codec_destroy_func_t destroy) { - - switch_codec_implementation_t *impl = (switch_codec_implementation_t *) switch_core_alloc(pool, sizeof(*impl)); - impl->codec_type = codec_type; - impl->ianacode = ianacode; - impl->iananame = iananame; - impl->fmtp = fmtp; - impl->samples_per_second = samples_per_second; - impl->actual_samples_per_second = actual_samples_per_second; - impl->bits_per_second = bits_per_second; - impl->microseconds_per_frame = microseconds_per_frame; - impl->samples_per_frame = samples_per_frame; - impl->bytes_per_frame = bytes_per_frame; - impl->encoded_bytes_per_frame = encoded_bytes_per_frame; - impl->number_of_channels = number_of_channels; - impl->pref_frames_per_packet = pref_frames_per_packet; - impl->max_frames_per_packet = max_frames_per_packet; - impl->init = init; - impl->encode = encode; - impl->decode = decode; - impl->destroy = destroy; - - impl->next = codec_interface->implementations; - codec_interface->implementations = impl; - + if (SWITCH_ACCEPTABLE_INTERVAL(microseconds_per_frame / 1000)) { + switch_codec_implementation_t *impl = (switch_codec_implementation_t *) switch_core_alloc(pool, sizeof(*impl)); + impl->codec_type = codec_type; + impl->ianacode = ianacode; + impl->iananame = iananame; + impl->fmtp = fmtp; + impl->samples_per_second = samples_per_second; + impl->actual_samples_per_second = actual_samples_per_second; + impl->bits_per_second = bits_per_second; + impl->microseconds_per_frame = microseconds_per_frame; + impl->samples_per_frame = samples_per_frame; + impl->bytes_per_frame = bytes_per_frame; + impl->encoded_bytes_per_frame = encoded_bytes_per_frame; + impl->number_of_channels = number_of_channels; + impl->pref_frames_per_packet = pref_frames_per_packet; + impl->max_frames_per_packet = max_frames_per_packet; + impl->init = init; + impl->encode = encode; + impl->decode = decode; + impl->destroy = destroy; + + impl->next = codec_interface->implementations; + codec_interface->implementations = impl; + } } ///\} Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Feb 15 15:11:44 2008 @@ -306,7 +306,7 @@ #define SWITCH_CORE_QUEUE_LEN 100000 #define SWITCH_MAX_MANAGEMENT_BUFFER_LEN 1024 * 8 -#define SWITCH_ACCEPTABLE_INTERVAL(_i) (_i <= SWITCH_MAX_INTERVAL && (_i % 10) == 0) +#define SWITCH_ACCEPTABLE_INTERVAL(_i) (_i && _i <= SWITCH_MAX_INTERVAL && (_i % 10) == 0) typedef enum { SWITCH_CPF_SCREEN = (1 << 0), Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Feb 15 15:11:44 2008 @@ -4618,8 +4618,6 @@ { conference_obj_t *conference; switch_xml_t xml_kvp; - char *rate_name = NULL; - char *interval_name = NULL; char *timer_name = NULL; char *domain = NULL; char *tts_engine = NULL; @@ -4679,12 +4677,18 @@ if (!strcasecmp(var, "rate") && !switch_strlen_zero(val)) { uint32_t tmp = atoi(val); if (tmp == 8000 || tmp == 16000 || tmp == 32000) { - rate_name = val; + rate = tmp; } } else if (!strcasecmp(var, "domain") && !switch_strlen_zero(val)) { domain = val; } else if (!strcasecmp(var, "interval") && !switch_strlen_zero(val)) { - interval_name = val; + uint32_t tmp = atoi(val); + if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + interval = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL); + } } else if (!strcasecmp(var, "timer-name") && !switch_strlen_zero(val)) { timer_name = val; } else if (!strcasecmp(var, "tts-engine") && !switch_strlen_zero(val)) { @@ -4766,22 +4770,6 @@ /* Set defaults and various paramaters */ - /* Speed in hertz */ - if (!switch_strlen_zero(rate_name)) { - uint32_t r = atoi(rate_name); - if (r) { - rate = r; - } - } - - /* Packet Interval in milliseconds */ - if (!switch_strlen_zero(interval_name)) { - uint32_t i = atoi(interval_name); - if (i) { - interval = i; - } - } - /* Timer module to use */ if (switch_strlen_zero(timer_name)) { timer_name = "soft"; Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Fri Feb 15 15:11:44 2008 @@ -684,12 +684,13 @@ switch_gsm_init, switch_gsm_encode, switch_gsm_decode, switch_gsm_destroy); } /* LPC10 */ - SWITCH_ADD_CODEC(codec_interface, "LPC-10"); - switch_core_codec_add_implementation(pool, codec_interface, - SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, - 90000, 720, 1440, 28, 1, 1, 1, - switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); - + if (SWITCH_MAX_INTERVAL >= 90) { + SWITCH_ADD_CODEC(codec_interface, "LPC-10"); + switch_core_codec_add_implementation(pool, codec_interface, + SWITCH_CODEC_TYPE_AUDIO, 7, "LPC", NULL, 8000, 8000, 2400, + 90000, 720, 1440, 28, 1, 1, 1, + switch_lpc10_init, switch_lpc10_encode, switch_lpc10_decode, switch_lpc10_destroy); + } /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Fri Feb 15 15:11:44 2008 @@ -905,7 +905,13 @@ } else if (!strcmp(var, "sample-rate")) { globals.sample_rate = atoi(val); } else if (!strcmp(var, "codec-ms")) { - globals.codec_ms = atoi(val); + int tmp = atoi(val); + if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + globals.codec_ms = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "codec-ms must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL); + } } else if (!strcmp(var, "dialplan")) { set_global_dialplan(val); } else if (!strcmp(var, "cid-name")) { 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 Fri Feb 15 15:11:44 2008 @@ -782,7 +782,13 @@ } else if (!strcmp(var, "sample-rate")) { globals.sample_rate = atoi(val); } else if (!strcmp(var, "codec-ms")) { - globals.codec_ms = atoi(val); + int tmp = atoi(val); + if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { + globals.codec_ms = tmp; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "codec-ms must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL); + } } else if (!strcmp(var, "dialplan")) { set_global_dialplan(val); } else if (!strcmp(var, "cid-name")) { 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 Fri Feb 15 15:11:44 2008 @@ -414,10 +414,11 @@ } } else if (!strcasecmp(var, "interval")) { int tmp = atoi(val); - if (tmp >= 10) { + if (SWITCH_ACCEPTABLE_INTERVAL(tmp)) { source->interval = tmp; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't set interval to less than 10\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Interval must be multipe of 10 and less than %d, Using default of 20\n", SWITCH_MAX_INTERVAL); } } else if (!strcasecmp(var, "timer-name")) { source->timer_name = switch_core_strdup(source->pool, val);

1 0

[commit] r7625 - freeswitch/trunk/src/mod/event_handlers/mod_event_multicast
by Freeswitch SVN 15 Feb '08

15 Feb '08

Author: anthm Date: Fri Feb 15 14:55:19 2008 New Revision: 7625 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Log: update Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Fri Feb 15 14:55:19 2008 @@ -248,13 +248,22 @@ { int x = 0; - switch_socket_shutdown(globals.udp_socket, SWITCH_SHUTDOWN_READWRITE); - globals.running = -1; - while (x < 100000 && globals.running) { - x++; - switch_yield(1000); + if (globals.udp_socket) { + switch_socket_shutdown(globals.udp_socket, SWITCH_SHUTDOWN_READWRITE); + switch_socket_close(globals.udp_socket); + globals.udp_socket = NULL; } + + if (globals.running == 1) { + globals.running = -1; + while (x < 100000 && globals.running) { + x++; + switch_yield(1000); + } + } + switch_core_hash_destroy(&globals.event_hash); + return SWITCH_STATUS_SUCCESS; }

1 0