May 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13240 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 06 May '09

06 May '09

Author: anthm Date: Wed May 6 08:55:46 2009 New Revision: 13240 Log: MODAPP-272 + a few more goodies, abandon outbound calls when they are not needed, place queue name in the caller id Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed May 6 08:55:46 2009 @@ -50,6 +50,7 @@ switch_hash_t *consumer_hash; int caller_count; int consumer_count; + int ring_consumer_count; switch_time_t start_waiting; uint32_t importance; switch_thread_rwlock_t *rwlock; @@ -458,6 +459,17 @@ char *app_name, *arg = NULL; char sql[256] = ""; const char *member_wait = NULL; + fifo_node_t *node = NULL; + + switch_mutex_lock(globals.mutex); + node = switch_core_hash_find(globals.fifo_hash, h->node_name); + switch_mutex_unlock(globals.mutex); + + if (node) { + switch_mutex_lock(node->mutex); + node->ring_consumer_count++; + switch_mutex_unlock(node->mutex); + } switch_snprintf(sql, sizeof(sql), "update fifo_outbound set use_count=use_count+1 where uuid='%s'", h->uuid); fifo_execute_sql(sql, globals.sql_mutex); @@ -490,6 +502,11 @@ end: + if (node) { + switch_mutex_lock(node->mutex); + if (node->ring_consumer_count-- < 0) node->ring_consumer_count = 0; + switch_mutex_unlock(node->mutex); + } switch_core_destroy_memory_pool(&h->pool); return NULL; @@ -532,7 +549,7 @@ sql = switch_mprintf("select uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, " "next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname " "from fifo_outbound where (fifo_name = '%q') and (use_count < simo_count) and (next_avail = 0 or next_avail <= %ld) " - "order by outbound_call_count", node->name, (long) switch_epoch_time_now(NULL)); + "order by next_avail", node->name, (long) switch_epoch_time_now(NULL)); switch_assert(sql); fifo_execute_sql_callback(globals.sql_mutex, sql, place_call_callback, &need); @@ -561,9 +578,9 @@ idle_consumers = node_idle_consumers(node); //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - //"%s waiting %d consumer_total %d idle_consumers %d\n", node->name, ppl_waiting, consumer_total, idle_consumers); + //"%s waiting %d consumer_total %d idle_consumers %d ring_consumers\n", node->name, ppl_waiting, consumer_total, idle_consumers, node->ring_consumer_count); - if (ppl_waiting && (!consumer_total || !idle_consumers)) { + if ((ppl_waiting - node->ring_consumer_count > 0)&& (!consumer_total || !idle_consumers)) { find_consumers(node); } switch_mutex_unlock(node->mutex); @@ -607,6 +624,19 @@ return 0; } +static void check_cancel(fifo_node_t *node) +{ + int ppl_waiting = node_consumer_wait_count(node); + + if (node->ring_consumer_count > 0 && ppl_waiting < 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Outbound call count (%d) exceeds required value for queue %s (%d), " + "Ending extraneous calls\n", node->ring_consumer_count, node->name, ppl_waiting); + + + switch_core_session_hupall_matching_var("fifo_hangup_check", node->name, SWITCH_CAUSE_ORIGINATOR_CANCEL); + } +} + static void send_presence(fifo_node_t *node) { switch_event_t *event; @@ -708,6 +738,8 @@ return; } + switch_channel_set_variable(channel, "fifo_hangup_check", NULL); + mydata = switch_core_session_strdup(session, data); switch_assert(mydata); @@ -977,6 +1009,7 @@ switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); send_presence(node); + check_cancel(node); switch_mutex_unlock(globals.mutex); } @@ -1224,7 +1257,8 @@ switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); send_presence(node); - + check_cancel(node); + if (app) { extension = switch_caller_extension_new(other_session, app, arg); @@ -1308,6 +1342,7 @@ switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); send_presence(node); + check_cancel(node); switch_core_session_rwunlock(other_session); switch_safe_free(uuid); @@ -1841,6 +1876,7 @@ const char *simo = switch_xml_attr_soft(member, "simo"); const char *lag = switch_xml_attr_soft(member, "lag"); const char *timeout = switch_xml_attr_soft(member, "timeout"); + char *name_dup, *p; char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; switch_md5_string(digest, (void *) member->txt, strlen(member->txt)); @@ -1861,17 +1897,24 @@ } } - + name_dup = strdup(node->name); + if ((p = strchr(name_dup, '@'))) { + *p = '\0'; + } + sql = switch_mprintf("insert into fifo_outbound " "(uuid, fifo_name, originate_string, simo_count, use_count, timeout, lag, " "next_avail, expires, static, outbound_call_count, outbound_fail_count, hostname) " - "values ('%q','%q','%q',%d,%d,%d,%d,0,0,1,0,0,'%q')", - digest, node->name, member->txt, simo_i, 0, timeout_i, lag_i, globals.hostname + "values ('%q','%q'," + "'{execute_on_answer=''unset fifo_hangup_check'',fifo_hangup_check=''%q'',origination_caller_id_name=Queue," + "origination_caller_id_number=''fifo+%q''}%q',%d,%d,%d,%d,0,0,1,0,0,'%q')", + + digest, node->name, node->name, name_dup, member->txt, simo_i, 0, timeout_i, lag_i, globals.hostname ); switch_assert(sql); fifo_execute_sql(sql, globals.sql_mutex); free(sql); - + free(name_dup); node->has_outbound = 1; }

