March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

17 Mar '09

Author: silik0n Date: Tue Mar 17 13:12:12 2009 New Revision: 12650 Log: how about send something more then / for the filepath 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 Tue Mar 17 13:12:12 2009 @@ -217,7 +217,7 @@ } public function confPlayfile($conference, $file_path){ - $playfile = "api conference $conference play " . $file_path['data']; + $playfile = "api conference $conference play " . $file_path; $e = $this->esl->sendRecv($playfile); $body = $e->getBody(); return $body;

1 0

[commit] r12649 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: anthm Date: Tue Mar 17 12:54:34 2009 New Revision: 12649 Log: FSCORE-334 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Mar 17 12:54:34 2009 @@ -1569,7 +1569,7 @@ switch_channel_clear_flag(peer_channel, CF_INNER_BRIDGE); switch_channel_clear_flag(channel, CF_INNER_BRIDGE); - if (!switch_channel_down(peer_channel)) { + if (switch_channel_down(peer_channel)) { switch_core_session_rwunlock(peer_session); goto end; }

1 0

[commit] r12648 - freeswitch/trunk/src/mod/languages/mod_python
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: brian Date: Tue Mar 17 12:23:01 2009 New Revision: 12648 Log: MODLANG-106 Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 17 12:23:01 2009 @@ -388,9 +388,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n"); - globals.pool = pool; - do_config(); - if (!Py_IsInitialized()) { // initialize python system @@ -411,6 +408,8 @@ PyEval_ReleaseLock(); } + globals.pool = pool; + do_config(); /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname);

1 0

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

17 Mar '09

Author: anthm Date: Tue Mar 17 11:39:12 2009 New Revision: 12647 Log: FSCORE-337 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Mar 17 11:39:12 2009 @@ -735,6 +735,14 @@ int rtp_timeout_sec = 0; int rtp_hold_timeout_sec = 0; + if (codec_ms > 120) { /* yeah right */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Your phone is trying to send timestamps that suggest an increment of %dms per packet\n" + "That seems hard to believe so I am going to go on ahead and um ignore that, mmkay?", (int)codec_ms); + tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; + goto skip; + } + tech_pvt->read_frame.datalen = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "We were told to use ptime %d but what they meant to say was %d\n"

1 0

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

17 Mar '09

Author: mikej Date: Tue Mar 17 11:32:57 2009 New Revision: 12646 Log: add code analysis tagging Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Mar 17 11:32:57 2009 @@ -566,7 +566,7 @@ _Inout_opt_ switch_memory_pool_t **pool, _In_opt_z_ const char *use_uuid); #define switch_core_session_request(_ep, _d, _p) switch_core_session_request_uuid(_ep, _d, _p, NULL) -SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(switch_core_session_t *session, const char *use_uuid); +SWITCH_DECLARE(switch_status_t) switch_core_session_set_uuid(_In_ switch_core_session_t *session, _In_z_ const char *use_uuid); SWITCH_DECLARE(void) switch_core_session_perform_destroy(_Inout_ switch_core_session_t **session, _In_z_ const char *file, _In_z_ const char *func, _In_ int line); @@ -584,7 +584,7 @@ */ SWITCH_DECLARE(uint32_t) switch_core_session_count(void); -SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(switch_core_session_t *session); +SWITCH_DECLARE(switch_size_t) switch_core_session_get_id(_In_ switch_core_session_t *session); /*! \brief Provide the current session_id Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 17 11:32:57 2009 @@ -298,8 +298,8 @@ switch_channel_t *channel; switch_frame_t *read_frame; - switch_assert(thread != NULL); - switch_assert(session != NULL); +// switch_assert(thread != NULL); +// switch_assert(session != NULL); if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { return NULL;

1 0

[commit] r12645 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: mikej Date: Tue Mar 17 11:32:29 2009 New Revision: 12645 Log: fix windows build error Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Tue Mar 17 11:32:29 2009 @@ -239,11 +239,11 @@ } if (!known) { + char *foo; printf("INCOMING DATA [%s]\n%s\n", type, handle->last_event->body ? handle->last_event->body : ""); - char *foo; - esl_event_serialize(handle->last_event, &foo, ESL_FALSE); - printf("RECV EVENT\n%s\n", foo); - free(foo); + esl_event_serialize(handle->last_event, &foo, ESL_FALSE); + printf("RECV EVENT\n%s\n", foo); + free(foo); } } }

1 0

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

17 Mar '09

