February 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11906 - freeswitch/trunk
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:45:21 2009 New Revision: 11906 Log: Added some more libs Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Wed Feb 11 18:45:21 2009 @@ -201,13 +201,13 @@ #ADD_SUBDIRECTORY(libs/sqlite/) ADD_SUBDIRECTORY(libs/pcre/) ADD_SUBDIRECTORY(libs/stfu/) -#ADD_SUBDIRECTORY(libs/libedit/) +ADD_SUBDIRECTORY(libs/libedit/) ADD_SUBDIRECTORY(libs/srtp/) SET ( freeswitch_SRCS src/switch.c src/include/switch.h) ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) -TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample freeswith_la stfu ${optionalLibs}) +TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample freeswitch_la stfu ${optionalLibs})

1 0

[commit] r11905 - freeswitch/trunk/libs/stfu
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:44:11 2009 New Revision: 11905 Log: Added CMAKE stfu Added: freeswitch/trunk/libs/stfu/CMakeLists.txt Added: freeswitch/trunk/libs/stfu/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/stfu/CMakeLists.txt Wed Feb 11 18:44:11 2009 @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/) + +SET ( stfu_SRCS stfu.c stfu.h) +ADD_LIBRARY(stfu STATIC ${stfu_SRCS}) + + + + + + +

1 0

[commit] r11904 - freeswitch/trunk/libs/pcre
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:42:31 2009 New Revision: 11904 Log: Added CMAKE pcre Added: freeswitch/trunk/libs/pcre/CMakeLists.txt Added: freeswitch/trunk/libs/pcre/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/pcre/CMakeLists.txt Wed Feb 11 18:42:31 2009 @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/) + +SET ( pcre_SRCS pcre_compile.c pcre_tables.c pcre_config.c pcre_try_flipped.c pcre_dfa_exec.c pcre_ucp_searchfuncs.c pcre_exec.c pcre_valid_utf8.c pcre_fullinfo.c pcre_version.c dftables.c pcre_get.c pcre_xclass.c pcre_globals.c pcre_info.c pcrecpp.h pcre_internal.h pcre_maketables.c pcrecpparg.h pcre_ord2utf8.c pcredemo.c pcre_refcount.c pcregrep.c pcreposix.c pcre_scanner.h pcreposix.h pcre_scanner_unittest.cc pcretest.c pcre_stringpiece.h pcre_stringpiece.h.in ucp.h pcre.h ucpinternal.h pcre_chartables.c ) + + + + +ADD_LIBRARY(pcre STATIC ${pcre_SRCS}) + + + + + + +

1 0

[commit] r11903 - freeswitch/trunk/libs/libresample
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:42:01 2009 New Revision: 11903 Log: Added CMAKE libresample Added: freeswitch/trunk/libs/libresample/CMakeLists.txt Added: freeswitch/trunk/libs/libresample/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libresample/CMakeLists.txt Wed Feb 11 18:42:01 2009 @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/) + +SET ( resample_SRCS src/resample.c src/filterkit.c src/resamplesubs.c include/libresample.h) +ADD_LIBRARY(resample STATIC ${resample_SRCS}) + + + + + + +

1 0