1 0

[commit] r13239 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 06 May '09

06 May '09

Author: robertj Date: Wed May 6 05:38:34 2009 New Revision: 13239 Log: Fixed incorrect include path. Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/ (props changed) 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 May 6 05:38:34 2009 @@ -24,7 +24,7 @@ #include "mod_opal.h" #include <opal/patch.h> -#include <opal/rtp/rtp.h> +#include <rtp/rtp.h> #include <h323/h323pdu.h> #include <h323/gkclient.h> 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 May 6 05:38:34 2009 @@ -1,275 +1,275 @@ -/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library / - * Soft-Switch Application - * - * Version: MPL 1.1 - * - * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek(a)gmail.com) - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (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. - * - * Contributor(s): - * Tuyan Ozipek (tuyanozipek(a)gmail.com) - * Lukasz Zwierko (lzwierko(a)gmail.com) - * Robert Jongbloed (robertj(a)voxlucida.com.au) - * - */ - - -#ifndef __FREESWITCH_MOD_OPAL__ -#define __FREESWITCH_MOD_OPAL__ - -#if defined(__GNUC__) && defined(HAVE_VISIBILITY) -#pragma GCC visibility push(default) -#endif - -#include <ptlib.h> -#include <opal/manager.h> -#include <opal/localep.h> -#include <h323/h323ep.h> -#include <iax2/iax2ep.h> - -#if defined(__GNUC__) && defined(HAVE_VISIBILITY) -#pragma GCC visibility pop -#endif - -#undef strcasecmp -#undef strncasecmp - -#define HAVE_APR -#include <switch.h> -#include <switch_version.h> -#define MODNAME "mod_opal" - - -class FSEndPoint; -class FSManager; - - -struct mod_opal_globals { - int trace_level; - char *codec_string; - char *context; - char *dialplan; -}; - -extern struct mod_opal_globals mod_opal_globals; - - -class FSProcess : public PLibraryProcess { - PCLASSINFO(FSProcess, PLibraryProcess); - - public: - FSProcess(); - ~FSProcess(); - - bool Initialise(switch_loadable_module_interface_t *iface); - - FSManager & GetManager() const { return *m_manager; } - - protected: - FSManager * m_manager; -}; - - -struct FSListener { - FSListener() { - } - - PString name; - OpalTransportAddress listenAddress; - PString localUserName; - PString gatekeeper; -}; - - -class FSCall : public OpalCall { - PCLASSINFO(FSCall, OpalCall); - public: - FSCall(OpalManager & manager); - virtual PBoolean OnSetUp(OpalConnection & connection); -}; - - -class FSManager : public OpalManager { - PCLASSINFO(FSManager, OpalManager); - - public: - FSManager(); - - bool Initialise(switch_loadable_module_interface_t *iface); - - switch_status_t ReadConfig(int reload); - - switch_endpoint_interface_t *GetSwitchInterface() const { - return m_FreeSwitch; - } - - virtual OpalCall * CreateCall(void * userData); - - private: - switch_endpoint_interface_t *m_FreeSwitch; - - H323EndPoint *m_h323ep; - IAX2EndPoint *m_iaxep; - FSEndPoint *m_fsep; - - PString m_gkAddress; - PString m_gkIdentifer; - PString m_gkInterface; - - 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); - public: - FSEndPoint(FSManager & manager); - - virtual bool OnIncomingCall(OpalLocalConnection &); - virtual OpalLocalConnection *CreateConnection(OpalCall &, void *); -}; - - -#define DECLARE_CALLBACK0(name) \ - static switch_status_t name(switch_core_session_t *session) { \ - 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) { \ - 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) { \ - 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 { - PCLASSINFO(FSConnection, OpalLocalConnection) - - public: - FSConnection(OpalCall & call, - FSEndPoint & endpoint, - switch_caller_profile_t *outbound_profile, - switch_core_session_t *fsSession, - switch_channel_t *fsChannel); - - virtual bool OnIncoming(); - virtual void OnReleased(); - virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia); - virtual void OnAlerting(); - virtual void OnEstablished(); - virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean); - virtual PBoolean OnOpenMediaStream(OpalMediaStream & stream); - virtual OpalMediaFormatList GetMediaFormats() const; - virtual PBoolean SendUserInputTone(char tone, unsigned duration); +/* Opal endpoint interface for Freeswitch Modular Media Switching Software Library / + * Soft-Switch Application + * + * Version: MPL 1.1 + * + * Copyright (c) 2007 Tuyan Ozipek (tuyanozipek(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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. + * + * Contributor(s): + * Tuyan Ozipek (tuyanozipek(a)gmail.com) + * Lukasz Zwierko (lzwierko(a)gmail.com) + * Robert Jongbloed (robertj(a)voxlucida.com.au) + * + */ + + +#ifndef __FREESWITCH_MOD_OPAL__ +#define __FREESWITCH_MOD_OPAL__ + +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility push(default) +#endif + +#include <ptlib.h> +#include <opal/manager.h> +#include <opal/localep.h> +#include <h323/h323ep.h> +#include <iax2/iax2ep.h> + +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility pop +#endif + +#undef strcasecmp +#undef strncasecmp + +#define HAVE_APR +#include <switch.h> +#include <switch_version.h> +#define MODNAME "mod_opal" + + +class FSEndPoint; +class FSManager; + + +struct mod_opal_globals { + int trace_level; + char *codec_string; + char *context; + char *dialplan; +}; + +extern struct mod_opal_globals mod_opal_globals; + + +class FSProcess : public PLibraryProcess { + PCLASSINFO(FSProcess, PLibraryProcess); + + public: + FSProcess(); + ~FSProcess(); + + bool Initialise(switch_loadable_module_interface_t *iface); + + FSManager & GetManager() const { return *m_manager; } + + protected: + FSManager * m_manager; +}; + + +struct FSListener { + FSListener() { + } + + PString name; + OpalTransportAddress listenAddress; + PString localUserName; + PString gatekeeper; +}; + + +class FSCall : public OpalCall { + PCLASSINFO(FSCall, OpalCall); + public: + FSCall(OpalManager & manager); + virtual PBoolean OnSetUp(OpalConnection & connection); +}; + + +class FSManager : public OpalManager { + PCLASSINFO(FSManager, OpalManager); + + public: + FSManager(); + + bool Initialise(switch_loadable_module_interface_t *iface); + + switch_status_t ReadConfig(int reload); + + switch_endpoint_interface_t *GetSwitchInterface() const { + return m_FreeSwitch; + } + + virtual OpalCall * CreateCall(void * userData); + + private: + switch_endpoint_interface_t *m_FreeSwitch; + + H323EndPoint *m_h323ep; + IAX2EndPoint *m_iaxep; + FSEndPoint *m_fsep; + + PString m_gkAddress; + PString m_gkIdentifer; + PString m_gkInterface; + + 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); + public: + FSEndPoint(FSManager & manager); + + virtual bool OnIncomingCall(OpalLocalConnection &); + virtual OpalLocalConnection *CreateConnection(OpalCall &, void *); +}; + + +#define DECLARE_CALLBACK0(name) \ + static switch_status_t name(switch_core_session_t *session) { \ + 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) { \ + 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) { \ + 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 { + PCLASSINFO(FSConnection, OpalLocalConnection) + + public: + FSConnection(OpalCall & call, + FSEndPoint & endpoint, + switch_caller_profile_t *outbound_profile, + switch_core_session_t *fsSession, + switch_channel_t *fsChannel); + + virtual bool OnIncoming(); + virtual void OnReleased(); + virtual PBoolean SetAlerting(const PString & calleeName, PBoolean withMedia); + virtual void OnAlerting(); + virtual void OnEstablished(); + virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean); + virtual PBoolean OnOpenMediaStream(OpalMediaStream & stream); + virtual OpalMediaFormatList GetMediaFormats() const; + virtual PBoolean SendUserInputTone(char tone, unsigned duration); virtual PBoolean SendUserInputString(const PString & value); - - void SetCodecs(); - - DECLARE_CALLBACK0(on_init); - DECLARE_CALLBACK0(on_routing); - DECLARE_CALLBACK0(on_execute); - - DECLARE_CALLBACK0(on_exchange_media); - DECLARE_CALLBACK0(on_soft_execute); - - DECLARE_CALLBACK1(kill_channel, int, sig); - DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf); - DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg); - DECLARE_CALLBACK1(receive_event, switch_event_t *, event); - DECLARE_CALLBACK0(state_change); - DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id); - DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id); - DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id); - DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id); - - switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags); - switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags); - - switch_core_session_t *GetSession() const { - return m_fsSession; - } - - private: - FSEndPoint & m_endpoint; - switch_core_session_t *m_fsSession; - switch_channel_t *m_fsChannel; - PSyncPoint m_rxAudioOpened; - PSyncPoint m_txAudioOpened; - OpalMediaFormatList m_switchMediaFormats; -}; - - -class FSMediaStream:public OpalMediaStream { - PCLASSINFO(FSMediaStream, OpalMediaStream); - public: - FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, ///< Media format for stream - unsigned sessionID, ///< Session number for stream - bool isSource ///< Is a source stream - ); - - virtual PBoolean Open(); - virtual PBoolean Close(); - virtual PBoolean IsSynchronous() const; - virtual PBoolean RequiresPatchThread(OpalMediaStream *) const; - - switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags); - switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags); - - private: - switch_core_session_t *m_fsSession; - switch_channel_t *m_fsChannel; - switch_timer_t *m_switchTimer; - switch_codec_t *m_switchCodec; - switch_frame_t m_readFrame; - unsigned char m_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; - RTP_DataFrame m_readRTP; - bool m_callOnStart; - uint32_t m_timeStamp; - - bool CheckPatchAndLock(); -}; - - -#endif /* __FREESWITCH_MOD_OPAL__ */ - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:nil - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4: expandtabs: - */ + + void SetCodecs(); + + DECLARE_CALLBACK0(on_init); + DECLARE_CALLBACK0(on_routing); + DECLARE_CALLBACK0(on_execute); + + DECLARE_CALLBACK0(on_exchange_media); + DECLARE_CALLBACK0(on_soft_execute); + + DECLARE_CALLBACK1(kill_channel, int, sig); + DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf); + DECLARE_CALLBACK1(receive_message, switch_core_session_message_t *, msg); + DECLARE_CALLBACK1(receive_event, switch_event_t *, event); + DECLARE_CALLBACK0(state_change); + DECLARE_CALLBACK3(read_audio_frame, switch_frame_t **, frame, switch_io_flag_t, flags, int, stream_id); + DECLARE_CALLBACK3(write_audio_frame, switch_frame_t *, frame, switch_io_flag_t, flags, int, stream_id); + DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id); + DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id); + + switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags); + switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags); + + switch_core_session_t *GetSession() const { + return m_fsSession; + } + + private: + FSEndPoint & m_endpoint; + switch_core_session_t *m_fsSession; + switch_channel_t *m_fsChannel; + PSyncPoint m_rxAudioOpened; + PSyncPoint m_txAudioOpened; + OpalMediaFormatList m_switchMediaFormats; +}; + + +class FSMediaStream:public OpalMediaStream { + PCLASSINFO(FSMediaStream, OpalMediaStream); + public: + FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, ///< Media format for stream + unsigned sessionID, ///< Session number for stream + bool isSource ///< Is a source stream + ); + + virtual PBoolean Open(); + virtual PBoolean Close(); + virtual PBoolean IsSynchronous() const; + virtual PBoolean RequiresPatchThread(OpalMediaStream *) const; + + switch_status_t read_frame(switch_frame_t **frame, switch_io_flag_t flags); + switch_status_t write_frame(const switch_frame_t *frame, switch_io_flag_t flags); + + private: + switch_core_session_t *m_fsSession; + switch_channel_t *m_fsChannel; + switch_timer_t *m_switchTimer; + switch_codec_t *m_switchCodec; + switch_frame_t m_readFrame; + unsigned char m_buf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + RTP_DataFrame m_readRTP; + bool m_callOnStart; + uint32_t m_timeStamp; + + bool CheckPatchAndLock(); +}; + + +#endif /* __FREESWITCH_MOD_OPAL__ */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:nil + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: expandtabs: + */

