- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6101 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 13:30:50 2007 New Revision: 6101 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: make rtp timeout 10 times longer than specified value when the call is on hold Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Oct 31 13:30:50 2007 @@ -342,6 +342,7 @@ sip_contact_t *contact; uint32_t owner_id; uint32_t session_id; + uint32_t max_missed_packets; /** VIDEO **/ switch_frame_t video_read_frame; switch_codec_t video_read_codec; 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 Wed Oct 31 13:30:50 2007 @@ -1071,11 +1071,10 @@ } if (rtp_timeout_sec) { - uint32_t packets; - packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / + tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / tech_pvt->read_codec.implementation->samples_per_frame; - switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, packets); + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } if (tech_pvt->te) { @@ -1228,6 +1227,9 @@ if (!switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { char *stream; switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + if (tech_pvt->max_missed_packets) { + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets * 10); + } if (!(stream = switch_channel_get_variable(tech_pvt->channel, SWITCH_HOLD_MUSIC_VARIABLE))) { stream = tech_pvt->profile->hold_music; } @@ -1238,6 +1240,9 @@ } else { if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { switch_channel_clear_flag_partner(tech_pvt->channel, CF_BROADCAST); + if (tech_pvt->max_missed_packets) { + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); + } switch_channel_set_flag_partner(tech_pvt->channel, CF_BREAK); switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); }

1 0

[commit] r6100 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: lzwierko Date: Wed Oct 31 13:28:44 2007 New Revision: 6100 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Log: Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Wed Oct 31 13:28:44 2007 @@ -15,11 +15,11 @@ OPALDIR=$(switch_builddir)/libs/opal mod_LTLIBRARIES = mod_opal.la -mod_opal_la_SOURCES = opalh323_backend.cpp mod_opalh323.cpp +mod_opal_la_SOURCES = opal_backend.cpp mod_opal.cpp mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -DPTRACING -Os -felide-constructors -Wreorder -I$(OPALDIR)/include mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(OPALDIR)/lib -lopal_linux_x86_r -lpt_linux_x86_r -lpthread -lsasl2 -lssl -lcrypto -lexpat -ldl +mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(OPALDIR)/lib -lopal_linux_x86_r -lpt_linux_x86_r -lpthread -ldl -fPIC -DPIC #Override the linstall target so we just install the .so/.dylib

1 0

