March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12374 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:19:09 2009 New Revision: 12374 Log: Tue Mar 3 07:56:30 CST 2009 Pekka Pessi <first.last(a)nokia.com> * tport.c: add TPTAG_LOG() and TPTAG_DUMP() to tport_get_params() Fixed return value from tport_set_params(), too. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:19:09 2009 @@ -1 +1 @@ -Thu Feb 26 12:40:06 CST 2009 +Tue Mar 3 11:18:41 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c Tue Mar 3 11:19:09 2009 @@ -472,6 +472,7 @@ tp_name_t const *tpn; tport_t *tp; unsigned idle; + int logging = -1; BEGIN(); @@ -552,6 +553,15 @@ TPTAG_IDLE_REF(idle), TAG_END()), 1); + /* Check that logging tag works */ + TEST(tport_get_params(tt->tt_srv_tports, + TPTAG_LOG_REF(logging), + TAG_END()), 1); + TEST(tport_set_params(tt->tt_srv_tports, + TPTAG_LOG(logging), + TAG_END()), 1); + + for (tp = tport_primaries(tt->tt_srv_tports); tp; tp = tport_next(tp)) TEST_S(tport_name(tp)->tpn_ident, "server"); @@ -1298,6 +1308,7 @@ TEST_1(pending_client_close > 0); tp = tt->tt_rtport; pending_server_close = tport_pend(tp, NULL, server_closed_callback, NULL); + TEST_1(pending_server_close > 0); /* Send a largish message */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Tue Mar 3 11:19:09 2009 @@ -1196,6 +1196,7 @@ int n; tport_params_t const *tpp; int connect; + tport_master_t *mr = self->tp_master; if (self == NULL) return su_seterrno(EINVAL); @@ -1227,6 +1228,10 @@ TPTAG_PUBLIC(self->tp_pri ? self->tp_pri->pri_public : 0)), TPTAG_TOS(tpp->tpp_tos), + TAG_IF((void *)self == (void *)mr, + TPTAG_LOG(mr->mr_log != 0)), + TAG_IF((void *)self == (void *)mr, + TPTAG_DUMP(mr->mr_dump)), TAG_END()); ta_end(ta); @@ -1321,7 +1326,7 @@ tpp->tpp_pong2ping = pong2ping; if (memcmp(tpp0, tpp, sizeof tpp) == 0) - return n; + return n + m; if (tport_is_secondary(self) && self->tp_params == self->tp_pri->pri_primary->tp_params) {

1 0

[commit] r12373 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:14:58 2009 New Revision: 12373 Log: Revert 12369 since inserting NULL is the same as deleting in sqlite3 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:14:58 2009 @@ -410,14 +410,6 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! - \brief Unsets private from a given channel - \param channel channel to unsets data from - \param key your private data's unique keyname - \return void SWITCH_STATUS_SUCCESS if data was unset -*/ -SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); - -/*! \brief Assign a name to a given channel \param channel channel to assign name to \param name name to assign Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 3 11:14:58 2009 @@ -565,18 +565,6 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key) -{ - switch_status_t status; - switch_assert(channel != NULL); - - switch_mutex_lock(channel->profile_mutex); - status = switch_core_hash_delete(channel->private_hash, key); - switch_mutex_unlock(channel->profile_mutex); - - return status; -} - SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 11:14:58 2009 @@ -188,7 +188,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_unset_private(channel, dh->file); + switch_channel_set_private(channel, dh->file, NULL); } } break; @@ -269,7 +269,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_unset_private(channel, dh->file); + switch_channel_set_private(channel, dh->file, NULL); } } break;

1 0

[commit] r12372 - freeswitch/trunk/src/include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:05:17 2009 New Revision: 12372 Log: Fix doxygen comment without messing with the rest Modified: freeswitch/trunk/src/include/switch_channel.h Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:05:17 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return void pointer to channel's private data + \return void SWITCH_STATUS_SUCCESS if data was unset */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);

1 0

[commit] r12371 - in freeswitch/trunk/src: . include mod/applications/mod_limit mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:03:48 2009 New Revision: 12371 Log: Revert 12370 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_db.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:03:48 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return SWITCH_STATUS_SUCCESS if data was unset + \return void pointer to channel's private data */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); 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 Tue Mar 3 11:03:48 2009 @@ -289,7 +289,7 @@ sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname); limit_execute_sql(sql, globals.mutex); - switch_core_db_free(sql); + switch_safe_free(sql); switch_xml_free(xml); 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 Mar 3 11:03:48 2009 @@ -3133,7 +3133,7 @@ switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); @@ -3143,7 +3143,7 @@ switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { @@ -3158,21 +3158,21 @@ switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); for (x = 0; indexes[x]; x++) { switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); @@ -3192,28 +3192,28 @@ mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); - switch_core_db_free(test_sql); + free(test_sql); switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 3 11:03:48 2009 @@ -758,7 +758,7 @@ end: - switch_core_db_free(mime_path); + switch_safe_free(mime_path); } @@ -1034,7 +1034,7 @@ dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); - switch_core_db_free(dir_path); + switch_safe_free(dir_path); 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); Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Tue Mar 3 11:03:48 2009 @@ -85,7 +85,7 @@ ret = sqlite3_exec(db, sql, callback, data, &err); if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { - switch_core_db_free(err); + switch_safe_free(err); switch_cond_next(); continue; }

1 0

[commit] r12370 - in freeswitch/trunk/src: . include mod/applications/mod_limit mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:01:50 2009 New Revision: 12370 Log: fix doxygen comment Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_db.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:01:50 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return void pointer to channel's private data + \return SWITCH_STATUS_SUCCESS if data was unset */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); 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 Tue Mar 3 11:01:50 2009 @@ -289,7 +289,7 @@ sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname); limit_execute_sql(sql, globals.mutex); - switch_safe_free(sql); + switch_core_db_free(sql); switch_xml_free(xml); 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 Mar 3 11:01:50 2009 @@ -3133,7 +3133,7 @@ switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); @@ -3143,7 +3143,7 @@ switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { @@ -3158,21 +3158,21 @@ switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); for (x = 0; indexes[x]; x++) { switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); @@ -3192,28 +3192,28 @@ mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); - free(test_sql); + switch_core_db_free(test_sql); switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 3 11:01:50 2009 @@ -758,7 +758,7 @@ end: - switch_safe_free(mime_path); + switch_core_db_free(mime_path); } @@ -1034,7 +1034,7 @@ dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); - switch_safe_free(dir_path); + switch_core_db_free(dir_path); 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); Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Tue Mar 3 11:01:50 2009 @@ -85,7 +85,7 @@ ret = sqlite3_exec(db, sql, callback, data, &err); if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { - switch_safe_free(err); + switch_core_db_free(err); switch_cond_next(); continue; }

1 0

[commit] r12369 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 10:58:24 2009 New Revision: 12369 Log: MODAPP-244 bkw stop trying to commit faster than me :P Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 10:58:24 2009 @@ -410,6 +410,14 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! + \brief Unsets private from a given channel + \param channel channel to unsets data from + \param key your private data's unique keyname + \return void pointer to channel's private data +*/ +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); + +/*! \brief Assign a name to a given channel \param channel channel to assign name to \param name name to assign Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 3 10:58:24 2009 @@ -565,6 +565,18 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key) +{ + switch_status_t status; + switch_assert(channel != NULL); + + switch_mutex_lock(channel->profile_mutex); + status = switch_core_hash_delete(channel->private_hash, key); + switch_mutex_unlock(channel->profile_mutex); + + return status; +} + SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 10:58:24 2009 @@ -188,7 +188,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break; @@ -269,7 +269,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break;

1 0

[commit] r12368 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: brian Date: Tue Mar 3 10:55:07 2009 New Revision: 12368 Log: fix MODAPP-224 Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 10:55:07 2009 @@ -182,7 +182,14 @@ break; case SWITCH_ABC_TYPE_CLOSE: if (dh) { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + switch_core_file_close(&dh->fh); + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } } break; case SWITCH_ABC_TYPE_READ_REPLACE: @@ -256,7 +263,14 @@ break; case SWITCH_ABC_TYPE_CLOSE: if (dh) { + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel; + switch_core_file_close(&dh->fh); + + if (session && (channel = switch_core_session_get_channel(session))) { + switch_channel_set_private(channel, dh->file, NULL); + } } break; case SWITCH_ABC_TYPE_WRITE_REPLACE:

1 0

[commit] r12367 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: anthm Date: Tue Mar 3 08:21:26 2009 New Revision: 12367 Log: MODAPP-225 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 Tue Mar 3 08:21:26 2009 @@ -2886,6 +2886,8 @@ args.buf = buf; args.buflen = sizeof(buf); + switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL); + if (!switch_strlen_zero(greet_path)) { memset(buf, 0, sizeof(buf)); TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args));

1 0

[commit] r12366 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: anthm Date: Tue Mar 3 08:17:28 2009 New Revision: 12366 Log: FSCORE-316 Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Mar 3 08:17:28 2009 @@ -1475,7 +1475,7 @@ break; } if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) { - if ((x + 3) >= len) { + if ((x + 3) > len) { break; } buf[x++] = '%';

1 0

[commit] r12365 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Mon Mar 2 19:52:25 2009 New Revision: 12365 Log: Add log message when the softtimer thread exits Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Mar 2 19:52:25 2009 @@ -553,7 +553,7 @@ globals.RUNNING = 0; switch_mutex_unlock(globals.mutex); - + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Soft timer thread exiting.\n"); return SWITCH_STATUS_TERM; }

1 0