March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12720 - freeswitch/trunk/src
by FreeSWITCH SVN 23 Mar '09

23 Mar '09

Author: anthm Date: Sun Mar 22 20:59:35 2009 New Revision: 12720 Log: make gaussian noise less noisy FSCORE-340 Modified: freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_resample.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Sun Mar 22 20:59:35 2009 @@ -1871,7 +1871,7 @@ silence = ringback.silence; } } else { - silence = 400; + silence = 600; } if ((ringback.fh || silence || ringback.audio_buffer) && write_frame.codec && write_frame.datalen) { Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Sun Mar 22 20:59:35 2009 @@ -181,24 +181,22 @@ } } -#if SILENCE_METHOD_ONE +#if 1 SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) { int16_t x; uint32_t i; int sum_rnd = 0; - int16_t rnd2 = (int16_t) switch_micro_time_now(); + int16_t rnd2 = (int16_t) switch_micro_time_now() + (int16_t) (intptr_t) data; assert(divisor); - - for (i = 0; i < samples; i++, sum_rnd = 0) { for (x = 0; x < 6; x++) { rnd2 = rnd2 * 31821U + 13849U; - sum_rnd += rnd2; + sum_rnd += rnd2 ; } - switch_normalize_to_16bit(sum_rnd); + //switch_normalize_to_16bit(sum_rnd); *data = (int16_t) ((int16_t) sum_rnd / (int) divisor); data++;

1 0