[commit] r6099 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: lzwierko Date: Wed Oct 31 13:28:37 2007 New Revision: 6099 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h Log: changed file names Added: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Oct 31 13:28:37 2007 @@ -0,0 +1,258 @@ +/* + * mod_opalh323.cpp + * + * Opal-H323 gluer for Freeswitch + * This file implements fontend of OpalH323 module functions + * that is all functions that are used for communication + * between FreeSWITCH core and this module + * + * + * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * + * The Initial Developer of the Original Code is Lukasz Zwierko (lzwierko(a)gmail.com) + * + * Contributor(s): + * + * $Log: mod_opalh323.cpp,v $ + * + * Revision 1.00 2007/10/24 07:29:52 lzwierko + * Initial revision + */ + + +#include "mod_opal.h" +#include "opal_backend.h" +#include <switch.h> + +/* + * IO routines handlers definitions for H323 + */ +static switch_call_cause_t opalh323_outgoing_channel(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t **); +static switch_status_t opalh323_read_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); +static switch_status_t opalh323_write_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int); +static switch_status_t opalh323_kill_channel(switch_core_session_t *, int); +static switch_status_t opalh323_waitfor_read(switch_core_session_t *, int, int); +static switch_status_t opalh323_waitfor_write(switch_core_session_t *, int, int); +static switch_status_t opalh323_send_dtmf(switch_core_session_t *, char *); +static switch_status_t opalh323_receive_message(switch_core_session_t *, switch_core_session_message_t *); +static switch_status_t opalh323_receive_event(switch_core_session_t *, switch_event_t *); +static switch_status_t opalh323_state_change(switch_core_session_t *); +static switch_status_t opalh323_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); +static switch_status_t opalh323_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int); +/* + * Event handlers declaration for H323 + */ +static switch_status_t opalh323_on_init(switch_core_session_t *session); +static switch_status_t opalh323_on_ring(switch_core_session_t *session); +static switch_status_t opalh323_on_execute(switch_core_session_t *session); +static switch_status_t opalh323_on_hangup(switch_core_session_t *session); +static switch_status_t opalh323_on_loopback(switch_core_session_t *session); +static switch_status_t opalh323_on_transmit(switch_core_session_t *session); + +/** + * Declaration of private variables + */ +static FSOpalManager *opal_manager = NULL; +static switch_memory_pool_t *opal_pool = NULL; +static switch_endpoint_interface_t *opalh323_endpoint_interface; + +/* + * IO routines handlers set declaration + */ +static switch_io_routines_t opalh323_io_routines = { + /*.outgoing_channel */ opalh323_outgoing_channel, + /*.read_frame */ opalh323_read_frame, + /*.write_frame */ opalh323_write_frame, + /*.kill_channel */ opalh323_kill_channel, + /*.waitfor_read */ opalh323_waitfor_read, + /*.waitfor_read */ opalh323_waitfor_write, + /*.send_dtmf */ opalh323_send_dtmf, + /*.receive_message */ opalh323_receive_message, + /*.receive_event */ opalh323_receive_event, + /*.state_change*/ opalh323_state_change, + /*.read_video_frame*/ opalh323_read_video_frame, + /*.write_video_frame*/ opalh323_write_video_frame +}; + +static switch_state_handler_table_t opalh323_event_handlers = { + /*.on_init */ opalh323_on_init, + /*.on_ring */ opalh323_on_ring, + /*.on_execute */ opalh323_on_execute, + /*.on_hangup */ opalh323_on_hangup, + /*.on_loopback */ opalh323_on_loopback, + /*.on_transmit */ opalh323_on_transmit +}; + +/* + * Loadable FreeSWITCH module functions declaration + */ +SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opal_shutdown); +SWITCH_MODULE_DEFINITION(mod_opal, mod_opal_load, mod_opal_shutdown, NULL); + +/* + * This function is called on module load + * It sets up: + * 1. frontend - interface to FreeSWITCH core + * 2. backend - inerface to OPAL core + * + */ +SWITCH_MODULE_LOAD_FUNCTION(mod_opal_load) +{ + + /* frontend initialization*/ + *module_interface =NULL; + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + assert(*module_interface); + if(!module_interface) + { + return SWITCH_STATUS_MEMERR; + } + opalh323_endpoint_interface = (switch_endpoint_interface_t*)switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + opalh323_endpoint_interface->interface_name = "OPALH323"; + opalh323_endpoint_interface->io_routines = &opalh323_io_routines; + opalh323_endpoint_interface->state_handler = &opalh323_event_handlers; + + /* backend initialization */ + opal_manager = new FSOpalManager(); + assert(opal_manager); + if(!opal_manager) + { + return SWITCH_STATUS_MEMERR; + } + + if(!opal_manager->initialize(modname,pool,opalh323_endpoint_interface)) + { + delete opal_manager; + return SWITCH_STATUS_FALSE; /* if can't initialize return general error */ + } + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + * This functionis called on module teardown + * It releases all internal resources, i.e. + * it dealocates OPAL core + * + */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opalh323_shutdown) +{ + /* deallocate OPAL manager */ + delete opal_manager; + return SWITCH_STATUS_SUCCESS; +} + +/* + * IO routines handlers definitions + */ +static switch_call_cause_t opalh323_outgoing_channel( + switch_core_session_t *session, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, + switch_memory_pool_t **pool) +{ + return opal_manager->io_outgoing_channel(session,outbound_profile,new_session,pool); +} + +static switch_status_t opalh323_read_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flags, int stream_id) +{ + return opal_manager->io_read_frame(session,frame,timeout,flags,stream_id); +} + +static switch_status_t opalh323_write_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flags, int stream_id) +{ + return opal_manager->io_write_frame(session,frame,timeout,flags,stream_id); +} + +static switch_status_t opalh323_kill_channel(switch_core_session_t *session, int sig) +{ + return opal_manager->io_kill_channel(session,sig); +} + +static switch_status_t opalh323_waitfor_read(switch_core_session_t *session, int ms, int stream_id) +{ + return opal_manager->io_waitfor_read(session,ms,stream_id); +} + +static switch_status_t opalh323_waitfor_write(switch_core_session_t *session, int ms, int stream_id) +{ + return opal_manager->io_waitfor_write(session,ms,stream_id); +} + +static switch_status_t opalh323_send_dtmf(switch_core_session_t *session, char *dtmf) +{ + return opal_manager->io_send_dtmf(session,dtmf); +} + +static switch_status_t opalh323_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + return opal_manager->io_receive_message(session,msg); +} + +static switch_status_t opalh323_receive_event(switch_core_session_t *session, switch_event_t *event) +{ + return opal_manager->io_receive_event(session,event); +} + +static switch_status_t opalh323_state_change(switch_core_session_t *session) +{ + return opal_manager->io_state_change(session); +} + +static switch_status_t opalh323_read_video_frame(switch_core_session_t *session, switch_frame_t **frame, int timeout, switch_io_flag_t flag, int stream_id) +{ + return opal_manager->io_read_video_frame(session,frame,timeout,flag,stream_id); +} + +static switch_status_t opalh323_write_video_frame(switch_core_session_t *session, switch_frame_t *frame, int timeout, switch_io_flag_t flag, int stream_id) +{ + return opal_manager->io_write_video_frame(session,frame,timeout,flag,stream_id); +} + +/* + * Event handlers + */ + +static switch_status_t opalh323_on_init(switch_core_session_t *session) +{ + return opal_manager->callback_on_init(session); +} + +static switch_status_t opalh323_on_ring(switch_core_session_t *session) +{ + return opal_manager->callback_on_ring(session); +} + +static switch_status_t opalh323_on_execute(switch_core_session_t *session) +{ + return opal_manager->callback_on_execute(session); +} + +static switch_status_t opalh323_on_hangup(switch_core_session_t *session) +{ + return opal_manager->callback_on_hangup(session); +} + +static switch_status_t opalh323_on_loopback(switch_core_session_t *session) +{ + return opal_manager->callback_on_loopback(session); +} + +static switch_status_t opalh323_on_transmit(switch_core_session_t *session) +{ + return opal_manager->callback_on_transmit(session); +} Added: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Wed Oct 31 13:28:37 2007 @@ -0,0 +1,39 @@ +/* + * mod_opalh323.h + * + * Opal-H323 gluer for Freeswitch header file + * + * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * + * The Initial Developer of the Original Code is Lukasz Zwierko (lzwierko(a)gmail.com) + * + * Contributor(s): ______________________________________. + * + * $Log: mod_opalh323.cpp,v $ + * + * Revision 1.00 2007/10/24 07:29:52 lzwierko + * Initial revision + */ + +#ifndef __FREESWITCH_MOD_OPAL__ +#define __FREESWITCH_MOD_OPAL__ + +#define HAVE_APR /* what do I need this for?? copied from mod_sofia */ +#include <switch.h> +#include <switch_version.h> +#define MODNAME "mod_opal" + + + +#endif /* __FREESWITCH_MOD_OPAL__ */ Added: freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.cpp Wed Oct 31 13:28:37 2007 @@ -0,0 +1,517 @@ +/* + * opalh323_backend.cpp + * + * Backend for OpalH323 module, implements + * H323 handling via OPAL library + * + * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * + * The Initial Developer of the Original Code is Lukasz Zwierko (lzwierko(a)gmail.com) + * + * Contributor(s): + * + * $Log: opalh323_backend.cpp,v $ + * + * Revision 1.00 2007/10/24 07:29:52 lzwierko + * Initial revision + */ + +#include <switch.h> +#include "opal_backend.h" + +/** + * Private structre + */ + +typedef struct OpalH323Private_s +{ + OpalConnection *m_opalConnection; /** pointer to OpalConnection object */ + switch_mutex_t *m_mutex; /** mutex for synchonizing access to session object */ + switch_caller_profile_t *m_callerProfile; /** caller profile */ + +} OpalH323Private_t; + + +static bool OpalH323Private_Create(OpalH323Private_t **o_private, switch_core_session_t *i_session) +{ + *o_private = (OpalH323Private_t *)switch_core_session_alloc(i_session, sizeof(OpalH323Private_t)); + if(!o_private) + { + assert(0); + return false; + } + if(SWITCH_STATUS_SUCCESS != switch_mutex_init(&(*o_private)->m_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(i_session))) + { + assert(0); + return false; + } + + return true; + +} + +static bool OpalH323Private_Delete(OpalH323Private_t *o_private) +{ + return (switch_mutex_destroy(o_private->m_mutex)==SWITCH_STATUS_SUCCESS); +} + +/** Default constructor + * + */ +FSOpalManager::FSOpalManager() : + m_isInitialized(false), + m_pH323Endpoint(NULL), + m_pMemoryPool(NULL), + m_pH323EndpointInterface(NULL), + m_pSessionsHashTable(NULL), + m_pSessionsHashTableMutex(NULL) +{ + +} + +/** Destructor + * + */ +FSOpalManager::~FSOpalManager() +{ + /** + * Destroy all allocated resources, if any + */ + if(m_isInitialized) + { + delete m_pH323Endpoint; + switch_mutex_destroy(m_pSessionsHashTableMutex); + switch_core_hash_destroy(&m_pSessionsHashTable); + + } +} + + /** + * Method does real initialization of the manager + */ +bool FSOpalManager::initialize( + const char* i_modName, + switch_memory_pool_t* i_memoryPool, + switch_endpoint_interface_t *i_endpointInterface + ) +{ + /* check if not initialized */ + assert(m_isInitialized); + + /* check input parameters */ + assert(i_modName); + assert(i_memoryPool); + assert(i_endpointInterface); + + + m_pModuleName = i_modName; + m_pMemoryPool = i_memoryPool; + m_pH323EndpointInterface = i_endpointInterface; + + /** + * Create hash table for storing pointers to session objects, + * Each OpalConnection object will retreive it's session object using + * its callToken as a key + */ + + if(switch_core_hash_init(&m_pSessionsHashTable,m_pMemoryPool)!=SWITCH_STATUS_SUCCESS) + { + assert(0); + return false; + } + + if(switch_mutex_init(&m_pSessionsHashTableMutex,SWITCH_MUTEX_UNNESTED,m_pMemoryPool)!=SWITCH_STATUS_SUCCESS) + { + assert(0); + switch_core_hash_destroy(&m_pSessionsHashTable); + return false; + } + + /* create h323 endpoint */ + m_pH323Endpoint = new H323EndPoint( *(static_cast<OpalManager*>(this)) ); ///TODO, replace prefix and signaling port by values from configuration + if(!m_pH323Endpoint) + { + assert(0); + switch_core_hash_destroy(&m_pSessionsHashTable); + switch_mutex_destroy(m_pSessionsHashTableMutex); + return false; + } + + /** + * To do-> add codecs to capabilities (for call contol) + * m_pH323Endpoint->AddCapability(); + */ + + m_pH323Endpoint->DisableFastStart(false); ///TODO this should be configurable + m_pH323Endpoint->DisableH245Tunneling(false); ///TODO this should be configurable + + ///TODO gatekeeper use should be configurable, I think that sevral options should be implemented in config file: use, dont use, use one of specified with priorities, try to reconnect to the topmost... + ///TODO m_pH323Endpoint->SetInitialBandwidth(initialBandwidth); + ///TODO m_pH323Endpoint->SetVendorIdentifierInfo() + + ///TODO address should be configurable, should allow creaeing listeners on multiple interfaces + OpalTransportAddress opalTransportAddress("0.0.0.0",1720); //for time being create listener on all ip's and default port + if(!m_pH323Endpoint->StartListeners(opalTransportAddress)) + { + assert(0); + switch_core_hash_destroy(&m_pSessionsHashTable); + switch_mutex_destroy(m_pSessionsHashTableMutex); + delete m_pH323Endpoint; + return false; + } + + /* at this point OPAL is ready to go */ + m_isInitialized = true; + return true; +} + + + +switch_core_session_t* FSOpalManager::getSessionToken(const PString &i_token) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + return static_cast<switch_core_session_t*>(switch_core_hash_find_locked(m_pSessionsHashTable,(const char*)i_token,m_pSessionsHashTableMutex)); +} + +void FSOpalManager::saveSessionToken(const PString &i_token,switch_core_session_t* i_session) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + switch_core_hash_insert_locked(m_pSessionsHashTable,(const char*)i_token,i_session,m_pSessionsHashTableMutex); +} + +void FSOpalManager::deleteSessionToken(const PString &i_token) +{ + assert(m_pSessionsHashTable); + assert(m_pSessionsHashTableMutex); + switch_core_hash_delete_locked(m_pSessionsHashTable,(const char*)i_token,m_pSessionsHashTableMutex); +} + + +BOOL FSOpalManager::OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options, ///< options for new connection (can't use default as overrides will fail) + OpalConnection::StringOptions * stringOptions + ) +{ + //TODO check if options and stringOptions fields ever apply + return OnIncomingConnection(connection); +} + +BOOL FSOpalManager::OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options ///< options for new connection (can't use default as overrides will fail) + ) +{ + //TODO, check if options field ever applies + return OnIncomingConnection(connection); +} + +BOOL FSOpalManager::OnIncomingConnection( + OpalConnection & connection ///< Connection that is calling + ) +{ + /* allocate new session in switch core*/ + switch_core_session_t *session = switch_core_session_request(m_pH323EndpointInterface , NULL); + assert(session); + if(!session) + { + ///TODO add cause to the connection + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session object?\n"); + return FALSE; + } + + /* allocate private resources */ + OpalH323Private_t *tech_pvt = NULL; + if(!OpalH323Private_Create(&tech_pvt,session)) + { + ///TODO add cause to the connection + switch_core_session_destroy(&session); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate private object?\n"); + return false; + } + tech_pvt->m_opalConnection = &connection; + + + /** Save private data in session private data, and save session in hash tabel, under GetToken() key */ + switch_core_session_set_private(session,static_cast<void*>(tech_pvt)); ///save private data in session context + + /** Before adding this session to sessions hash table, + * lock he mutex so no concurrent + * callback can be runing for this connection + * probably other callbacks are called from this task + * but carfulness wont bite + */ + switch_mutex_lock(tech_pvt->m_mutex); + /** insert connection to hash table */ + saveSessionToken(connection.GetToken(),session); ///save pointer to session in hash table, for later retreival + + /** Create calling side profile */ + tech_pvt->m_callerProfile = switch_caller_profile_new( + switch_core_session_get_pool(session), + (const char*)connection.GetRemotePartyName(), /** username */ + "default", /** TODO -> this should be configurable by core */ + (const char*)connection.GetRemotePartyName(), /** caller_id_name */ + (const char*)connection.GetRemotePartyNumber(), /** caller_id_number */ + (const char*)connection.GetRemotePartyAddress(), /** network addr */ + NULL, /** ANI */ + NULL, /** ANI II */ + NULL, /** RDNIS */ + m_pModuleName, /** source */ + NULL, /** TODO -> set context */ + (const char*)connection.GetCalledDestinationNumber() /** destination_number */ + ); + + if(!tech_pvt->m_callerProfile) /* should never error */ + { + deleteSessionToken(connection.GetToken()); + switch_mutex_unlock(tech_pvt->m_mutex); + OpalH323Private_Delete(tech_pvt); + switch_core_session_destroy(&session); + assert(0); + return false; + } + + /** Set up sessions channel */ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_name(channel,(const char*)connection.GetToken()); + switch_channel_set_caller_profile(channel, tech_pvt->m_callerProfile); + switch_channel_set_state(channel, CS_INIT); + + /** Set up codecs for the channel ??? */ + + + /***Mark incoming call as AnsweredPending ??? */ + + + /** lunch thread */ + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) + { + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + deleteSessionToken(connection.GetToken()); + switch_mutex_unlock(tech_pvt->m_mutex); + OpalH323Private_Delete(tech_pvt); + switch_core_session_destroy(&session); + assert(0); + return false; + } + switch_mutex_unlock(tech_pvt->m_mutex); + + + /* the connection can be continued!!! */ + return TRUE; + +} + + + + + + + +/** + * FS ON_INIT callback handler + * + */ +switch_status_t FSOpalManager::callback_on_init(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +/** + * FS ON_INIT callback handler + * + */ +switch_status_t FSOpalManager::callback_on_ring(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +/** + * FS ON_EXECUTE callback handler + * + */ +switch_status_t FSOpalManager::callback_on_execute(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +/** + * FS ON_HANGUP callback handler + * + */ +switch_status_t FSOpalManager::callback_on_hangup(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +/** + * FS ON_LOOPBACK callback handler + * + */ + +switch_status_t FSOpalManager::callback_on_loopback(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +/** + * FS ON_TRANSMIT callback handler + * + */ +switch_status_t FSOpalManager::callback_on_transmit(switch_core_session_t *io_session) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_call_cause_t FSOpalManager::io_outgoing_channel(switch_core_session_t *i_session, switch_caller_profile_t *i_profile, switch_core_session_t **o_newSession, switch_memory_pool_t **o_memPool) +{ + assert(m_isInitialized); + return SWITCH_CAUSE_SUCCESS; +} + +switch_status_t FSOpalManager::io_read_frame(switch_core_session_t *i_session, switch_frame_t **o_frame, int i_timout, switch_io_flag_t i_flag, int i_streamId) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_write_frame(switch_core_session_t *i_session, switch_frame_t *i_frame, int i_timeout, switch_io_flag_t i_flag, int i_streamId) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_kill_channel(switch_core_session_t *i_session, int sig) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_waitfor_read(switch_core_session_t *i_session, int i_ms, int i_streamId) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_waitfor_write(switch_core_session_t *i_session, int i_ms, int i_streamId) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_send_dtmf(switch_core_session_t *i_session, char *i_dtmf) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_receive_message(switch_core_session_t *i_session, switch_core_session_message_t *i_message) +{ + assert(m_isInitialized); + + OpalH323Private_t* tech_prv = static_cast<OpalH323Private_t*>(switch_core_session_get_private(i_session)); + assert(tech_prv); + + switch_mutex_lock(tech_prv->m_mutex); + + switch(i_message->message_id) + { + case SWITCH_MESSAGE_REDIRECT_AUDIO: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_REDIRECT_AUDIO\n"); + break; + case SWITCH_MESSAGE_TRANSMIT_TEXT: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_TRANSMIT_TEXT\n"); + break; + case SWITCH_MESSAGE_INDICATE_ANSWER: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_ANSWER\n"); + + /* set call answer */ + //tech_prv->m_opalConnection->AnsweringCall(AnswerCallNow); + break; + case SWITCH_MESSAGE_INDICATE_PROGRESS: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_PROGRESS\n"); + break; + case SWITCH_MESSAGE_INDICATE_BRIDGE: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BRIDGE\n"); + break; + case SWITCH_MESSAGE_INDICATE_UNBRIDGE: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); + break; + case SWITCH_MESSAGE_INDICATE_TRANSFER: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_TRANSFER\n"); + break; + case SWITCH_MESSAGE_INDICATE_RINGING: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_RINGING\n"); + break; + case SWITCH_MESSAGE_INDICATE_MEDIA: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA\n"); + break; + case SWITCH_MESSAGE_INDICATE_NOMEDIA: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); + break; + case SWITCH_MESSAGE_INDICATE_HOLD: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_HOLD\n"); + break; + case SWITCH_MESSAGE_INDICATE_UNHOLD: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNHOLD\n"); + break; + case SWITCH_MESSAGE_INDICATE_REDIRECT: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REDIRECT\n"); + break; + case SWITCH_MESSAGE_INDICATE_REJECT: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REJECT\n"); + break; + case SWITCH_MESSAGE_INDICATE_BROADCAST: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BROADCAST\n"); + break; + case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); + break; + } + + switch_mutex_unlock(tech_prv->m_mutex); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_receive_event(switch_core_session_t *i_session, switch_event_t *i_event) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_state_change(switch_core_session_t *) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} + +switch_status_t FSOpalManager::io_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int) +{ + assert(m_isInitialized); + return SWITCH_STATUS_SUCCESS; +} Added: freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opal_backend.h Wed Oct 31 13:28:37 2007 @@ -0,0 +1,132 @@ +/* + * opalh323_backend.cpp + * + * Backend for OpalH323 module, implements + * H323 handling via OPAL library + * + * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * + * The Initial Developer of the Original Code is Lukasz Zwierko (lzwierko(a)gmail.com) + * + * Contributor(s): + * + * $Log: opalh323_backend.cpp,v $ + * + * Revision 1.00 2007/10/24 07:29:52 lzwierko + * Initial revision + */ + +#ifndef __FREESWITCH_OPAL_BACKEND__ +#define __FREESWITCH_OPAL_BACKEND__ + +#include <switch.h> +#include <ptlib.h> +#include <opal/buildopts.h> +#include <opal/manager.h> +#include <h323/h323ep.h> + +/** This class is OpalManager implementation + * for FreeSWITCH OpalH323 module. + * All methods are inherited from base OpalManagerClass. + * Event callbacks will be filed with valid code + * Additional functions have been implemented to be called, or called by + */ +class FSOpalManager : public OpalManager +{ + PCLASSINFO(FSOpalManager, PObject); + +public: + + /** Default constructor + * + */ + FSOpalManager(); + + /** Destructor + * + */ + ~FSOpalManager(); + + /** + * Method does real initialization of the manager + */ + bool initialize( + const char* i_modName, + switch_memory_pool_t* i_memoryPool, + switch_endpoint_interface_t *i_endpointInterface + ); + + /** FS callback handlers declarations + * + */ + switch_status_t callback_on_init(switch_core_session_t *io_session); + switch_status_t callback_on_ring(switch_core_session_t *io_session); + switch_status_t callback_on_execute(switch_core_session_t *io_session); + switch_status_t callback_on_hangup(switch_core_session_t *io_session); + switch_status_t callback_on_loopback(switch_core_session_t *io_session); + switch_status_t callback_on_transmit(switch_core_session_t *io_session); + + /** FS io functions + * + */ + + switch_call_cause_t io_outgoing_channel(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t **); + switch_status_t io_read_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); + switch_status_t io_write_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int); + switch_status_t io_kill_channel(switch_core_session_t *, int); + switch_status_t io_waitfor_read(switch_core_session_t *, int, int); + switch_status_t io_waitfor_write(switch_core_session_t *, int, int); + switch_status_t io_send_dtmf(switch_core_session_t *, char *); + switch_status_t io_receive_message(switch_core_session_t *, switch_core_session_message_t *); + switch_status_t io_receive_event(switch_core_session_t *, switch_event_t *); + switch_status_t io_state_change(switch_core_session_t *); + switch_status_t io_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); + switch_status_t io_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int); + + virtual BOOL OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options, ///< options for new connection (can't use default as overrides will fail) + OpalConnection::StringOptions * stringOptions + ); + virtual BOOL OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options ///< options for new connection (can't use default as overrides will fail) + ); + + virtual BOOL OnIncomingConnection( + OpalConnection & connection ///< Connection that is calling + ); + + + +private: + + void saveSessionToken(const PString &i_token,switch_core_session_t* i_session); + switch_core_session_t* getSessionToken(const PString &i_token); + void deleteSessionToken(const PString &i_token); + + + const char *m_pModuleName; /* name of this module */ + bool m_isInitialized; /* true if module has been initialized properly */ + H323EndPoint *m_pH323Endpoint; /* h323 endpoint control */ + switch_memory_pool_t *m_pMemoryPool; /* FS memory pool */ + switch_endpoint_interface_t *m_pH323EndpointInterface; /* FS endpoint inerface */ + switch_hash_t *m_pSessionsHashTable; /* Stores pointrs to session object for each Opal connection */ + switch_mutex_t *m_pSessionsHashTableMutex; /* Protects hash table */ + +}; + + + +#endif /* __FREESWITCH_OPAL_BACKEND__ */

