May 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8432 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 10:43:21 2008 New Revision: 8432 Modified: freeswitch/trunk/src/switch_core_io.c Log: tweak asserts. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Fri May 16 10:43:21 2008 @@ -61,6 +61,8 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_io_event_hook_video_read_frame_t *ptr; + switch_assert(session != NULL); + if (switch_channel_get_state(session->channel) >= CS_HANGUP) { return SWITCH_STATUS_FALSE; } @@ -84,7 +86,6 @@ goto done; } - switch_assert(session != NULL); switch_assert(*frame != NULL); if (switch_test_flag(*frame, SFF_CNG)) { @@ -104,7 +105,9 @@ int need_codec, perfect, do_bugs = 0, do_resample = 0, is_cng = 0; unsigned int flag = 0; - top: + switch_assert(session != NULL); + +top: if (switch_channel_get_state(session->channel) >= CS_HANGUP) { *frame = NULL; @@ -115,7 +118,6 @@ status = SWITCH_STATUS_FALSE; need_codec = perfect = 0; - switch_assert(session != NULL); *frame = NULL; if (switch_channel_test_flag(session->channel, CF_HOLD)) { @@ -142,7 +144,6 @@ goto done; } - switch_assert(session != NULL); switch_assert(*frame != NULL); if (switch_test_flag(*frame, SFF_PROXY_PACKET)) {

1 0

[commit] r8431 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 10:35:41 2008 New Revision: 8431 Modified: freeswitch/trunk/src/switch_core.c Log: check value before using. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri May 16 10:35:41 2008 @@ -581,12 +581,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_mime_add_type(const char *type, const char *ext) { - const char *check = (const char *) switch_core_hash_find(runtime.mime_types, ext); + const char *check; switch_status_t status = SWITCH_STATUS_FALSE; switch_assert(type); switch_assert(ext); + check = (const char *) switch_core_hash_find(runtime.mime_types, ext); + if (!check) { char *ptype = switch_core_permanent_strdup(type); char *ext_list = strdup(ext);

1 0

[commit] r8430 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 10:32:35 2008 New Revision: 8430 Modified: freeswitch/trunk/src/switch_core.c Log: don't use unchecked malloc results. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Fri May 16 10:32:35 2008 @@ -369,6 +369,16 @@ runtime.memory_pool); switch_safe_free(dir_path); + switch_assert(SWITCH_GLOBAL_dirs.base_dir); + switch_assert(SWITCH_GLOBAL_dirs.mod_dir); + switch_assert(SWITCH_GLOBAL_dirs.conf_dir); + switch_assert(SWITCH_GLOBAL_dirs.log_dir); + switch_assert(SWITCH_GLOBAL_dirs.db_dir); + switch_assert(SWITCH_GLOBAL_dirs.script_dir); + switch_assert(SWITCH_GLOBAL_dirs.htdocs_dir); + switch_assert(SWITCH_GLOBAL_dirs.grammar_dir); + switch_assert(SWITCH_GLOBAL_dirs.temp_dir); + switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);

1 0

[commit] r8429 - freeswitch/trunk/src
by Freeswitch SVN 16 May '08

16 May '08

Author: anthm Date: Fri May 16 09:16:27 2008 New Revision: 8429 Modified: freeswitch/trunk/src/switch_core_session.c Log: updatew Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri May 16 09:16:27 2008 @@ -571,7 +571,9 @@ SWITCH_DECLARE(uint32_t) switch_core_session_private_event_count(switch_core_session_t *session) { - if (session->private_event_queue) { + switch_channel_t *channel = switch_core_session_get_channel(session); + + if (!switch_channel_test_flag(channel, CF_EVENT_LOCK) && session->private_event_queue) { return switch_queue_size(session->private_event_queue); }

1 0

[commit] r8428 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 00:04:41 2008 New Revision: 8428 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: no need to set this var twice. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri May 16 00:04:41 2008 @@ -3164,12 +3164,8 @@ uint32_t x = 0; int ok = 1; char *last_acl = NULL; - const char *contact_host = NULL; - if (sip && sip->sip_contact && sip->sip_contact->m_url && sip->sip_contact->m_url->url_host) { - contact_host = sip->sip_contact->m_url->url_host; - } - if (contact_host) { + if (!switch_strlen_zero(contact_host)) { for (x = 0 ; x < profile->nat_acl_count; x++) { last_acl = profile->nat_acl[x]; if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) { @@ -3184,10 +3180,6 @@ } } } - - - - return; }

1 0

[commit] r8427 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 16 May '08

16 May '08

Author: mikej Date: Fri May 16 00:01:56 2008 New Revision: 8427 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: don't push null values into the hash Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Fri May 16 00:01:56 2008 @@ -266,9 +266,9 @@ need_vars_map = 1; } - if(vars_map) - if (switch_core_hash_insert(vars_map,val,ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n",val); + if (vars_map && val) + if (switch_core_hash_insert(vars_map, val, ENABLE_PARAM_VALUE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cant add %s to params hash!\n",val); } }

1 0

[commit] r8426 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 15 May '08

15 May '08

Author: stkn Date: Thu May 15 17:43:52 2008 New Revision: 8426 Modified: freeswitch/trunk/src/mod/languages/mod_lua/Makefile Log: Pass CC to lua make, fixes building on (open-)solaris Modified: freeswitch/trunk/src/mod/languages/mod_lua/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/Makefile Thu May 15 17:43:52 2008 @@ -11,7 +11,7 @@ local_depend: $(LOCAL_OBJS) $(LIBLUA_A): - cd lua && $(MAKE) CFLAGS="$(ALL_CFLAGS) -DLUA_USE_LINUX -w" liblua.a + cd lua && $(MAKE) CC="$(CC)" CFLAGS="$(ALL_CFLAGS) -DLUA_USE_LINUX -w" liblua.a luaclean: cd lua && $(MAKE) clean

1 0

[commit] r8425 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 15 May '08

15 May '08

Author: anthm Date: Thu May 15 17:36:32 2008 New Revision: 8425 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_bridge.c Log: make the impossible possible 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 Thu May 15 17:36:32 2008 @@ -1404,19 +1404,24 @@ switch_channel_set_flag(channel, CF_INNER_BRIDGE); switch_ivr_multi_threaded_bridge(session, peer_session, xfer_on_dtmf, peer_session, NULL); - + + switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); + switch_channel_clear_flag(channel, CF_INNER_BRIDGE); + if (bond) { switch_core_session_t *b_session; char buf[128] = ""; - if ((b_session = switch_core_session_locate(bond))) { + if (!switch_channel_ready(channel)) { + switch_ivr_uuid_bridge(switch_core_session_get_uuid(peer_session), bond); + } else if ((b_session = switch_core_session_locate(bond))) { switch_channel_t *b_channel = switch_core_session_get_channel(b_session); switch_snprintf(buf, sizeof(buf), "%s %s", switch_core_session_get_uuid(peer_session), switch_core_session_get_uuid(session)); switch_channel_set_variable(b_channel, "xfer_uuids", buf); switch_snprintf(buf, sizeof(buf), "%s %s", switch_core_session_get_uuid(peer_session), bond); switch_channel_set_variable(channel, "xfer_uuids", buf); - + switch_core_event_hook_add_state_change(session, hanguphook); switch_core_event_hook_add_state_change(b_session, hanguphook); Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Thu May 15 17:36:32 2008 @@ -369,8 +369,8 @@ switch_channel_clear_state_handler(channel, &audio_bridge_peer_state_handlers); state = switch_channel_get_state(channel); - - if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_ROUTING) { + + if (!switch_channel_test_flag(channel, CF_TRANSFER) && state != CS_PARK && state != CS_ROUTING && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); }

1 0

[commit] r8424 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:31:47 2008 New Revision: 8424 Modified: freeswitch/trunk/src/switch_log.c Log: Avoid fflush-ing NULL. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu May 15 17:31:47 2008 @@ -311,7 +311,9 @@ switch_safe_free(data); switch_safe_free(new_fmt); - fflush(handle); + if (handle) { + fflush(handle); + } } SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool)

1 0

[commit] r8423 - freeswitch/trunk/src
by Freeswitch SVN 15 May '08

15 May '08

Author: mikej Date: Thu May 15 17:25:26 2008 New Revision: 8423 Modified: freeswitch/trunk/src/switch_console.c Log: Avoid non null terminated string. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu May 15 17:25:26 2008 @@ -824,7 +824,7 @@ for (x = 0; x < (sizeof(cmd) - 1); x++) { int c = getchar(); if (c < 0) { - int y = read(fileno(stdin), cmd, sizeof(cmd)); + int y = read(fileno(stdin), cmd, sizeof(cmd) - 1); cmd[y - 1] = '\0'; break; }

1 0