[commit] r12719 - freeswitch/trunk/scripts/contrib/swk/php/amfphp
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: silik0n Date: Sun Mar 22 18:31:49 2009 New Revision: 12719 Log: ok really fix this crap Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Modified: freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/amfphp/freeswitch.php Sun Mar 22 18:31:49 2009 @@ -38,41 +38,39 @@ require_once "ESL.php"; class FreeSWITCH { + + /* Edit these variables for your installation */ + var $esl_server = "127.0.0.1"; /* ESL Server */ + var $esl_port = "8021"; /* ESL Port */ + var $esl_secret = "ClueCon"; /* ESL Secret */ + + var $dbtype='mysql'; /* Set the Database type */ + var $db_hostname = '192.168.1.140'; /* Database Server hostname */ + var $db_port = '3306'; /* Database Server Port */ + var $db_username = 'root'; /* Database Server username */ + var $db_password = 'password'; /* Database Server password */ + var $db_database = 'shipment'; /* DataBase Name */ private function getDbh(){ - $dbtype='mysql'; /* Set the Database type */ - // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ - $db_port = '3306'; /* Database Server Port */ - $db_username = 'root'; /* Database Server username */ - $db_password = 'password'; /* Database Server password */ - $db_database = 'shipment'; /* DataBase Name */ - if ($dbtype == 'mysql') { + if ($this->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); + $dbh = new PDO($this->dbtype . ":host=" . $this->db_hostname . ";port=" . $this->db_port . ";dbname=" . $this->db_database, + $this->db_username, $this->db_password, $pdo_flags); return $dbh; } - private function getEsl(){ - $esl_server = "127.0.0.1"; /* ESL Server */ - $esl_port = "8021"; /* ESL Port */ - $esl_secret = "ClueCon"; /* ESL Secret */ - $esl = new eslConnection($esl_server, $esl_port, $esl_secret); - return $esl; - } - /*** General Whats happening Methods ***/ public function getStatus() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_ser"ver, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api status"); $body = $e->getBody(); return $body; } public function getChannels() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api show channels"); $body = $e->getBody(); $temp = explode ("\n", $body); @@ -102,7 +100,7 @@ } public function getCalls() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api show calls"); $body = $e->getBody(); $temp = explode ("\n", $body); @@ -131,14 +129,14 @@ public function originate($call_url, $exten, $dialplan = "XML", $context= "default", $cid_name = "amf_php", $cid_number = "888", $timeout="30"){ $dialstring = "api originate $call_url $exten $dialplan $context $cid_name $cid_number $timeout"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($dialstring); $body = $e->getBody(); return $body; } public function killUuid($uuid) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api uuid_kill $uuid"); $body = $e->getBody(); return $body; @@ -147,14 +145,14 @@ /*** Conference Methods ***/ public function kickConferenceUser($conference, $member) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference $conference kick $member"); $body = $e->getBody(); return $body; } public function getConferenceList() { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference list"); $body = $e->getBody(); $data=explode("\n", $body); @@ -170,7 +168,7 @@ } public function getConferenceUsers($conference_name) { - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv("api conference $conference_name list"); $body = $e->getBody(); $data=explode("\n", $body); @@ -225,7 +223,7 @@ public function confPlayfile($conference, $file_path){ $playfile = "api conference $conference play " . $file_path; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -233,7 +231,7 @@ public function confLock($conference){ $playfile = "api conference $conference lock"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -241,7 +239,7 @@ public function confUnlock($conference){ $playfile = "api conference $conference unlock"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -249,7 +247,7 @@ public function confMute($conference, $member){ $playfile = "api conference $conference mute $member"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body; @@ -257,7 +255,7 @@ public function confUnmute($conference, $member){ $playfile = "api conference $conference unmute $member"; - $esl = getEsl(); + $esl = new eslConnection($this->esl_server, $this->esl_port, $this->esl_secret); $e = $esl->sendRecv($playfile); $body = $e->getBody(); return $body;

1 0

[commit] r12718 - in freeswitch/trunk/src: . mod/languages/mod_lua
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: anthm Date: Sun Mar 22 16:32:08 2009 New Revision: 12718 Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 16:32:08 2009 @@ -32,7 +32,7 @@ if (session) { switch_core_event_hook_remove_state_change(session, lua_hanguphook); } - free(hangup_func_str); + switch_safe_free(hangup_func_str); } switch_safe_free(hangup_func_arg); @@ -128,6 +128,16 @@ if (!switch_strlen_zero(err)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s\n", err); } + + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + + if (session) { + switch_core_event_hook_remove_state_change(session, lua_hanguphook); + } + switch_safe_free(hangup_func_str); + } } @@ -142,7 +152,10 @@ channel = switch_core_session_get_channel(session_hungup); if (channel) { - coresession = (Session *) switch_channel_get_private(channel, "CoreSession"); + void *vs = switch_channel_get_private(channel, "CoreSession"); + if (vs) { + coresession = (Session *) vs; + } } if (!(coresession && coresession->hook_state)) { Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sun Mar 22 16:32:08 2009 @@ -888,6 +888,10 @@ { this_check_void(); + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + switch_safe_free(xml_cdr_text); switch_safe_free(uuid); switch_safe_free(tts_name);

1 0

[commit] r12717 - freeswitch/trunk/src/mod/languages/mod_lua
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: anthm Date: Sun Mar 22 16:19:25 2009 New Revision: 12717 Log: update Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 16:19:25 2009 @@ -134,7 +134,7 @@ static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup) { switch_channel_t *channel = switch_core_session_get_channel(session_hungup); - CoreSession *coresession = NULL; + Session *coresession = NULL; switch_channel_state_t state = switch_channel_get_state(channel); if (session_hungup) { @@ -142,7 +142,7 @@ channel = switch_core_session_get_channel(session_hungup); if (channel) { - coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); + coresession = (Session *) switch_channel_get_private(channel, "CoreSession"); } if (!(coresession && coresession->hook_state)) {

1 0

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

22 Mar '09

Author: anthm Date: Sun Mar 22 15:52:41 2009 New Revision: 12716 Log: fix killgw Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.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 Sun Mar 22 15:52:41 2009 @@ -430,6 +430,7 @@ case nua_i_fork: case nua_r_info: case nua_r_bye: + case nua_r_unregister: case nua_r_unsubscribe: case nua_r_publish: case nua_i_cancel: @@ -464,7 +465,6 @@ sofia_handle_sip_i_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_register: - case nua_r_unregister: sofia_reg_handle_sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_i_options: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Mar 22 15:52:41 2009 @@ -50,10 +50,8 @@ 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 (attach) { if (!gateway_ptr->sofia_private) { gateway_ptr->sofia_private = malloc(sizeof(*gateway_ptr->sofia_private)); @@ -77,12 +75,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UN-Registering %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("0"), - NUTAG_REGISTRAR(gateway_ptr->register_proxy), - NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + TAG_END()); } }

1 0

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

22 Mar '09

Author: anthm Date: Sun Mar 22 15:04:56 2009 New Revision: 12715 Log: fix reg issue Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.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 Sun Mar 22 15:04:56 2009 @@ -89,7 +89,10 @@ private_object_t *tech_pvt = NULL; switch_event_t *s_event = NULL; sofia_gateway_subscription_t *gw_sub_ptr; + int sub_state; + tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); + /* make sure we have a proper event */ if (!sip || !sip->sip_event) { goto error; @@ -105,18 +108,8 @@ if (sofia_test_pflag(profile, PFLAG_MANAGE_SHARED_APPEARANCE)) { if (sip->sip_request->rq_url->url_user && !strncmp(sip->sip_request->rq_url->url_user, "sla-agent", sizeof("sla-agent"))) { - int sub_state; - tl_gets(tags, NUTAG_SUBSTATE_REF(sub_state), TAG_END()); - 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); - } - - return; + goto end; } } @@ -124,7 +117,7 @@ if (!strcasecmp(sip->sip_event->o_type, "keep-alive")) { /* XXX MTK - is this right? in this case isn't sofia is already sending a 200 itself also? */ nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + goto end; } if (session) { @@ -214,7 +207,7 @@ switch_channel_set_variable(channel, "auto_answer_destination", switch_channel_get_variable(channel, "destination_number")); switch_ivr_session_transfer(session, "auto_answer", NULL, NULL); nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END()); - return; + goto end; } } @@ -257,11 +250,20 @@ goto error; } - return; + goto end; error: + nua_respond(nh, 481, "Subscription Does Not Exist", NUTAG_WITH_THIS(nua), TAG_END()); - return; + + end: + + if (sub_state == nua_substate_terminated) { + sofia_private_free(sofia_private); + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); + } + } void sofia_handle_sip_i_bye(switch_core_session_t *session, int status, @@ -425,7 +427,6 @@ switch (event) { case nua_r_get_params: - case nua_r_unregister: case nua_i_fork: case nua_r_info: case nua_r_bye: @@ -463,6 +464,7 @@ sofia_handle_sip_i_notify(session, status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_r_register: + case nua_r_unregister: sofia_reg_handle_sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); break; case nua_i_options: Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sun Mar 22 15:04:56 2009 @@ -37,7 +37,7 @@ */ #include "mod_sofia.h" -static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr) +static void sofia_reg_new_handle(sofia_gateway_t *gateway_ptr, int attach) { int ss_state = nua_callstate_authenticating; @@ -54,23 +54,23 @@ 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)); + if (attach) { + 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); + 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); - + sofia_reg_new_handle(gateway_ptr, SWITCH_FALSE); } if (gateway_ptr->nh) { @@ -80,7 +80,7 @@ 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), + SIPTAG_EXPIRES_STR("0"), NUTAG_REGISTRAR(gateway_ptr->register_proxy), NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } @@ -100,10 +100,13 @@ { sofia_gateway_t *gateway_ptr; for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { + if (gateway_ptr->sofia_private) { sofia_private_free(gateway_ptr->sofia_private); } + sofia_reg_kill_reg(gateway_ptr); + } } @@ -288,7 +291,7 @@ case REG_STATE_UNREGED: gateway_ptr->status = SOFIA_GATEWAY_DOWN; - sofia_reg_new_handle(gateway_ptr); + sofia_reg_new_handle(gateway_ptr, now ? 1 : 0); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registering %s\n", gateway_ptr->name); @@ -1318,7 +1321,7 @@ } - if (status >= 200) { + if (status >= 300) { if (sofia_private) { if (sofia_private->gateway) { nua_handle_destroy(sofia_private->gateway->nh);

1 0

[commit] r12714 - freeswitch/trunk/src/mod/languages/mod_lua
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: anthm Date: Sun Mar 22 13:35:55 2009 New Revision: 12714 Log: tweak lua hangup hook (part 2) Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 13:35:55 2009 @@ -24,6 +24,10 @@ Session::~Session() { + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + if (hangup_func_str) { if (session) { switch_core_event_hook_remove_state_change(session, lua_hanguphook); @@ -141,6 +145,10 @@ coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); } + if (!(coresession && coresession->hook_state)) { + return SWITCH_STATUS_FALSE; + } + if (coresession && coresession->allocated && (state == CS_HANGUP || state == CS_ROUTING) && coresession->hook_state != state) { coresession->hook_state = state; coresession->check_hangup_hook();

1 0

[commit] r12713 - freeswitch/trunk/src/mod/languages/mod_lua
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: anthm Date: Sun Mar 22 13:23:24 2009 New Revision: 12713 Log: tweak lua hangup hook Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Sun Mar 22 13:23:24 2009 @@ -133,10 +133,18 @@ CoreSession *coresession = NULL; switch_channel_state_t state = switch_channel_get_state(channel); - if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) { - if (coresession->hook_state != state) { + if (session_hungup) { + + channel = switch_core_session_get_channel(session_hungup); + + if (channel) { + coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"); + } + + if (coresession && coresession->allocated && (state == CS_HANGUP || state == CS_ROUTING) && coresession->hook_state != state) { coresession->hook_state = state; coresession->check_hangup_hook(); + switch_core_event_hook_remove_state_change(session_hungup, lua_hanguphook); } }

1 0

[commit] r12712 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: mikej Date: Sun Mar 22 12:27:28 2009 New Revision: 12712 Log: tweak Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Sun Mar 22 12:27:28 2009 @@ -721,7 +721,6 @@ char *command = NULL, *arg = NULL; switch_stream_handle_t stream = { 0 }; xmlrpc_value *val = NULL; -// const char *x_command = "bgapi", x_arg = "unload mod_xml_rpc"; switch_bool_t freed = 0;

1 0

[commit] r12711 - freeswitch/trunk/w32/Library
by FreeSWITCH SVN 22 Mar '09

22 Mar '09

Author: mikej Date: Sun Mar 22 11:54:45 2009 New Revision: 12711 Log: turn off code analysis for now Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.2008.vcproj Sun Mar 22 11:54:45 2009 @@ -60,7 +60,7 @@ WarnAsError="true" DebugInformationFormat="3" ForcedIncludeFiles="" - EnablePREfast="$(EnablePREfast)" + EnablePREfast="false" /> <Tool Name="VCManagedResourceCompilerTool" @@ -153,7 +153,6 @@ WarnAsError="false" DebugInformationFormat="3" ForcedIncludeFiles="" - EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -242,7 +241,6 @@ WarningLevel="4" WarnAsError="true" DebugInformationFormat="3" - EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool" @@ -331,7 +329,6 @@ WarningLevel="4" WarnAsError="false" DebugInformationFormat="3" - EnablePREfast="$(EnablePREfast)" /> <Tool Name="VCManagedResourceCompilerTool"

1 0