[commit] r11902 - freeswitch/trunk
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:28:46 2009 New Revision: 11902 Log: Added CMAKE libteletone Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Wed Feb 11 18:28:46 2009 @@ -3,11 +3,20 @@ PROJECT (freeswitch) +#GETSVN VERSION +FIND_PACKAGE(Subversion) +IF(Subversion_FOUND) + Subversion_WC_INFO(${CMAKE_HOME_DIRECTORY} Project) + MESSAGE("Current revision is ${Project_WC_REVISION}") +ENDIF(Subversion_FOUND) + + + # project version SET( ${PROJECT_NAME}_MAJOR_VERSION 0 ) SET( ${PROJECT_NAME}_MINOR_VERSION 1 ) SET( ${PROJECT_NAME}_PATCH_LEVEL 0 ) - +SET( ${SWITCH_VERSION_REVISION}$Project_WC_REVISION) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") INCLUDE (CheckSymbolExists) @@ -93,6 +102,7 @@ MESSAGE( STATUS "WIN32: " ${WIN32} ) # is TRUE on Apple OS X MESSAGE( STATUS "APPLE: " ${APPLE} ) + # is TRUE when using the MinGW compiler in Windows MESSAGE( STATUS "MINGW: " ${MINGW} ) # is TRUE on Windows when using the CygWin version of cmake @@ -139,6 +149,15 @@ LINK_LIBRARIES (${PATH_LIB_EDIT}) INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) +if( PATH_LIB_EDIT) + add_definitions( -DSWITCH_HAVE_LIBEDIT) + MESSAGE( STATUS "Found libedit = ${PATH_LIB_EDIT}" ) +endif( PATH_LIB_EDIT) + + +#TESTING SECTION +add_definitions(-DMACOSX) + # DO SRTP LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libcryptomath.a) LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libsrtp.a) @@ -159,6 +178,15 @@ SET(optionalLibs ${optionalLibs} ${POSTGRES_LIBRARIES} ) ENDIF(POSTGRES_FOUND) + + + +configure_file(src/include/switch_version.h.in src/include/switch_version.h [@ONLY]) + + + + + CHECK_INCLUDE_FILE(netdb.h HAVE_NETDB_H) if( HAVE_NETDB_H) add_definitions( -DHAVE_NETDB_H)

1 0

[commit] r11901 - freeswitch/trunk/libs/libteletone
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: shaneb Date: Wed Feb 11 18:28:37 2009 New Revision: 11901 Log: Added CMAKE libteletone Added: freeswitch/trunk/libs/libteletone/CMakeLists.txt Added: freeswitch/trunk/libs/libteletone/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libteletone/CMakeLists.txt Wed Feb 11 18:28:37 2009 @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/) + +SET ( teletone_SRCS src/libteletone.h src/libteletone_detect.c src/libteletone_detect.h src/libteletone_generate.c src/libteletone_generate.h) +ADD_LIBRARY(teletone STATIC ${teletone_SRCS}) + + + + + + +

1 0

