- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12706 - freeswitch/trunk/patches
by FreeSWITCH SVN 21 Mar '09

21 Mar '09

Author: brian Date: Sat Mar 21 18:24:48 2009 New Revision: 12706 Log: do_patches Added: freeswitch/trunk/patches/sofia.diff Removed: freeswitch/trunk/patches/pa.diff Added: freeswitch/trunk/patches/sofia.diff ============================================================================== --- (empty file) +++ freeswitch/trunk/patches/sofia.diff Sat Mar 21 18:24:48 2009 @@ -0,0 +1,383 @@ +Index: src/mod/endpoints/mod_sofia/sofia_reg.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia_reg.c (revision 12705) ++++ src/mod/endpoints/mod_sofia/sofia_reg.c (working copy) +@@ -37,26 +37,56 @@ + */ + #include "mod_sofia.h" + +-static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) ++static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr) + { ++ int ss_state = nua_callstate_authenticating; ++ + if (gateway_ptr->nh) { +- if (unreg) { +- nua_unregister(gateway_ptr->nh, +- NUTAG_URL(gateway_ptr->register_url), +- SIPTAG_FROM_STR(gateway_ptr->register_from), +- SIPTAG_TO_STR(gateway_ptr->register_from), +- SIPTAG_CONTACT_STR(gateway_ptr->register_contact), +- SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), +- NUTAG_REGISTRAR(gateway_ptr->register_proxy), +- NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); +- } + nua_handle_bind(gateway_ptr->nh, NULL); + nua_handle_destroy(gateway_ptr->nh); + gateway_ptr->nh = NULL; ++ sofia_private_free(gateway_ptr->sofia_private); + } + ++ gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, ++ SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), ++ NUTAG_URL(gateway_ptr->register_proxy), ++ SIPTAG_TO_STR(gateway_ptr->register_to), ++ NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); ++ ++ ++ if (!gateway_ptr->sofia_private) { ++ gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); ++ switch_assert(gateway_ptr->sofia_private); ++ } ++ memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); ++ ++ gateway_ptr->sofia_private->gateway = gateway_ptr; ++ nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); + } + ++static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr) ++{ ++ ++ if (!gateway_ptr->nh) { ++ sofia_reg_new_handle(gateway_ptr); ++ ++ } ++ ++ if (gateway_ptr->nh) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UNRegistering %s\n", gateway_ptr->name); ++ nua_unregister(gateway_ptr->nh, ++ NUTAG_URL(gateway_ptr->register_url), ++ SIPTAG_FROM_STR(gateway_ptr->register_from), ++ SIPTAG_TO_STR(gateway_ptr->register_from), ++ SIPTAG_CONTACT_STR(gateway_ptr->register_contact), ++ SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), ++ NUTAG_REGISTRAR(gateway_ptr->register_proxy), ++ NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); ++ } ++ ++} ++ + static void sofia_reg_fire_custom_gateway_state_event(sofia_gateway_t *gateway) { + switch_event_t *s_event; + if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_GATEWAY_STATE) == SWITCH_STATUS_SUCCESS) { +@@ -71,10 +101,9 @@ + sofia_gateway_t *gateway_ptr; + for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { + if (gateway_ptr->sofia_private) { +- free(gateway_ptr->sofia_private); +- gateway_ptr->sofia_private = NULL; ++ sofia_private_free(gateway_ptr->sofia_private); + } +- sofia_reg_kill_reg(gateway_ptr, 1); ++ sofia_reg_kill_reg(gateway_ptr); + } + } + +@@ -108,7 +137,7 @@ + break; + case SUB_STATE_UNSUBSCRIBE: + gw_sub_ptr->state = SUB_STATE_NOSUB; +- ++ + /* not tested .. */ + nua_unsubscribe(gateway_ptr->nh, + NUTAG_URL(gateway_ptr->register_url), +@@ -121,24 +150,23 @@ + + break; + case SUB_STATE_UNSUBED: +- if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, +- NUTAG_URL(gateway_ptr->register_proxy), +- SIPTAG_TO_STR(gateway_ptr->register_to), +- NUTAG_CALLSTATE_REF(ss_state), +- SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { +- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "subscribing to [%s] on gateway [%s]\n", gw_sub_ptr->event, gateway_ptr->name); +- } ++ gateway_ptr->sub_nh = nua_handle(gateway_ptr->profile->nua, NULL, ++ NUTAG_URL(gateway_ptr->register_proxy), ++ SIPTAG_TO_STR(gateway_ptr->register_to), ++ NUTAG_CALLSTATE_REF(ss_state), ++ SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()); ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "subscribing to [%s] on gateway [%s]\n", gw_sub_ptr->event, gateway_ptr->name); + + gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); + switch_assert(gateway_ptr->sofia_private); +- ++ + memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); + + gateway_ptr->sofia_private->gateway = gateway_ptr; + nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); + + if (now) { +- nua_subscribe(gateway_ptr->nh, ++ nua_subscribe(gateway_ptr->sub_nh, + NUTAG_URL(gateway_ptr->register_url), + SIPTAG_EVENT_STR(gw_sub_ptr->event), + SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type), +@@ -149,7 +177,7 @@ + TAG_NULL()); + gw_sub_ptr->retry = now + gw_sub_ptr->retry_seconds; + } else { +- nua_unsubscribe(gateway_ptr->nh, ++ nua_unsubscribe(gateway_ptr->sub_nh, + NUTAG_URL(gateway_ptr->register_url), + SIPTAG_EVENT_STR(gw_sub_ptr->event), + SIPTAG_ACCEPT_STR(gw_sub_ptr->content_type), +@@ -207,7 +235,6 @@ + } + + for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { +- int ss_state = nua_callstate_authenticating; + reg_state_t ostate = gateway_ptr->state; + + if (!now) { +@@ -223,6 +250,7 @@ + switch_assert(pvt); + memset(pvt, 0, sizeof(*pvt)); + pvt->destroy_nh = 1; ++ pvt->destroy_me = 1; + switch_copy_string(pvt->gateway_name, gateway_ptr->name, sizeof(pvt->gateway_name)); + nua_handle_bind(nh, pvt); + +@@ -254,64 +282,46 @@ + break; + + case REG_STATE_UNREGISTER: +- sofia_reg_kill_reg(gateway_ptr, 1); ++ sofia_reg_kill_reg(gateway_ptr); + gateway_ptr->state = REG_STATE_NOREG; + break; + case REG_STATE_UNREGED: + gateway_ptr->status = SOFIA_GATEWAY_DOWN; +- sofia_reg_kill_reg(gateway_ptr, 0); ++ ++ sofia_reg_new_handle(gateway_ptr); + +- if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, +- SIPTAG_CALL_ID_STR(gateway_ptr->uuid_str), +- NUTAG_URL(gateway_ptr->register_proxy), +- SIPTAG_TO_STR(gateway_ptr->register_to), +- NUTAG_CALLSTATE_REF(ss_state), SIPTAG_FROM_STR(gateway_ptr->register_from), TAG_END()))) { +- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); +- +- if (!gateway_ptr->sofia_private) { +- gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); +- switch_assert(gateway_ptr->sofia_private); +- } +- memset(gateway_ptr->sofia_private, 0, sizeof(*gateway_ptr->sofia_private)); +- +- gateway_ptr->sofia_private->gateway = gateway_ptr; +- nua_handle_bind(gateway_ptr->nh, gateway_ptr->sofia_private); +- +- if (now) { +- nua_register(gateway_ptr->nh, +- NUTAG_URL(gateway_ptr->register_url), +- TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), +- SIPTAG_TO_STR(gateway_ptr->register_from), +- SIPTAG_FROM_STR(gateway_ptr->register_from), +- SIPTAG_CONTACT_STR(gateway_ptr->register_contact), +- SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), +- NUTAG_REGISTRAR(gateway_ptr->register_proxy), +- NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); +- gateway_ptr->retry = now + gateway_ptr->retry_seconds; +- } else { +- nua_unregister(gateway_ptr->nh, +- NUTAG_URL(gateway_ptr->register_url), +- SIPTAG_FROM_STR(gateway_ptr->register_from), +- SIPTAG_TO_STR(gateway_ptr->register_from), +- SIPTAG_CONTACT_STR(gateway_ptr->register_contact), +- SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), +- NUTAG_REGISTRAR(gateway_ptr->register_proxy), +- NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); +- } ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); ++ ++ if (now) { ++ nua_register(gateway_ptr->nh, ++ NUTAG_URL(gateway_ptr->register_url), ++ TAG_IF(gateway_ptr->register_sticky_proxy, NUTAG_PROXY(gateway_ptr->register_sticky_proxy)), ++ SIPTAG_TO_STR(gateway_ptr->register_from), ++ SIPTAG_FROM_STR(gateway_ptr->register_from), ++ SIPTAG_CONTACT_STR(gateway_ptr->register_contact), ++ SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), ++ NUTAG_REGISTRAR(gateway_ptr->register_proxy), ++ NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + gateway_ptr->retry = now + gateway_ptr->retry_seconds; +- gateway_ptr->state = REG_STATE_TRYING; +- + } else { +- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error registering %s failure #%d\n", gateway_ptr->name, ++gateway_ptr->failures); +- gateway_ptr->state = REG_STATE_FAILED; ++ nua_unregister(gateway_ptr->nh, ++ NUTAG_URL(gateway_ptr->register_url), ++ SIPTAG_FROM_STR(gateway_ptr->register_from), ++ SIPTAG_TO_STR(gateway_ptr->register_from), ++ SIPTAG_CONTACT_STR(gateway_ptr->register_contact), ++ SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), ++ NUTAG_REGISTRAR(gateway_ptr->register_proxy), ++ NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + } ++ gateway_ptr->retry = now + gateway_ptr->retry_seconds; ++ gateway_ptr->state = REG_STATE_TRYING; ++ + break; + + case REG_STATE_FAILED: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Failed Registration, setting retry to %d seconds.\n", + gateway_ptr->name, gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); + gateway_ptr->retry = now + (gateway_ptr->retry_seconds * (gateway_ptr->failures + 1)); +- sofia_reg_kill_reg(gateway_ptr, 0); + gateway_ptr->status = SOFIA_GATEWAY_DOWN; + gateway_ptr->state = REG_STATE_FAIL_WAIT; + break; +@@ -408,6 +418,7 @@ + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + ++ nua_handle_bind(nh, &mod_sofia_globals.destroy_private); + nua_notify(nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(event), +@@ -1275,6 +1286,23 @@ + if (ostate != sofia_private->gateway->state) { + sofia_reg_fire_custom_gateway_state_event(sofia_private->gateway); + } ++ ++ ++ if (status >= 200) { ++ if (sofia_private) { ++ if (sofia_private->gateway) { ++ nua_handle_destroy(sofia_private->gateway->nh); ++ sofia_private->gateway->nh = NULL; ++ nua_handle_bind(sofia_private->gateway->nh, NULL); ++ sofia_private->gateway->sofia_private = NULL; ++ } else { ++ nua_handle_destroy(nh); ++ } ++ sofia_private_free(sofia_private); ++ } else { ++ nua_handle_destroy(nh); ++ } ++ } + } + } + +Index: src/mod/endpoints/mod_sofia/mod_sofia.c +=================================================================== +--- src/mod/endpoints/mod_sofia/mod_sofia.c (revision 12705) ++++ src/mod/endpoints/mod_sofia/mod_sofia.c (working copy) +@@ -2703,6 +2703,8 @@ + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); + ++ nua_handle_bind(nh, &mod_sofia_globals.destroy_private); ++ + nua_notify(nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(es), +@@ -2902,6 +2904,8 @@ + + memset(&mod_sofia_globals, 0, sizeof(mod_sofia_globals)); + mod_sofia_globals.destroy_private.destroy_nh = 1; ++ mod_sofia_globals.destroy_private.is_static = 1; ++ mod_sofia_globals.keep_private.is_static = 1; + mod_sofia_globals.pool = pool; + switch_mutex_init(&mod_sofia_globals.mutex, SWITCH_MUTEX_NESTED, mod_sofia_globals.pool); + +Index: src/mod/endpoints/mod_sofia/sofia.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia.c (revision 12705) ++++ src/mod/endpoints/mod_sofia/sofia.c (working copy) +@@ -111,6 +111,7 @@ + sofia_sla_handle_sip_i_notify(nua, profile, nh, sip, tags); + + if (sub_state == nua_substate_terminated) { ++ sofia_private_free(sofia_private); + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + } +@@ -544,8 +545,7 @@ + nua_handle_bind(nh, NULL); + } + sofia_private->destroy_me = 12; +- free(sofia_private); +- sofia_private = NULL; ++ sofia_private_free(sofia_private); + } + + if (gateway) { +@@ -4721,7 +4721,7 @@ + } + + nua_handle_bind(nh, NULL); +- free(sofia_private); ++ sofia_private_free(sofia_private); + switch_core_session_destroy(&session); + nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); + } +Index: src/mod/endpoints/mod_sofia/mod_sofia.h +=================================================================== +--- src/mod/endpoints/mod_sofia/mod_sofia.h (revision 12705) ++++ src/mod/endpoints/mod_sofia/mod_sofia.h (working copy) +@@ -122,10 +122,12 @@ + int destroy_nh; + int destroy_me; + int is_call; ++ int is_static; + }; + + #define set_param(ptr,val) if (ptr) {free(ptr) ; ptr = NULL;} if (val) {ptr = strdup(val);} + #define set_anchor(t,m) if (t->Anchor) {delete t->Anchor;} t->Anchor = new SipMessage(m); ++#define sofia_private_free(_pvt) if (_pvt && ! _pvt->is_static) {free(_pvt); _pvt = NULL;} + + /* Local Structures */ + /*************************************************************************************************************************************************************/ +@@ -321,6 +323,7 @@ + struct sofia_gateway { + sofia_private_t *sofia_private; + nua_handle_t *nh; ++ nua_handle_t *sub_nh; + sofia_profile_t *profile; + char *name; + char *register_scheme; +Index: src/mod/endpoints/mod_sofia/sofia_presence.c +=================================================================== +--- src/mod/endpoints/mod_sofia/sofia_presence.c (revision 12705) ++++ src/mod/endpoints/mod_sofia/sofia_presence.c (working copy) +@@ -177,7 +177,7 @@ + SIPTAG_FROM_STR(from), NUTAG_URL(contact), + SIPTAG_TO_STR(clean_to), SIPTAG_CONTACT_STR(profile->url), + TAG_END()); +- ++ nua_handle_bind(msg_nh, &mod_sofia_globals.destroy_private); + nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END()); + + end: +@@ -1860,6 +1860,16 @@ + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "status (%d) != 200, updated state to SUB_STATE_FAILED.\n", status); + gw_sub_ptr->state = SUB_STATE_FAILED; ++ ++ if (sofia_private) { ++ nua_handle_destroy(sofia_private->gateway->sub_nh); ++ sofia_private->gateway->sub_nh = NULL; ++ nua_handle_bind(sofia_private->gateway->sub_nh, NULL); ++ sofia_private_free(sofia_private); ++ } else { ++ nua_handle_destroy(nh); ++ } ++ + break; + } + }

1 0

[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