- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12705 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Sat Mar 21 11:47:57 2009 New Revision: 12705 Log: add mutex to global mem pool and tweak var code Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_memory.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Mar 21 11:47:57 2009 @@ -485,7 +485,7 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable(switch_channel_t *channel, const char *varname) { - const char *v = NULL; + const char *v = NULL, *r = NULL; switch_assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); @@ -507,17 +507,17 @@ } } - if (v) v = switch_core_session_strdup(channel->session, v); + if (v) r = switch_core_session_strdup(channel->session, v); switch_mutex_unlock(channel->profile_mutex); - return v; + return r; } SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_t *channel, const char *varname) { const char *uuid; - const char *val = NULL; + const char *val = NULL, *r = NULL; switch_assert(channel != NULL); if (!switch_strlen_zero(varname)) { @@ -531,9 +531,9 @@ } } - if (val) val = switch_core_session_strdup(channel->session, val); + if (val) r = switch_core_session_strdup(channel->session, val); - return val; + return r; } Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Sat Mar 21 11:47:57 2009 @@ -569,11 +569,12 @@ abort(); } - if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_DEFAULT, memory_manager.memory_pool)) != APR_SUCCESS) { + if ((apr_thread_mutex_create(&my_mutex, APR_THREAD_MUTEX_NESTED, memory_manager.memory_pool)) != APR_SUCCESS) { abort(); } apr_allocator_mutex_set(my_allocator, my_mutex); + apr_pool_mutex_set(memory_manager.memory_pool, my_mutex); apr_allocator_owner_set(my_allocator, memory_manager.memory_pool); #else apr_pool_create(&memory_manager.memory_pool, NULL);

1 0

[commit] r12704 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Sat Mar 21 11:47:16 2009 New Revision: 12704 Log: fix regression from r12585 FSCORE-331 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 Sat Mar 21 11:47:16 2009 @@ -2142,11 +2142,11 @@ } if (*bleg) { - if (caller_channel && !switch_channel_get_originatee_caller_profile(caller_channel)) { + if (session && caller_channel && !switch_channel_get_originatee_caller_profile(caller_channel)) { switch_caller_profile_t *cloned_profile, *peer_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(*bleg)); if (peer_profile) { - if ((cloned_profile = switch_caller_profile_clone(*bleg, peer_profile)) != 0) { + if ((cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) { switch_channel_set_originatee_caller_profile(caller_channel, cloned_profile); } }

1 0

[commit] r12703 - freeswitch/trunk/scripts/contrib/swk/php/esl_cdr
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: silik0n Date: Sat Mar 21 07:18:54 2009 New Revision: 12703 Log: oops Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Sat Mar 21 07:18:54 2009 @@ -98,6 +98,9 @@ "0" ); - $dbh->exec($insert) or die($db->errorInfo()); + $inserted = $dbh->exec($insert); + if ($inserted < 1){ + die($db->errorInfo()); + } } ?>

1 0

[commit] r12702 - freeswitch/trunk/scripts/contrib/swk/php/esl_cdr
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: silik0n Date: Sat Mar 21 06:54:11 2009 New Revision: 12702 Log: add auto-reconnection to ESL, change DB stuff to PDO for more better DB stuffs Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Modified: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.php Sat Mar 21 06:54:11 2009 @@ -7,7 +7,17 @@ $esl_password = 'ClueCon'; -$db_url ="pgsql://root@localhost/esl_cdr"; +$dbtype='mysql'; /* Set the Database type */ +$db_hostname = 'localhost'; /* Database Server hostname */ +$db_port = '3306'; /* Database Server Port */ +$db_username = 'root'; /* Database Server username */ +$db_password = 'password'; /* Database Server password */ +$db_database = 'esl_cdr'; /* DataBase Name */ +if ($dbtype == 'mysql') { + $pdo_flags = array(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,); +} + +$dbh = new PDO("$dbtype:host=$db_hostname;port=$db_port;dbname=$db_database", $db_username, $db_password, $pdo_flags); $con = MDB2::factory($db_url); if(PEAR::isError($con)) { @@ -15,12 +25,18 @@ } /* set up the ESL Connection */ -$esl = new eslConnection('204.8.45.218', '8021', 'disasterisk-sucks'); +$esl = new eslConnection($esl_host, $esl_port, $esl_password); $e = $esl->sendRecv("api status"); print $e->getBody(); $esl->events("plain", "channel_hangup"); for(;;) { - print "foo - 1\n"; + while (!$esl->connected()) { + // if the connection is down, loop until we're able to reconnect + $esl = new eslConnection($esl_host, $esl_port, $esl_password); + $esl->events("plain", "channel_hangup"); + + sleep (1); + } $e = $esl->recvEvent(); if ($e) { $lines = explode("\n", $e->serialize()); @@ -82,11 +98,6 @@ "0" ); - $result = $con->query($insert); - if(PEAR::isError($result)) { - echo "$insert\n"; - die(); - } - } + $dbh->exec($insert) or die($db->errorInfo()); } ?>

1 0

[commit] r12701 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: brian Date: Fri Mar 20 21:34:37 2009 New Revision: 12701 Log: free handles in error and failure conditions Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c 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 Mar 20 21:34:37 2009 @@ -333,6 +333,14 @@ int locked = 0; int check_destroy = 1; + if (nh && sofia_private == &mod_sofia_globals.keep_private) { + if (status >= 300) { + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + return; + } + } + if (sofia_private && sofia_private != &mod_sofia_globals.destroy_private && sofia_private != &mod_sofia_globals.keep_private) { if ((gateway = sofia_private->gateway)) { if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Fri Mar 20 21:34:37 2009 @@ -1405,6 +1405,7 @@ } nh = nua_handle(profile->nua, NULL, NUTAG_URL(contact), SIPTAG_FROM_STR(id), SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(h->profile->url), TAG_END()); + nua_handle_bind(nh, &mod_sofia_globals.destroy_private); nua_notify(nh, NUTAG_NEWSUB(1),

1 0

[commit] r12700 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Fri Mar 20 21:31:15 2009 New Revision: 12700 Log: MODENDP-205 revert Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mar 20 21:31:15 2009 @@ -396,8 +396,7 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) { - const char *abs, *codec_string, *uuid; - switch_core_session_t *b_session = NULL; + const char *abs, *codec_string = NULL; const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { @@ -410,17 +409,7 @@ switch_assert(tech_pvt->session != NULL); - if ((abs = switch_channel_get_variable(tech_pvt->channel, "inherit_codec")) && (switch_true(abs)) && (uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) != NULL && (b_session = switch_core_session_locate(uuid)) != NULL) { - switch_codec_implementation_t impl = {0}; - switch_core_session_get_read_impl(b_session, &impl); - if (impl.iananame == NULL || !(abs = switch_core_session_sprintf(tech_pvt->session, "%s@%uh", impl.iananame, impl.actual_samples_per_second))) { - abs = NULL; - } - } else { - abs = NULL; - } - - if (abs || (abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { + if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {

1 0

[commit] r12699 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: anthm Date: Fri Mar 20 21:30:05 2009 New Revision: 12699 Log: MODENDP-205 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 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 Mar 20 21:30:05 2009 @@ -396,7 +396,8 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) { - const char *abs, *codec_string = NULL; + const char *abs, *codec_string, *uuid; + switch_core_session_t *b_session = NULL; const char *ocodec = NULL; if (switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) || switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) { @@ -409,7 +410,17 @@ switch_assert(tech_pvt->session != NULL); - if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { + if ((abs = switch_channel_get_variable(tech_pvt->channel, "inherit_codec")) && (switch_true(abs)) && (uuid = switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) != NULL && (b_session = switch_core_session_locate(uuid)) != NULL) { + switch_codec_implementation_t impl = {0}; + switch_core_session_get_read_impl(b_session, &impl); + if (impl.iananame == NULL || !(abs = switch_core_session_sprintf(tech_pvt->session, "%s@%uh", impl.iananame, impl.actual_samples_per_second))) { + abs = NULL; + } + } else { + abs = NULL; + } + + if (abs || (abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { codec_string = abs; } else { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {

1 0

[commit] r12698 - freeswitch/trunk/src/include
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 18:01:20 2009 New Revision: 12698 Log: fix macros with missing ( ) Modified: freeswitch/trunk/src/include/switch_utils.h Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Fri Mar 20 18:01:20 2009 @@ -114,22 +114,22 @@ \return true or false */ #define switch_true(expr)\ -(expr && ( !strcasecmp(expr, "yes") ||\ +((expr && ( !strcasecmp(expr, "yes") ||\ !strcasecmp(expr, "on") ||\ !strcasecmp(expr, "true") ||\ !strcasecmp(expr, "enabled") ||\ !strcasecmp(expr, "active") ||\ !strcasecmp(expr, "allow") ||\ -atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) #define switch_true_buf(expr)\ -(( !strcasecmp(expr, "yes") ||\ +((( !strcasecmp(expr, "yes") ||\ !strcasecmp(expr, "on") ||\ !strcasecmp(expr, "true") ||\ !strcasecmp(expr, "enabled") ||\ !strcasecmp(expr, "active") ||\ !strcasecmp(expr, "allow") ||\ -atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) /*! \brief Evaluate the falsefullness of a string expression @@ -137,13 +137,13 @@ \return true or false */ #define switch_false(expr)\ -(expr && ( !strcasecmp(expr, "no") ||\ +((expr && ( !strcasecmp(expr, "no") ||\ !strcasecmp(expr, "off") ||\ !strcasecmp(expr, "false") ||\ !strcasecmp(expr, "disabled") ||\ !strcasecmp(expr, "inactive") ||\ !strcasecmp(expr, "disallow") ||\ -!atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE +!atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE) /*!

1 0

[commit] r12697 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 17:49:01 2009 New Revision: 12697 Log: fix edge case segfault 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 Fri Mar 20 17:49:01 2009 @@ -448,11 +448,10 @@ if (rh->fh) { switch_core_file_close(rh->fh); - } - - if (rh->fh->samples_out < read_impl.samples_per_second * 3) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); - switch_file_remove(rh->file, switch_core_session_get_pool(session)); + if (rh->fh->samples_out < read_impl.samples_per_second * 3) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file); + switch_file_remove(rh->file, switch_core_session_get_pool(session)); + } } }

1 0

[commit] r12696 - in freeswitch/trunk/src: . mod/applications/mod_lcr
by FreeSWITCH SVN 20 Mar '09

20 Mar '09

Author: mikej Date: Fri Mar 20 17:38:38 2009 New Revision: 12696 Log: fix windows build Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c freeswitch/trunk/src/switch_core_port_allocator.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Fri Mar 20 17:38:38 2009 @@ -527,6 +527,7 @@ switch_bool_t lookup_status; switch_channel_t *channel; char *id_str; + char *safe_sql; digits_copy = string_digitsonly(cb_struct->pool, digits); if (switch_strlen_zero(digits_copy)) { @@ -558,7 +559,6 @@ } /* set up the query to be executed */ - char *safe_sql; /* format the custom_sql */ safe_sql = format_custom_sql(profile->custom_sql, cb_struct, digits_copy); Modified: freeswitch/trunk/src/switch_core_port_allocator.c ============================================================================== --- freeswitch/trunk/src/switch_core_port_allocator.c (original) +++ freeswitch/trunk/src/switch_core_port_allocator.c Fri Mar 20 17:38:38 2009 @@ -118,7 +118,7 @@ int odd = switch_test_flag(alloc, SPF_ODD); switch_mutex_lock(alloc->mutex); - srand((unsigned)(intptr_t)port_ptr + (unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now()); + srand((unsigned)((unsigned)(intptr_t)port_ptr + (unsigned)(intptr_t)switch_thread_self() + switch_micro_time_now())); while (alloc->track_used < alloc->track_len) { uint32_t index;

1 0