Author: mikej Date: Tue Mar 17 11:28:16 2009 New Revision: 12644 Log: mod_voicemail: fix password check (MODAPP-234) 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 17 11:28:16 2009 @@ -2075,20 +2075,20 @@ const char *val = switch_xml_attr_soft(x_param, "value"); if (!strcasecmp(var, "a1-hash")) { - thehash = val; + thehash = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-a1-hash")) { - vmhash = val; + vmhash = switch_core_session_strdup(session, val); } else if (!auth && !thepass && !strcasecmp(var, "password")) { - thepass = val; + thepass = switch_core_session_strdup(session, val); } else if (!auth && !strcasecmp(var, "vm-password")) { if (!switch_strlen_zero(val) && !strcasecmp(val, "user-choose")) { if (switch_strlen_zero(cbt.password)) { auth = 1; } else { - thepass = val; + thepass = switch_core_session_strdup(session, val); } } else { - thepass = val; + thepass = switch_core_session_strdup(session, val); } } else if (!strcasecmp(var, "vm-mailto")) { vm_email = switch_core_session_strdup(session, val);

1 0

[commit] r12643 - freeswitch/trunk/src
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: anthm Date: Tue Mar 17 11:23:32 2009 New Revision: 12643 Log: FSCORE-336 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 Tue Mar 17 11:23:32 2009 @@ -1440,7 +1440,7 @@ } if (current_variable || (current_variable = switch_event_get_header(var_event, "origination_caller_id_name"))) { - new_profile->caller_id_number = switch_core_strdup(new_profile->pool, current_variable); + new_profile->caller_id_name = switch_core_strdup(new_profile->pool, current_variable); myflags |= SOF_NO_EFFECTIVE_CID_NAME; }

1 0

[commit] r12642 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: anthm Date: Tue Mar 17 11:02:18 2009 New Revision: 12642 Log: comment out shutdown command that causes crash on unload Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 17 11:02:18 2009 @@ -3746,7 +3746,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown) { - JS_DestroyRuntime(globals.rt); + // this causes a crash + //JS_DestroyRuntime(globals.rt); curl_global_cleanup(); switch_event_unbind(&globals.node);

1 0

[commit] r12641 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 17 Mar '09

17 Mar '09

Author: anthm Date: Tue Mar 17 10:24:47 2009 New Revision: 12641 Log: MODENDP-198 MODENDP-199 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Tue Mar 17 10:24:47 2009 @@ -389,6 +389,7 @@ if (!strcasecmp(type, "initiate") || !strcasecmp(type, "accept")) { dl_signal = LDL_SIGNAL_INITIATE; + if (!strcasecmp(type, "accept")) { msg = "accept"; } @@ -1432,10 +1433,10 @@ ldl_set_flag_locked(handle, LDL_FLAG_QUEUE_RUNNING); - while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { + while (ldl_test_flag(handle, LDL_FLAG_RUNNING)) { ldl_flush_queue(handle, 0); - if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS) { + if (handle->loop_callback(handle) != LDL_STATUS_SUCCESS || !ldl_test_flag((&globals), LDL_FLAG_READY)) { int fd; if ((fd = iks_fd(handle->parser)) > -1) { @@ -1470,6 +1471,7 @@ while (ldl_test_flag((&globals), LDL_FLAG_READY) && ldl_test_flag(handle, LDL_FLAG_RUNNING)) { int e; char tmp[512], *sl; + int fd; handle->parser = iks_stream_new(ldl_test_flag(handle, LDL_FLAG_COMPONENT) ? IKS_NS_COMPONENT : IKS_NS_CLIENT, handle, @@ -1570,6 +1572,10 @@ ldl_clear_flag_locked(handle, LDL_FLAG_CONNECTED); ldl_clear_flag_locked(handle, LDL_FLAG_AUTHORIZED); handle->state = CS_NEW; + + if ((fd = iks_fd(handle->parser)) > -1) { + shutdown(fd, 0x02); + } while(ldl_test_flag(handle, LDL_FLAG_QUEUE_RUNNING)) { microsleep(100); @@ -2224,7 +2230,7 @@ int8_t ldl_handle_ready(ldl_handle_t *handle) { - return (int8_t)ldl_test_flag(handle, LDL_FLAG_READY); + return (int8_t) (ldl_test_flag(handle, LDL_FLAG_READY) && ldl_test_flag((&globals), LDL_FLAG_READY)); } ldl_status ldl_handle_init(ldl_handle_t **handle, Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Mar 17 10:24:47 2009 @@ -873,11 +873,16 @@ tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); flags = SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG; + if (switch_test_flag(tech_pvt->profile, TFLAG_TIMER)) { flags |= SWITCH_RTP_FLAG_USE_TIMER; } + if (switch_true(switch_channel_get_variable(channel, "disable_rtp_auto_adjust"))) { + flags &= ~SWITCH_RTP_FLAG_AUTOADJ; + } + if (!(tech_pvt->rtp_session = switch_rtp_new(tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, @@ -1131,7 +1136,9 @@ if (!do_candidates(tech_pvt, 0)) { goto out; } - switch_channel_answer(channel); + if (switch_test_flag(tech_pvt, TFLAG_TRANSPORT_ACCEPT)) { + switch_channel_answer(channel); + } } ret = SWITCH_STATUS_SUCCESS; @@ -2549,7 +2556,7 @@ status = LDL_STATUS_FALSE; goto done; } - + } else { if (dl_signal != LDL_SIGNAL_INITIATE && !msg) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n"); @@ -2746,6 +2753,7 @@ if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { if (!strcasecmp(msg, "accept")) { switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); + switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); if (!do_candidates(tech_pvt, 0)) { terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); status = LDL_STATUS_FALSE; @@ -2909,7 +2917,7 @@ } if (!strcasecmp(subject, "candidates")) { - switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); + //switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT); switch_set_flag_locked(tech_pvt, TFLAG_ANSWER); }

1 0