1 0

[commit] r6098 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: cparker Date: Wed Oct 31 13:21:44 2007 New Revision: 6098 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary Log: Added User-Challenge and Media-Timeout values to Freeswitch-Hangupcause Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/radius/dictionary Wed Oct 31 13:21:44 2007 @@ -336,6 +336,8 @@ VALUE Freeswitch-Hangupcause Blind-Transfer 600 VALUE Freeswitch-Hangupcause Attended-Transfer 601 VALUE Freeswitch-Hangupcause Allotted-Timeout 602 +VALUE Freeswitch-Hangupcause User-Challenge 603 +VALUE Freeswitch-Hangupcause Media-Timeout 604

1 0

[commit] r6097 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 12:44:02 2007 New Revision: 6097 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Log: add inband dtmf generator Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Oct 31 12:44:02 2007 @@ -227,6 +227,21 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_session_t *session); + +/*! + \brief Start generating DTMF inband + \param session the session to generate on + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_generate_session(switch_core_session_t *session, switch_bool_t read_stream); + +/*! + \brief Stop generating DTMF inband + \param session the session to stop generating + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_generate_session(switch_core_session_t *session); + /*! \brief XXX DESCRIBE ME \param session the session to act on 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 Wed Oct 31 12:44:02 2007 @@ -819,6 +819,25 @@ switch_ivr_stop_inband_dtmf_session(session); } +SWITCH_STANDARD_APP(dtmf_session_generate_function) +{ + switch_bool_t do_read = SWITCH_TRUE; + + if (!switch_strlen_zero(data)) { + if (!strcasecmp(data, "write")) { + do_read = SWITCH_FALSE; + } + } + + switch_ivr_inband_dtmf_generate_session(session, do_read); +} + + +SWITCH_STANDARD_APP(stop_dtmf_session_generate_function) +{ + switch_ivr_stop_inband_dtmf_generate_session(session); +} + SWITCH_STANDARD_APP(fax_detect_session_function) { switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, NULL, NULL); @@ -1346,6 +1365,9 @@ SWITCH_ADD_APP(app_interface, "execute_extension", "Execute an extension", "Execute an extension", exe_function, EXE_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "stop_dtmf", "stop inband dtmf", "Stop detecting inband dtmf.", stop_dtmf_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "start_dtmf", "Detect dtmf", "Detect inband dtmf on the session", dtmf_session_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "stop_dtmf_generate", "stop inband dtmf generation", "Stop generating inband dtmf.", + stop_dtmf_session_generate_function, "[write]", SAF_NONE); + SWITCH_ADD_APP(app_interface, "start_dtmf_generate", "Generate dtmf", "Generate inband dtmf on the session", dtmf_session_generate_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_tone_detect", "stop detecting tones", "Stop detecting tones", stop_fax_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "fax_detect", "Detect faxes", "Detect fax send tone", fax_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "tone_detect", "Detect tones", "Detect tones", tone_detect_session_function, "", SAF_NONE); Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Oct 31 12:44:02 2007 @@ -70,7 +70,7 @@ switch_threadattr_t *thd_attr = NULL; - switch_channel_answer(channel); + switch_channel_pre_answer(channel); if (switch_channel_test_flag(channel, CF_VIDEO)) { eh.session = session; @@ -221,7 +221,7 @@ return SWITCH_STATUS_GENERR; } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); if (limit) { to = time(NULL) + limit; @@ -343,7 +343,7 @@ return SWITCH_STATUS_GENERR; } - switch_channel_answer(channel); + switch_channel_pre_answer(channel); if ((p = switch_channel_get_variable(channel, "RECORD_TITLE"))) { vval = (const char *) switch_core_session_strdup(session, p); @@ -474,7 +474,7 @@ pvt->session = session; - switch_channel_answer(channel); + switch_channel_pre_answer(channel); if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { return status; @@ -486,6 +486,157 @@ } +typedef struct { + switch_core_session_t *session; + teletone_generation_session_t ts; + switch_buffer_t *audio_buffer; + switch_mutex_t *mutex; + int read; +} switch_inband_dtmf_generate_t; + +static int teletone_dtmf_generate_handler(teletone_generation_session_t * ts, teletone_tone_map_t * map) +{ + switch_buffer_t *audio_buffer = ts->user_data; + int wrote; + + if (!audio_buffer) { + return -1; + } + + wrote = teletone_mux_tones(ts, map); + switch_buffer_write(audio_buffer, ts->buffer, wrote * 2); + + return 0; +} + + +static switch_status_t generate_on_dtmf(switch_core_session_t *session, const char *dtmf) +{ + + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if ((bug = (switch_media_bug_t *) switch_channel_get_private(channel, "dtmf_generate"))) { + switch_inband_dtmf_generate_t *pvt = (switch_inband_dtmf_generate_t *) switch_core_media_bug_get_user_data(bug); + + if (pvt) { + switch_mutex_lock(pvt->mutex); + teletone_run(&pvt->ts, (char *)dtmf); + switch_mutex_unlock(pvt->mutex); + return SWITCH_STATUS_FALSE; + } + } + return SWITCH_STATUS_SUCCESS; +} + +static switch_bool_t inband_dtmf_generate_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_inband_dtmf_generate_t *pvt = (switch_inband_dtmf_generate_t *) user_data; + switch_frame_t *frame; + switch_channel_t *channel = switch_core_session_get_channel(pvt->session); + switch_codec_t *read_codec; + + assert(channel != NULL); + read_codec = switch_core_session_get_read_codec(pvt->session); + + switch (type) { + case SWITCH_ABC_TYPE_INIT: + { + switch_buffer_create_dynamic(&pvt->audio_buffer, 512, 1024, 0); + teletone_init_session(&pvt->ts, 0, teletone_dtmf_generate_handler, pvt->audio_buffer); + pvt->ts.rate = read_codec->implementation->actual_samples_per_second; + pvt->ts.channels = 1; + switch_mutex_init(&pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(pvt->session)); + switch_core_event_hook_add_recv_dtmf(pvt->session, generate_on_dtmf); + } + break; + case SWITCH_ABC_TYPE_CLOSE: + { + switch_buffer_destroy(&pvt->audio_buffer); + teletone_destroy_session(&pvt->ts); + switch_core_event_hook_remove_recv_dtmf(pvt->session, generate_on_dtmf); + } + break; + case SWITCH_ABC_TYPE_READ_REPLACE: + case SWITCH_ABC_TYPE_WRITE_REPLACE: + { + switch_size_t bytes; + switch_mutex_lock(pvt->mutex); + if (pvt->read) { + frame = switch_core_media_bug_get_read_replace_frame(bug); + } else { + frame = switch_core_media_bug_get_write_replace_frame(bug); + } + if (switch_buffer_inuse(pvt->audio_buffer) && (bytes = switch_buffer_read(pvt->audio_buffer, frame->data, frame->datalen))) { + if (bytes < frame->datalen) { + switch_byte_t *dp = frame->data; + memset(dp + bytes, 0, frame->datalen - bytes); + } + } + if (pvt->read) { + switch_core_media_bug_set_read_replace_frame(bug, frame); + } else { + switch_core_media_bug_set_write_replace_frame(bug, frame); + } + switch_mutex_unlock(pvt->mutex); + } + break; + default: + break; + } + + return SWITCH_TRUE; +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_generate_session(switch_core_session_t *session) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + + assert(channel != NULL); + if ((bug = switch_channel_get_private(channel, "dtmf_generate"))) { + switch_channel_set_private(channel, "dtmf_generate", NULL); + switch_core_media_bug_remove(session, &bug); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; + +} + +SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_generate_session(switch_core_session_t *session, switch_bool_t read_stream) +{ + switch_channel_t *channel; + switch_codec_t *read_codec; + switch_media_bug_t *bug; + switch_status_t status; + switch_inband_dtmf_generate_t *pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + read_codec = switch_core_session_get_read_codec(session); + assert(read_codec != NULL); + + if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { + return SWITCH_STATUS_MEMERR; + } + + pvt->session = session; + pvt->read = !!read_stream; + switch_channel_pre_answer(channel); + + if ((status = switch_core_media_bug_add(session, inband_dtmf_generate_callback, pvt, 0, + pvt->read ? SMBF_READ_REPLACE : SMBF_WRITE_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { + return status; + } + + switch_channel_set_private(channel, "dtmf_generate", bug); + + return SWITCH_STATUS_SUCCESS; +} + + #define MAX_TONES 16 typedef struct { teletone_multi_tone_t mt;

1 0

[commit] r6096 - freeswitch/trunk/libs/apr/network_io/unix
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: brian Date: Wed Oct 31 12:12:01 2007 New Revision: 6096 Modified: freeswitch/trunk/libs/apr/network_io/unix/sendrecv.c Log: small fix to apr for OS X 10.5 for sendfile Modified: freeswitch/trunk/libs/apr/network_io/unix/sendrecv.c ============================================================================== --- freeswitch/trunk/libs/apr/network_io/unix/sendrecv.c (original) +++ freeswitch/trunk/libs/apr/network_io/unix/sendrecv.c Wed Oct 31 12:12:01 2007 @@ -148,6 +148,8 @@ apr_size_t *len) { apr_ssize_t rv; + + from->salen = sizeof(from->sa); do { rv = recvfrom(sock->socketdes, buf, (*len), flags, @@ -172,6 +174,8 @@ return errno; } + apr_sockaddr_vars_set(from, from->sa.sin.sin_family, ntohs(from->sa.sin.sin_port)); + (*len) = rv; if (rv == 0 && sock->type == SOCK_STREAM) { return APR_EOF; @@ -399,6 +403,109 @@ return rv < 0 ? errno : APR_SUCCESS; } +#elif defined(DARWIN) + +/* OS/X Release 10.5 or greater */ +apr_status_t apr_socket_sendfile(apr_socket_t * sock, apr_file_t * file, + apr_hdtr_t * hdtr, apr_off_t * offset, + apr_size_t * len, apr_int32_t flags) +{ + apr_off_t nbytes = *len; + int rv; + struct sf_hdtr headerstruct; + + /* Ignore flags for now. */ + flags = 0; + + if (!hdtr) { + hdtr = &no_hdtr; + } + + headerstruct.headers = hdtr->headers; + headerstruct.hdr_cnt = hdtr->numheaders; + headerstruct.trailers = hdtr->trailers; + headerstruct.trl_cnt = hdtr->numtrailers; + + /* BSD can send the headers/footers as part of the system call */ + do { + if (sock->options & APR_INCOMPLETE_WRITE) { + apr_status_t arv; + sock->options &= ~APR_INCOMPLETE_WRITE; + arv = apr_wait_for_io_or_timeout(NULL, sock, 0); + if (arv != APR_SUCCESS) { + *len = 0; + return arv; + } + } + if (nbytes) { + /* We won't dare call sendfile() if we don't have + * header or file bytes to send because nbytes == 0 + * means send the remaining file to EOF. + */ + rv = sendfile(file->filedes, /* file to be sent */ + sock->socketdes, /* socket */ + *offset, /* where in the file to start */ + &nbytes, /* number of bytes to write/written */ + &headerstruct, /* Headers/footers */ + flags); /* undefined, set to 0 */ + + if (rv == -1) { + if (errno == EAGAIN) { + if (sock->timeout > 0) { + sock->options |= APR_INCOMPLETE_WRITE; + } + /* BSD's sendfile can return -1/EAGAIN even if it + * sent bytes. Sanitize the result so we get normal EAGAIN + * semantics w.r.t. bytes sent. + */ + if (nbytes) { + /* normal exit for a big file & non-blocking io */ + (*len) = nbytes; + return APR_SUCCESS; + } + } + } + else { /* rv == 0 (or the kernel is broken) */ + if (nbytes == 0) { + /* Most likely the file got smaller after the stat. + * Return an error so the caller can do the Right Thing. + */ + (*len) = nbytes; + return APR_EOF; + } + } + } + else { + /* just trailer bytes... use writev() + */ + rv = writev(sock->socketdes, + hdtr->trailers, + hdtr->numtrailers); + if (rv > 0) { + nbytes = rv; + rv = 0; + } + else { + nbytes = 0; + } + } + if ((rv == -1) && (errno == EAGAIN) + && (sock->timeout > 0)) { + apr_status_t arv = apr_wait_for_io_or_timeout(NULL, sock, 0); + if (arv != APR_SUCCESS) { + *len = 0; + return arv; + } + } + } while (rv == -1 && (errno == EINTR || errno == EAGAIN)); + + (*len) = nbytes; + if (rv == -1) { + return errno; + } + return APR_SUCCESS; +} + #elif defined(__FreeBSD__) || defined(__DragonFly__) /* Release 3.1 or greater */ @@ -407,7 +514,10 @@ apr_size_t * len, apr_int32_t flags) { off_t nbytes = 0; - int rv, i; + int rv; +#if defined(__FreeBSD_version) && __FreeBSD_version < 460001 + int i; +#endif struct sf_hdtr headerstruct; apr_size_t bytes_to_send = *len; @@ -872,7 +982,9 @@ for (i = 0; i < hdtr->numheaders; i++, curvec++) { sfv[curvec].sfv_fd = SFV_FD_SELF; sfv[curvec].sfv_flag = 0; - sfv[curvec].sfv_off = (apr_off_t)hdtr->headers[i].iov_base; + /* Cast to unsigned long to prevent sign extension of the + * pointer value for the LFS case; see PR 39463. */ + sfv[curvec].sfv_off = (unsigned long)hdtr->headers[i].iov_base; sfv[curvec].sfv_len = hdtr->headers[i].iov_len; requested_len += sfv[curvec].sfv_len; } @@ -896,7 +1008,7 @@ for (i = 0; i < hdtr->numtrailers; i++, curvec++) { sfv[curvec].sfv_fd = SFV_FD_SELF; sfv[curvec].sfv_flag = 0; - sfv[curvec].sfv_off = (apr_off_t)hdtr->trailers[i].iov_base; + sfv[curvec].sfv_off = (unsigned long)hdtr->trailers[i].iov_base; sfv[curvec].sfv_len = hdtr->trailers[i].iov_len; requested_len += sfv[curvec].sfv_len; }