1 0

[commit] r13238 - freeswitch/trunk/build
by FreeSWITCH SVN 06 May '09

06 May '09

Author: brian Date: Tue May 5 23:41:13 2009 New Revision: 13238 Log: bump sounds Modified: freeswitch/trunk/build/sounds_version.txt Modified: freeswitch/trunk/build/sounds_version.txt ============================================================================== --- freeswitch/trunk/build/sounds_version.txt (original) +++ freeswitch/trunk/build/sounds_version.txt Tue May 5 23:41:13 2009 @@ -1 +1 @@ -1.0.8 \ No newline at end of file +1.0.9

1 0

[commit] r13237 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 17:15:52 2009 New Revision: 13237 Log: fix evil send myself a refer bug FSCORE-350 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue May 5 17:15:52 2009 @@ -554,6 +554,10 @@ } if (sofia_private && sofia_private->destroy_me) { + if (tech_pvt) { + tech_pvt->sofia_private = NULL; + } + if (nh) { nua_handle_bind(nh, NULL); }

1 0

[commit] r13236 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 14:35:31 2009 New Revision: 13236 Log: yipee, ten millionth bug in mod_loopaback Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue May 5 14:35:31 2009 @@ -542,16 +542,15 @@ *frame = NULL; - mutex = tech_pvt->mutex; - switch_mutex_lock(mutex); - - if (!switch_channel_ready(channel)) { goto end; } switch_core_timer_next(&tech_pvt->timer); + mutex = tech_pvt->mutex; + switch_mutex_lock(mutex); + if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { if (tech_pvt->write_frame) { switch_frame_free(&tech_pvt->write_frame);

1 0

[commit] r13235 - freeswitch/trunk/libs/esl/ruby
by FreeSWITCH SVN 05 May '09

05 May '09

Author: brian Date: Tue May 5 12:30:06 2009 New Revision: 13235 Log: ESL-15 Added: freeswitch/trunk/libs/esl/ruby/server3.rb Added: freeswitch/trunk/libs/esl/ruby/server3.rb ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/esl/ruby/server3.rb Tue May 5 12:30:06 2009 @@ -0,0 +1,66 @@ +#!/usr/bin/ruby + +# Simple Ruby ESL example that forks a new process for every connection. +# Called like this: <action application="socket" data="localhost:8086 async full"/> +# +# Try pressing 5, 8 or 9 when the file is played and see what happens +# +# Contributed by Mikael Bjerkeland + +require "ESL" +require 'socket' +include Socket::Constants +bind_address = "127.0.0.1" +bind_port = 8086 + +def time_now + Time.now.strftime("%Y-%m-%d %H:%M:%S") +end + +socket = Socket.new(AF_INET, SOCK_STREAM, 0) +sockaddr = Socket.sockaddr_in(bind_port, bind_address) +socket.bind(sockaddr) +socket.listen(5) +puts "Listening for connections on #{bind_address}:#{bind_port}" +loop do + client_socket, client_sockaddr = socket.accept #_nonblock + pid = fork do + @con = ESL::ESLconnection.new(client_socket.fileno) + info = @con.getInfo + uuid = info.getHeader("UNIQUE-ID") + @con.sendRecv("myevents") + @con.sendRecv("divert_events on") + + puts "#{time_now} [#{uuid}] Call to [#{info.getHeader("Caller-Destination-Number")}]" + @con.execute("log", "1, Wee-wa-wee-wa") + @con.execute("info", "") + @con.execute("answer", "") + @con.execute("playback", "/usr/local/freeswitch/sounds/music/8000/suite-espanola-op-47-leyenda.wav") + + while @con.connected + e = @con.recvEvent + + if e + name = e.getHeader("Event-Name") + puts "EVENT: #{name}" + break if name == "SERVER_DISCONNECTED" + if name == "DTMF" + digit = e.getHeader("DTMF-DIGIT") + duration = e.getHeader("DTMF-DURATION") + puts "DTMF DIGIT #{digit} (#{duration})" + if digit == "5" + @con.execute("log", "1, WHA HA HA. User pressed 5") + elsif digit == "8" + # TODO: close connection without hangup in order to proceed in dialplan. How? + elsif digit == "9" + @con.execute("transfer", "99355151") + end + end + + end + end + puts "Connection closed" + end + + Process.detach(pid) +end

1 0

[commit] r13234 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 05 May '09

05 May '09

Author: brian Date: Tue May 5 10:51:30 2009 New Revision: 13234 Log: clean up Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Tue May 5 10:51:30 2009 @@ -1,5 +1,5 @@ - <profile name="external"> +   <gateways> <X-PRE-PROCESS cmd="include" data="external/*.xml"/> Modified: freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal-ipv6.xml Tue May 5 10:51:30 2009 @@ -1,8 +1,8 @@ - - <profile name="internal-ipv6"> +  +   <settings>  Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue May 5 10:51:30 2009 @@ -1,12 +1,12 @@ - - - <profile name="internal"> +  + +   <aliases> <alias name="default"/>

1 0

[commit] r13233 - freeswitch/trunk/src
by FreeSWITCH SVN 05 May '09

05 May '09

Author: anthm Date: Tue May 5 10:09:32 2009 New Revision: 13233 Log: fix memory issue in core file resampling code Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue May 5 10:09:32 2009 @@ -122,7 +122,7 @@ } } - if (fh->pre_buffer_datalen) { + if (0 && fh->pre_buffer_datalen) { //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Prebuffering %d bytes\n", (int)fh->pre_buffer_datalen); switch_buffer_create_dynamic(&fh->pre_buffer, fh->pre_buffer_datalen * fh->channels, fh->pre_buffer_datalen * fh->channels / 2, 0); fh->pre_buffer_data = switch_core_alloc(fh->memory_pool, fh->pre_buffer_datalen * fh->channels); @@ -232,11 +232,13 @@ switch_assert(fh->buffer); } if (!fh->dbuf || fh->dbuflen < fh->resampler->to_len * 2) { + void *mem; fh->dbuflen = fh->resampler->to_len * 2; - fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + mem = realloc(fh->dbuf, fh->dbuflen); + switch_assert(mem); + fh->dbuf = mem; } - switch_assert(fh->resampler->to_len <= fh->dbuflen); - + switch_assert(fh->resampler->to_len * 2 <= fh->dbuflen); memcpy((int16_t *) fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); switch_buffer_write(fh->buffer, fh->dbuf, fh->resampler->to_len * 2); @@ -286,10 +288,13 @@ if (fh->resampler->to_len > orig_len * fh->channels) { if (!fh->dbuf) { + void *mem; fh->dbuflen = fh->resampler->to_len * 2; - fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); + mem = realloc(fh->dbuf, fh->dbuflen); + switch_assert(mem); + fh->dbuf = mem; } - switch_assert(fh->resampler->to_len <= fh->dbuflen); + switch_assert(fh->resampler->to_len * 2 <= fh->dbuflen); memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); data = fh->dbuf; } else { @@ -314,13 +319,14 @@ rlen = switch_buffer_inuse(fh->pre_buffer); if (rlen >= fh->pre_buffer_datalen) { - blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - if (!asis) blen /= 2; - if (fh->channels) blen /= fh->channels; - if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { - *len = 0; + if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) { + if (!asis) blen /= 2; + if (fh->channels) blen /= fh->channels; + if ((status = fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen)) != SWITCH_STATUS_SUCCESS) { + *len = 0; + } + fh->samples_out += blen; } - fh->samples_out += blen; } return status; @@ -409,11 +415,12 @@ int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); while((rlen = switch_buffer_inuse(fh->pre_buffer))) { - blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - if (!asis) blen /= 2; - if (fh->channels) blen /= fh->channels; - if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { - break; + if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) { + if (!asis) blen /= 2; + if (fh->channels) blen /= fh->channels; + if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { + break; + } } } } @@ -432,6 +439,9 @@ switch_core_destroy_memory_pool(&fh->memory_pool); } + switch_safe_free(fh->dbuf); + + return status; }

1 0

[commit] r13231 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: mrene Date: Mon May 4 17:53:41 2009 New Revision: 13231 Log: MODENDP-206 Ignore ptime when missing instead of using @0i - thanks stangor Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Mon May 4 17:53:41 2009 @@ -2487,7 +2487,11 @@ } if (match) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + if(ptime > 0) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (unsigned int) map->rm_rate, ptime); + } else { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh", imp->iananame, (unsigned int) map->rm_rate); + } already_did[imp->ianacode] = 1; break; } @@ -2524,7 +2528,11 @@ } if (match) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (int) map->rm_rate, ptime); + if(ptime > 0) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh@%di", imp->iananame, (unsigned int) map->rm_rate, ptime); + } else { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), ",%s@%uh", imp->iananame, (unsigned int) map->rm_rate); + } already_did[imp->ianacode] = 1; break; }

1 0

[commit] r13230 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 May '09

04 May '09

Author: anthm Date: Mon May 4 16:48:10 2009 New Revision: 13230 Log: fix mem corruption on failed register Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon May 4 16:48:10 2009 @@ -537,8 +537,7 @@ break; } - if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private) || - (!session && (status >= 300 && status != 401 && status != 407))) { + if ((sofia_private && sofia_private == &mod_sofia_globals.destroy_private)) { nua_handle_bind(nh, NULL); nua_handle_destroy(nh); nh = NULL;

1 0