[commit] r11900 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/dialplans/mod_dialplan_xml mod/endpoints/mod_dingaling mod/endpoints/mod_sofia
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: mikej Date: Wed Feb 11 18:27:07 2009 New Revision: 11900 Log: prevent exclusive hold on xml registry during visits to the phrase section Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Wed Feb 11 18:27:07 2009 @@ -331,8 +331,12 @@ ///\return SWITCH_STATUS_SUCCESS if successful root and node will be assigned SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, const char *tag_name, - const char *key_name, const char *key_value, switch_xml_t *root, switch_xml_t *node, - switch_event_t *params); + const char *key_name, + const char *key_value, + switch_xml_t *root, + switch_xml_t *node, + switch_event_t *params, + switch_bool_t clone); SWITCH_DECLARE(switch_status_t) switch_xml_locate_domain(const char *domain_name, switch_event_t *params, switch_xml_t *root, switch_xml_t *domain); Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Feb 11 18:27:07 2009 @@ -669,7 +669,7 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "tag_attr_name", tag_attr_name); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "tag_attr_val", tag_attr_val); - if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate(section, tag, tag_attr_name, tag_attr_val, &xml, &obj, params, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "can't find anything\n"); goto end; } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Wed Feb 11 18:27:07 2009 @@ -206,8 +206,7 @@ switch_channel_event_set_data(channel, params); switch_caller_profile_event_set_data(caller_profile, "Hunt", params); - - status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params); + status = switch_xml_locate("dialplan", NULL, NULL, NULL, root, node, params, SWITCH_FALSE); switch_event_destroy(&params); return status; } 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 Wed Feb 11 18:27:07 2009 @@ -2277,7 +2277,7 @@ switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "from", from); switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "object", "vcard"); - if (switch_xml_locate("directory", "domain", "name", to_host, &xml, &domain, params) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("directory", "domain", "name", to_host, &xml, &domain, params, SWITCH_FALSE) != SWITCH_STATUS_SUCCESS) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "can't find domain for [%s@%s]\n", to_user, to_host); goto end; } 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 Wed Feb 11 18:27:07 2009 @@ -1653,7 +1653,7 @@ if (!switch_strlen_zero(dname)) { if (!strcasecmp(dname, "all")) { switch_xml_t xml_root, x_domains; - if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) { dname = switch_xml_attr_soft(x_domain_tag, "name"); parse_domain_tag(profile, x_domain_tag, dname, parse, alias); @@ -2361,7 +2361,7 @@ if (!switch_strlen_zero(dname)) { if (!strcasecmp(dname, "all")) { switch_xml_t xml_root, x_domains; - if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params) == SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("directory", NULL, NULL, NULL, &xml_root, &x_domains, xml_params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { for (x_domain_tag = switch_xml_child(x_domains, "domain"); x_domain_tag; x_domain_tag = x_domain_tag->next) { dname = switch_xml_attr_soft(x_domain_tag, "name"); parse_domain_tag(profile, x_domain_tag, dname, parse, alias); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Feb 11 18:27:07 2009 @@ -133,7 +133,7 @@ } switch_channel_event_set_data(channel, hint_data); - if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of phrases failed.\n"); goto done; } Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Wed Feb 11 18:27:07 2009 @@ -1491,8 +1491,12 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate(const char *section, const char *tag_name, - const char *key_name, const char *key_value, switch_xml_t * root, switch_xml_t * node, - switch_event_t *params) + const char *key_name, + const char *key_value, + switch_xml_t *root, + switch_xml_t *node, + switch_event_t *params, + switch_bool_t clone) { switch_xml_t conf = NULL; switch_xml_t tag = NULL; @@ -1547,8 +1551,16 @@ } if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) { - *node = tag; - *root = xml; + if (clone) { + char *x = switch_xml_toxml(tag, SWITCH_FALSE); + switch_assert(x); + *root = switch_xml_parse_str(x, strlen(x)); + *node = *root; + switch_xml_free(xml); + } else { + *node = tag; + *root = xml; + } return SWITCH_STATUS_SUCCESS; } else { switch_xml_free(xml); @@ -1577,7 +1589,7 @@ params = my_params; } - status = switch_xml_locate("directory", "domain", "name", domain_name, root, domain, params); + status = switch_xml_locate("directory", "domain", "name", domain_name, root, domain, params, SWITCH_FALSE); if (my_params) { switch_event_destroy(&my_params); } @@ -1914,7 +1926,7 @@ assert(MAIN_XML_ROOT != NULL); - if (switch_xml_locate("configuration", "configuration", "name", file_path, &xml, &cfg, params) == SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate("configuration", "configuration", "name", file_path, &xml, &cfg, params, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { *node = cfg; }

1 0

[commit] r11899 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 12 Feb '09

12 Feb '09