1 0

[commit] r6095 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Wed Oct 31 09:08:45 2007 New Revision: 6095 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_rtp.c Log: make channel hangup with media_timeout cause when rtp timeout occurs Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Oct 31 09:08:45 2007 @@ -1006,7 +1006,8 @@ SWITCH_CAUSE_BLIND_TRANSFER = 600, SWITCH_CAUSE_ATTENDED_TRANSFER = 601, SWITCH_CAUSE_ALLOTTED_TIMEOUT = 602, - SWITCH_CAUSE_USER_CHALLENGE = 603 + SWITCH_CAUSE_USER_CHALLENGE = 603, + SWITCH_CAUSE_MEDIA_TIMEOUT = 604 } switch_call_cause_t; typedef enum { 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 Wed Oct 31 09:08:45 2007 @@ -387,7 +387,10 @@ status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - return SWITCH_STATUS_FALSE; + if (status == SWITCH_STATUS_TIMEOUT) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); + } + return status; } payload = tech_pvt->video_read_frame.payload; @@ -492,11 +495,12 @@ status = switch_rtp_zerocopy_read_frame(tech_pvt->rtp_session, &tech_pvt->read_frame); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { - return SWITCH_STATUS_FALSE; + if (status == SWITCH_STATUS_TIMEOUT) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); + } + return status; } - - - + payload = tech_pvt->read_frame.payload; if (switch_rtp_has_dtmf(tech_pvt->rtp_session)) { Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 31 09:08:45 2007 @@ -97,6 +97,7 @@ {"ATTENDED_TRANSFER", SWITCH_CAUSE_ATTENDED_TRANSFER}, {"ALLOTTED_TIMEOUT", SWITCH_CAUSE_ALLOTTED_TIMEOUT}, {"USER_CHALLENGE", SWITCH_CAUSE_USER_CHALLENGE}, + {"MEDIA_TIMEOUT", SWITCH_CAUSE_MEDIA_TIMEOUT}, {NULL, 0} }; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Oct 31 09:08:45 2007 @@ -906,7 +906,7 @@ do_2833(rtp_session); if (!bytes && rtp_session->max_missed_packets) { if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { - return -1; + return -2; } } @@ -1204,7 +1204,7 @@ if (bytes < 0) { *datalen = 0; - return SWITCH_STATUS_GENERR; + return bytes == -2 ? SWITCH_STATUS_TIMEOUT : SWITCH_STATUS_GENERR; } else if (bytes == 0) { *datalen = 0; return SWITCH_STATUS_BREAK; @@ -1244,7 +1244,7 @@ if (bytes < 0) { frame->datalen = 0; - return SWITCH_STATUS_GENERR; + return bytes == -2 ? SWITCH_STATUS_TIMEOUT : SWITCH_STATUS_GENERR; } else if (bytes == 0) { frame->datalen = 0; return SWITCH_STATUS_BREAK;

1 0

[commit] r6094 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: lzwierko Date: Wed Oct 31 02:05:45 2007 New Revision: 6094 Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Log: Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/Makefile.am Wed Oct 31 02:05:45 2007 @@ -12,16 +12,14 @@ MODNAME=mod_opal -OPAL_DIR=$(switch_builddir)/libs/opal +OPALDIR=$(switch_builddir)/libs/opal mod_LTLIBRARIES = mod_opal.la mod_opal_la_SOURCES = opalh323_backend.cpp mod_opalh323.cpp -mod_opal_la_CFLAGS = $(AM_CFLAGS) -mod_opal_la_CFLAGS += -I. -I$(OPAL_DIR)/include -mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -mod_opal_la_CPPFLAGS += -I. -I$(OPAL_DIR)/include +mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -DPTRACING -Os -felide-constructors -Wreorder -I$(OPALDIR)/include + mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la -mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined +mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(OPALDIR)/lib -lopal_linux_x86_r -lpt_linux_x86_r -lpthread -lsasl2 -lssl -lcrypto -lexpat -ldl #Override the linstall target so we just install the .so/.dylib @@ -34,5 +32,3 @@ else \ $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ fi - -##include $(OPAL_DIR)/opal_inc.mak Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.cpp Wed Oct 31 02:05:45 2007 @@ -63,7 +63,7 @@ static bool OpalH323Private_Delete(OpalH323Private_t *o_private) { - switch_mutex_destroy(o_private->m_mutex); + return (switch_mutex_destroy(o_private->m_mutex)==SWITCH_STATUS_SUCCESS); } /** Default constructor @@ -105,9 +105,7 @@ switch_memory_pool_t* i_memoryPool, switch_endpoint_interface_t *i_endpointInterface ) -{ - bool result = true; - +{ /* check if not initialized */ assert(m_isInitialized); @@ -180,21 +178,21 @@ -switch_core_session_t* FSOpalManager::getSessionToken(PString &i_token) +switch_core_session_t* FSOpalManager::getSessionToken(const PString &i_token) { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); return static_cast<switch_core_session_t*>(switch_core_hash_find_locked(m_pSessionsHashTable,(const char*)i_token,m_pSessionsHashTableMutex)); } -void FSOpalManager::saveSessionToken(PString &i_token,switch_core_session_t* i_session) +void FSOpalManager::saveSessionToken(const PString &i_token,switch_core_session_t* i_session) { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); switch_core_hash_insert_locked(m_pSessionsHashTable,(const char*)i_token,i_session,m_pSessionsHashTableMutex); } -void FSOpalManager::deleteToken(PString &i_token) +void FSOpalManager::deleteSessionToken(const PString &i_token) { assert(m_pSessionsHashTable); assert(m_pSessionsHashTableMutex); @@ -209,7 +207,7 @@ ) { //TODO check if options and stringOptions fields ever apply - retrun OnIncomingConnection(connection); + return OnIncomingConnection(connection); } BOOL FSOpalManager::OnIncomingConnection( @@ -218,7 +216,7 @@ ) { //TODO, check if options field ever applies - retrun OnIncomingConnection(connection); + return OnIncomingConnection(connection); } BOOL FSOpalManager::OnIncomingConnection( @@ -228,20 +226,20 @@ /* allocate new session in switch core*/ switch_core_session_t *session = switch_core_session_request(m_pEndpointInterface , NULL); assert(session); - if(!sesion) + if(!session) { ///TODO add cause to the connection - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session object?\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate session object?\n"); return FALSE; } /* allocate private resources */ OpalH323Private_t *tech_pvt = NULL; - if(!OpalH323Private_Create(&tech_pvt)) + if(!OpalH323Private_Create(&tech_pvt,session)) { ///TODO add cause to the connection switch_core_session_destroy(&session); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate private object?\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not allocate private object?\n"); return false; } tech_pvt->m_opalConnection = &connection; @@ -263,17 +261,17 @@ /** Create calling side profile */ tech_pvt->m_callerProfile = switch_caller_profile_new( switch_core_session_get_pool(session), - *connection.GetRemotePartyName(), /** username */ + (const char*)connection.GetRemotePartyName(), /** username */ "default", /** TODO -> this should be configurable by core */ - *connection.GetRemotePartyName(), /** caller_id_name */ - *connection.GetRemotePartyNumber(), /** caller_id_number */ - *connection.GetRemotePartyAddress(), /** network addr */ + (const char*)connection.GetRemotePartyName(), /** caller_id_name */ + (const char*)connection.GetRemotePartyNumber(), /** caller_id_number */ + (const char*)connection.GetRemotePartyAddress(), /** network addr */ NULL, /** ANI */ NULL, /** ANI II */ NULL, /** RDNIS */ m_pModuleName, /** source */ NULL, /** TODO -> set context */ - *connection.GetCalledDestinationNumber() /** destination_number */ + (const char*)connection.GetCalledDestinationNumber() /** destination_number */ ); if(!tech_pvt->m_callerProfile) /* should never error */ @@ -288,7 +286,7 @@ /** Set up sessions channel */ switch_channel_t *channel = switch_core_session_get_channel(session); - switch_channel_set_name(channel,*connection.GetToken()); + switch_channel_set_name(channel,(const char*)connection.GetToken()); switch_channel_set_caller_profile(channel, tech_pvt->m_callerProfile); switch_channel_set_state(channel, CS_INIT); @@ -301,7 +299,7 @@ /** lunch thread */ if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); deleteSessionToken(connection.GetToken()); switch_mutex_unlock(tech_pvt->m_mutex); OpalH323Private_Delete(tech_pvt); @@ -387,7 +385,7 @@ switch_call_cause_t FSOpalManager::io_outgoing_channel(switch_core_session_t *i_session, switch_caller_profile_t *i_profile, switch_core_session_t **o_newSession, switch_memory_pool_t **o_memPool) { assert(m_isInitialized); - return 0; + return SWITCH_CAUSE_SUCCESS; } switch_status_t FSOpalManager::io_read_frame(switch_core_session_t *i_session, switch_frame_t **o_frame, int i_timout, switch_io_flag_t i_flag, int i_streamId) @@ -430,7 +428,7 @@ { assert(m_isInitialized); - OpalH323Private_t* tech_prv = switch_core_session_get_private(i_session); + OpalH323Private_t* tech_prv = static_cast<OpalH323Private_t*>(switch_core_session_get_private(i_session)); assert(tech_prv); switch_mutex_lock(tech_prv->m_mutex); @@ -438,55 +436,55 @@ switch(i_message->message_id) { case SWITCH_MESSAGE_REDIRECT_AUDIO: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_REDIRECT_AUDIO\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_REDIRECT_AUDIO\n"); break; case SWITCH_MESSAGE_TRANSMIT_TEXT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_TRANSMIT_TEXT\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_TRANSMIT_TEXT\n"); break; case SWITCH_MESSAGE_INDICATE_ANSWER: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_ANSWER\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_ANSWER\n"); /* set call answer */ - tech_prv->m_opalConnection->AnsweringCall(AnswerCallNow); + //tech_prv->m_opalConnection->AnsweringCall(AnswerCallNow); break; case SWITCH_MESSAGE_INDICATE_PROGRESS: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_PROGRESS\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_PROGRESS\n"); break; case SWITCH_MESSAGE_INDICATE_BRIDGE: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BRIDGE\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BRIDGE\n"); break; case SWITCH_MESSAGE_INDICATE_UNBRIDGE: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNBRIDGE\n"); break; case SWITCH_MESSAGE_INDICATE_TRANSFER: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_TRANSFER\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_TRANSFER\n"); break; case SWITCH_MESSAGE_INDICATE_RINGING: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_RINGING\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_RINGING\n"); break; case SWITCH_MESSAGE_INDICATE_MEDIA: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA\n"); break; case SWITCH_MESSAGE_INDICATE_NOMEDIA: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_NOMEDIA\n"); break; case SWITCH_MESSAGE_INDICATE_HOLD: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_HOLD\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_HOLD\n"); break; case SWITCH_MESSAGE_INDICATE_UNHOLD: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNHOLD\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_UNHOLD\n"); break; case SWITCH_MESSAGE_INDICATE_REDIRECT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REDIRECT\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REDIRECT\n"); break; case SWITCH_MESSAGE_INDICATE_REJECT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REJECT\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_REJECT\n"); break; case SWITCH_MESSAGE_INDICATE_BROADCAST: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BROADCAST\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_BROADCAST\n"); break; case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG "SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT\n"); break; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/opalh323_backend.h Wed Oct 31 02:05:45 2007 @@ -94,12 +94,27 @@ switch_status_t io_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int); switch_status_t io_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int); + virtual BOOL OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options, ///< options for new connection (can't use default as overrides will fail) + OpalConnection::StringOptions * stringOptions + ); + virtual BOOL OnIncomingConnection( + OpalConnection & connection, ///< Connection that is calling + unsigned options ///< options for new connection (can't use default as overrides will fail) + ); + + virtual BOOL OnIncomingConnection( + OpalConnection & connection ///< Connection that is calling + ); + + private: - void saveSessionToken(PString &i_token,switch_core_session_t* i_session); - switch_core_session_t* getSessionToken(PString &i_token); - void deleteToken(PString &i_token); + void saveSessionToken(const PString &i_token,switch_core_session_t* i_session); + switch_core_session_t* getSessionToken(const PString &i_token); + void deleteSessionToken(const PString &i_token); const char *m_pModuleName; /* name of this module */

1 0

[commit] r6093 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Oct '07

31 Oct '07

Author: anthm Date: Tue Oct 30 22:12:30 2007 New Revision: 6093 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: rtp timeout Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Tue Oct 30 22:12:30 2007 @@ -95,7 +95,8 @@ <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>  - +  +     Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Oct 30 22:12:30 2007 @@ -130,6 +130,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max); + /*! \brief Assign a local address to the RTP session \param rtp_session an RTP session to assign the local address to Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Oct 30 22:12:30 2007 @@ -259,6 +259,7 @@ time_t started; uint32_t session_timeout; uint32_t max_proceeding; + uint32_t rtp_timeout_sec; #ifdef SWITCH_HAVE_ODBC char *odbc_dsn; char *odbc_user; 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 Tue Oct 30 22:12:30 2007 @@ -893,6 +893,11 @@ if (v_max_proceeding >= 0) { profile->max_proceeding = v_max_proceeding; } + } else if (!strcasecmp(var, "rtp-timeout-sec")) { + int v = atoi(val); + if (v >= 0) { + profile->rtp_timeout_sec = v; + } } else if (!strcasecmp(var, "manage-presence")) { if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; 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 Tue Oct 30 22:12:30 2007 @@ -937,6 +937,8 @@ switch_rtp_flag_t flags; switch_status_t status; char tmp[50]; + uint32_t rtp_timeout_sec = tech_pvt->profile->rtp_timeout_sec; + assert(tech_pvt != NULL); @@ -1061,6 +1063,20 @@ } + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_timeout_sec = v; + } + } + + if (rtp_timeout_sec) { + uint32_t packets; + packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_frame; + + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, packets); + } if (tech_pvt->te) { switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 30 22:12:30 2007 @@ -168,6 +168,8 @@ uint8_t cn; switch_time_t last_time; stfu_instance_t *jb; + uint32_t max_missed_packets; + uint32_t missed_count; }; static int global_init = 0; @@ -392,6 +394,11 @@ return status; } +SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max) +{ + rtp_session->max_missed_packets = max; +} + SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) { *err = "Success"; @@ -897,6 +904,11 @@ if (check) { do_2833(rtp_session); + if (!bytes && rtp_session->max_missed_packets) { + if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { + return -1; + } + } if (rtp_session->jb && (jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); @@ -905,9 +917,9 @@ } bytes = jb_frame->dlen + rtp_header_len; rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - } else if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { - uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; - /* We're late! We're Late! */ + } else if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER)) { /* We're late! We're Late! */ + uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK) && status == SWITCH_STATUS_BREAK) { switch_yield(1000); continue; @@ -942,7 +954,7 @@ return 2 + rtp_header_len; } - + if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE)) { @@ -959,6 +971,9 @@ bytes = sbytes; } + if (bytes > 0) { + rtp_session->missed_count = 0; + } if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) {

1 0

[commit] r6092 - freeswitch/trunk/src
by Freeswitch SVN 30 Oct '07

30 Oct '07

Author: anthm Date: Tue Oct 30 18:15:37 2007 New Revision: 6092 Modified: freeswitch/trunk/src/switch_ivr_menu.c Log: update for relative paths Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Oct 30 18:15:37 2007 @@ -258,24 +258,18 @@ args.buf = ptr; args.buflen = len; - if (*sound == '/' || *sound == '\\') { - status = switch_ivr_play_file(session, NULL, sound, &args); - } else { - if (strlen(sound) > 4 && strncmp(sound, "say:", 4) == 0) { - if (menu->tts_engine && menu->tts_voice) { - status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, sound + 4, &args); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n"); - } + if (strlen(sound) > 4 && strncasecmp(sound, "say:", 4) == 0) { + if (menu->tts_engine && menu->tts_voice) { + status = switch_ivr_speak_text(session, menu->tts_engine, menu->tts_voice, sound + 4, &args); } else { - if (strlen(sound) > 7 && strncmp(sound, "phrase:", 7) == 0) { - status = switch_ivr_phrase_macro(session, sound + 7, "", menu->phrase_lang, &args); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "play_or_say: no player for [%s]. Use say: or phrase:\n", sound); - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine to play sound\n"); } + } else if (strlen(sound) > 7 && strncasecmp(sound, "phrase:", 7) == 0) { + status = switch_ivr_phrase_macro(session, sound + 7, "", menu->phrase_lang, &args); + } else { + status = switch_ivr_play_file(session, NULL, sound, &args); } - + if (need) { menu->ptr += strlen(menu->buf); if (strlen(menu->buf) < need) {

1 0