Author: anthm Date: Wed Feb 11 18:26:04 2009 New Revision: 11899 Log: changes to put freeswitch in control of lifecycle of some critical objects, -sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Feb 11 18:26:04 2009 @@ -47,6 +47,9 @@ static const char ModuleName[] = "opal"; +static switch_status_t on_hangup(switch_core_session_t *session); + + static switch_io_routines_t opalfs_io_routines = { /*.outgoing_channel */ create_outgoing_channel, /*.read_frame */ FSConnection::read_audio_frame, @@ -64,7 +67,7 @@ /*.on_init */ FSConnection::on_init, /*.on_routing */ FSConnection::on_routing, /*.on_execute */ FSConnection::on_execute, - /*.on_hangup */ FSConnection::on_hangup, + /*.on_hangup */ on_hangup, /*.on_loopback */ FSConnection::on_loopback, /*.on_transmit */ FSConnection::on_transmit }; @@ -486,14 +489,19 @@ /////////////////////////////////////////////////////////////////////// + FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint) : OpalLocalConnection(call, endpoint, NULL) , m_endpoint(endpoint) { + opal_private_t *tech_pvt; FSManager & mgr = (FSManager &) endpoint.GetManager(); m_fsSession = switch_core_session_request(mgr.GetSwitchInterface(), NULL); m_fsChannel = switch_core_session_get_channel(m_fsSession); - switch_core_session_set_private(m_fsSession, this); + + tech_pvt = (opal_private_t *) switch_core_session_alloc(m_fsSession, sizeof(*tech_pvt)); + tech_pvt->me = this; + switch_core_session_set_private(m_fsSession, tech_pvt); } @@ -568,11 +576,16 @@ void FSConnection::OnReleased() { + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(m_fsSession); + + /* so FS on_hangup will not try to deref a landmine */ + tech_pvt->me = NULL; + m_rxAudioOpened.Signal(); // Just in case m_txAudioOpened.Signal(); H225_ReleaseCompleteReason dummy; switch_channel_hangup(switch_core_session_get_channel(m_fsSession), - (switch_call_cause_t)H323TranslateFromCallEndReason(GetCallEndReason(), dummy)); + (switch_call_cause_t)H323TranslateFromCallEndReason(GetCallEndReason(), dummy)); OpalLocalConnection::OnReleased(); } @@ -752,16 +765,49 @@ } -switch_status_t FSConnection::on_hangup() +/* this function has to be called with the original session beause the FSConnection might already be destroyed and we + will can't have it be a method of a dead object + */ +static switch_status_t on_hangup(switch_core_session_t *session) { - switch_channel_t *channel = switch_core_session_get_channel(m_fsSession); - if (channel == NULL) { - return SWITCH_STATUS_FALSE; + switch_channel_t *channel = switch_core_session_get_channel(session); + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); + + /* if this is still here it was our idea to hangup not opal's */ + if (tech_pvt->me) { + Q931::CauseValues cause = (Q931::CauseValues)switch_channel_get_cause_q850(channel); + tech_pvt->me->SetQ931Cause(cause); + tech_pvt->me->ClearCallSynchronous(NULL, H323TranslateToCallEndReason(cause, UINT_MAX)); + tech_pvt->me = NULL; + } + + if (tech_pvt->read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->read_codec); } - Q931::CauseValues cause = (Q931::CauseValues)switch_channel_get_cause_q850(channel); - SetQ931Cause(cause); - ClearCallSynchronous(NULL, H323TranslateToCallEndReason(cause, UINT_MAX)); + if (tech_pvt->write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } + + if (tech_pvt->vid_read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_read_codec); + } + + if (tech_pvt->vid_write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_write_codec); + } + + if (tech_pvt->read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->read_timer); + } + + if (tech_pvt->vid_read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->vid_read_timer); + } + + switch_core_session_unset_read_codec(session); + switch_core_session_unset_write_codec(session); + return SWITCH_STATUS_SUCCESS; } @@ -808,8 +854,7 @@ switch_status_t FSConnection::receive_message(switch_core_session_message_t *msg) { - switch_core_session_t *session = GetSession(); - switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_t *channel = switch_core_session_get_channel(m_fsSession); /* @@ -969,13 +1014,15 @@ , m_callOnStart(true) { memset(&m_readFrame, 0, sizeof(m_readFrame)); - m_readFrame.codec = &m_switchCodec; + m_readFrame.codec = m_switchCodec; m_readFrame.flags = SFF_RAW_RTP; } PBoolean FSMediaStream::Open() { + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(m_fsSession); + if (IsOpen()) { return true; } @@ -993,13 +1040,21 @@ int ptime = mediaFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption()) * mediaFormat.GetFrameTime() / mediaFormat.GetTimeUnits(); + + if (IsSink()) { + m_switchCodec = isAudio ? &tech_pvt->read_codec : &tech_pvt->vid_read_codec; + m_switchTimer = isAudio ? &tech_pvt->read_timer : &tech_pvt->vid_read_timer; + } else { + m_switchCodec = isAudio ? &tech_pvt->write_codec : &tech_pvt->vid_write_codec; + } + // The following is performed on two different instances of this object. - if (switch_core_codec_init(&m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP + if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP mediaFormat.GetClockRate(), ptime, 1, // Channels SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, // Settings switch_core_session_get_pool(m_fsSession)) != SWITCH_STATUS_SUCCESS) { // Could not select a codecs using negotiated frames/packet, so try using default. - if (switch_core_codec_init(&m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP + if (switch_core_codec_init(m_switchCodec, mediaFormat.GetEncodingName(), NULL, // FMTP mediaFormat.GetClockRate(), 0, 1, // Channels SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, // Settings switch_core_session_get_pool(m_fsSession)) != SWITCH_STATUS_SUCCESS) { @@ -1020,24 +1075,25 @@ m_readFrame.rate = mediaFormat.GetClockRate(); if (isAudio) { - switch_core_session_set_read_codec(m_fsSession, &m_switchCodec); - if (switch_core_timer_init(&m_switchTimer, + switch_core_session_set_read_codec(m_fsSession, m_switchCodec); + if (switch_core_timer_init(m_switchTimer, "soft", - m_switchCodec.implementation->microseconds_per_packet / 1000, - m_switchCodec.implementation->samples_per_packet, + m_switchCodec->implementation->microseconds_per_packet / 1000, + m_switchCodec->implementation->samples_per_packet, switch_core_session_get_pool(m_fsSession)) != SWITCH_STATUS_SUCCESS) { - switch_core_codec_destroy(&m_switchCodec); + switch_core_codec_destroy(m_switchCodec); + m_switchCodec = NULL; return false; } } else { - switch_core_session_set_video_read_codec(m_fsSession, &m_switchCodec); + switch_core_session_set_video_read_codec(m_fsSession, m_switchCodec); switch_channel_set_flag(m_fsChannel, CF_VIDEO); } } else { if (isAudio) { - switch_core_session_set_write_codec(m_fsSession, &m_switchCodec); + switch_core_session_set_write_codec(m_fsSession, m_switchCodec); } else { - switch_core_session_set_video_write_codec(m_fsSession, &m_switchCodec); + switch_core_session_set_video_write_codec(m_fsSession, m_switchCodec); switch_channel_set_flag(m_fsChannel, CF_VIDEO); } } @@ -1053,36 +1109,11 @@ { if (!IsOpen()) return false; + + /* forget these FS will properly destroy them for us */ - bool isAudio; - - if (mediaFormat.GetMediaType() == OpalMediaType::Audio()) { - isAudio = true; - } else if (mediaFormat.GetMediaType() == OpalMediaType::Video()) { - isAudio = false; - } else { - return OpalMediaStream::Close(); - } - - if (IsSink()) { - if (isAudio) { - switch_core_session_unset_read_codec(m_fsSession); - switch_core_timer_destroy(&m_switchTimer); - } else { - switch_core_session_set_video_read_codec(m_fsSession, NULL); - } - - switch_core_codec_destroy(&m_switchCodec); - } else { - if (isAudio) - switch_core_session_unset_write_codec(m_fsSession); - else - switch_core_session_set_video_write_codec(m_fsSession, NULL); - switch_core_codec_destroy(&m_switchCodec); - } - - PTRACE(3, "mod_opal\tReset & destroyed " << (IsSink()? "read" : "write") - << ' ' << mediaFormat.GetMediaType() << " codec for connection " << *this); + m_switchTimer = NULL; + m_switchCodec = NULL; return OpalMediaStream::Close(); } @@ -1102,6 +1133,11 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag_t flags) { + + if (!m_switchCodec) { + return SWITCH_STATUS_FALSE; + } + if (m_callOnStart) { /* There is a race here... sometimes we make it here and GetPatch() is NULL @@ -1148,11 +1184,11 @@ } } else { - if (!GetPatch()->GetSource().ReadPacket(m_readRTP)) { + if (!m_switchTimer || !GetPatch()->GetSource().ReadPacket(m_readRTP)) { return SWITCH_STATUS_FALSE; } - switch_core_timer_next(&m_switchTimer); + switch_core_timer_next(m_switchTimer); if (!(m_readFrame.datalen = m_readRTP.GetPayloadSize())) { m_readFrame.flags = SFF_CNG; @@ -1174,6 +1210,7 @@ m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker(); m_readFrame.seq = m_readRTP.GetSequenceNumber(); m_readFrame.ssrc = m_readRTP.GetSyncSource(); + m_readFrame.codec = m_switchCodec; *frame = &m_readFrame; return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Wed Feb 11 18:26:04 2009 @@ -106,6 +106,18 @@ list < FSListener > m_listeners; }; +class FSConnection; +typedef struct { + switch_timer_t read_timer; + switch_codec_t read_codec; + switch_codec_t write_codec; + + switch_timer_t vid_read_timer; + switch_codec_t vid_read_codec; + switch_codec_t vid_write_codec; + FSConnection *me; +} opal_private_t; + class FSEndPoint:public OpalLocalEndPoint { PCLASSINFO(FSEndPoint, OpalLocalEndPoint); @@ -117,23 +129,25 @@ }; -#define DECLARE_CALLBACK0(name) \ +#define DECLARE_CALLBACK0(name) \ static switch_status_t name(switch_core_session_t *session) { \ - FSConnection * conn = (FSConnection *)switch_core_session_get_private(session); \ - return conn != NULL ? conn->name() : SWITCH_STATUS_FALSE; } \ + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ + return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name() : SWITCH_STATUS_FALSE; } \ switch_status_t name() #define DECLARE_CALLBACK1(name, type1, name1) \ static switch_status_t name(switch_core_session_t *session, type1 name1) { \ - FSConnection * conn = (FSConnection *)switch_core_session_get_private(session); \ - return conn != NULL ? conn->name(name1) : SWITCH_STATUS_FALSE; } \ - switch_status_t name(type1 name1) + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ + return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name(name1) : SWITCH_STATUS_FALSE; } \ +switch_status_t name(type1 name1) #define DECLARE_CALLBACK3(name, type1, name1, type2, name2, type3, name3) \ static switch_status_t name(switch_core_session_t *session, type1 name1, type2 name2, type3 name3) { \ - FSConnection * conn = (FSConnection *)switch_core_session_get_private(session); \ - return conn != NULL ? conn->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \ - switch_status_t name(type1 name1, type2 name2, type3 name3) + opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); \ + return tech_pvt && tech_pvt->me != NULL ? tech_pvt->me->name(name1, name2, name3) : SWITCH_STATUS_FALSE; } \ +switch_status_t name(type1 name1, type2 name2, type3 name3) + + class FSConnection:public OpalLocalConnection { @@ -156,7 +170,8 @@ DECLARE_CALLBACK0(on_init); DECLARE_CALLBACK0(on_routing); DECLARE_CALLBACK0(on_execute); - DECLARE_CALLBACK0(on_hangup); + //DECLARE_CALLBACK0(on_hangup); + DECLARE_CALLBACK0(on_loopback); DECLARE_CALLBACK0(on_transmit); @@ -206,8 +221,8 @@ private: switch_core_session_t *m_fsSession; switch_channel_t *m_fsChannel; - switch_timer_t m_switchTimer; - switch_codec_t m_switchCodec; + switch_timer_t *m_switchTimer; + switch_codec_t *m_switchCodec; switch_frame_t m_readFrame; RTP_DataFrame m_readRTP; bool m_callOnStart;

1 0

[commit] r11898 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 17:58:48 2009 New Revision: 11898 Log: tweak description Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Feb 11 17:58:48 2009 @@ -641,9 +641,6 @@ -->  -  +  + <!-- <extension name="ruri"> <condition field="destination_number" expression="^ruri$"> <action application="bridge" data="sofia/${ruri_profile}/${ruri_user}${regex(${sofia_contact(${ruri_contact})}|^[^\(a)]+(.*)|%1)}"/>

1 0

[commit] r11897 - freeswitch/trunk/libs/sofia-sip/m4
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: anthm Date: Wed Feb 11 17:39:30 2009 New Revision: 11897 Log: temp hack to avoid horrible random bug, as in the function random Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-su2.m4 Wed Feb 11 17:39:30 2009 @@ -526,7 +526,7 @@ AC_FUNC_ALLOCA -AC_CHECK_FUNCS([gettimeofday strerror random initstate tcsetattr flock \ +AC_CHECK_FUNCS([gettimeofday strerror random tcsetattr flock \ socketpair gethostname gethostbyname getipnodebyname \ poll epoll_create kqueue select if_nameindex \ signal alarm \

1 0