June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r14051 - freeswitch/trunk/contrib/cparker/mod_xml_radius
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: intralanman Date: Tue Jun 30 11:48:44 2009 New Revision: 14051 Log: add working Makefile that pulls freeradius-client source Added: freeswitch/trunk/contrib/cparker/mod_xml_radius/Makefile Removed: freeswitch/trunk/contrib/cparker/mod_xml_radius/Makefile.am Added: freeswitch/trunk/contrib/cparker/mod_xml_radius/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/contrib/cparker/mod_xml_radius/Makefile Tue Jun 30 11:48:44 2009 @@ -0,0 +1,24 @@ +RADCLIENT_VERSION=1.1.6 +RADCLIENT=freeradius-client-$(RADCLIENT_VERSION) +RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT) +RADCLIENT_LIBDIR=$(RADCLIENT_DIR)/lib +RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la + +LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include +LOCAL_LIBADD=$(RADCLIENT_LA) + +BASE=../../.. +include $(BASE)/build/modmake.rules + +$(RADCLIENT_DIR): + $(GETLIB) $(RADCLIENT).tar.gz + +$(RADCLIENT_DIR)/Makefile: $(RADCLIENT_DIR) + cd $(RADCLIENT_DIR) && ./configure --disable-shared + $(TOUCH_TARGET) + +$(RADCLIENT_LA): $(RADCLIENT_DIR)/Makefile + cd $(RADCLIENT_DIR) && CFLAGS=$(CFLAGS) $(MAKE) + $(TOUCH_TARGET) + +

1 0

[commit] r14050 - freeswitch/trunk/contrib/cparker/mod_xml_radius
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: mikej Date: Tue Jun 30 11:34:54 2009 New Revision: 14050 Log: comment out unused code Modified: freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c Modified: freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c ============================================================================== --- freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c (original) +++ freeswitch/trunk/contrib/cparker/mod_xml_radius/mod_xml_radius.c Tue Jun 30 11:34:54 2009 @@ -63,11 +63,13 @@ static switch_bool_t debug = SWITCH_FALSE; +#if 0 static int logi = 0; static void logger(char *str) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "DEBUG[%i] [%s]\n", ++logi, str); } +#endif static rc_handle *my_radius_init(void)

1 0

[commit] r14049 - freeswitch/trunk/src/mod/asr_tts/mod_unimrcp
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: crienzo Date: Tue Jun 30 11:32:59 2009 New Revision: 14049 Log: removed unneeded global var, fixed comments, added speech_channel_set_state_unlocked() Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c Tue Jun 30 11:32:59 2009 @@ -53,25 +53,6 @@ #include "mrcp_client_connection.h" #include "apt_net.h" - -/********************************************************************************************************************************************* - * PROFILE: profile management - */ - -/** - * Profile-specific configuration. This allows us to handle differing MRCP server behavior - * on a per-profile basis - */ -struct profile { - char *name; - const char *jsgf_mime_type; - const char *gsl_mime_type; - const char *srgs_xml_mime_type; - const char *srgs_mime_type; -}; -typedef struct profile profile_t; -static switch_status_t profile_create(profile_t **profile, const char *name, switch_memory_pool_t *pool); - /********************************************************************************************************************************************* * mod_unimrcp : module interface to FreeSWITCH */ @@ -100,7 +81,7 @@ typedef struct mod_unimrcp_application mod_unimrcp_application_t; /** - * module globals + * module globals - global configuration and variables */ struct mod_unimrcp_globals { /** max-connection-count config */ @@ -113,8 +94,6 @@ char *unimrcp_default_recog_profile; /** log level for UniMRCP library */ char *unimrcp_log_level; - /** UniMRCP directory layout */ - apt_dir_layout_t *unimrcp_dir_layout; /** the MRCP client stack */ mrcp_client_t *mrcp_client; /** synthesizer application */ @@ -134,6 +113,25 @@ static mod_unimrcp_globals_t globals; /** + * Profile-specific configuration. This allows us to handle differing MRCP server behavior + * on a per-profile basis + */ +struct profile { + /** name of the profile */ + char *name; + /** MIME type to use for JSGF grammars */ + const char *jsgf_mime_type; + /** MIME type to use for GSL grammars */ + const char *gsl_mime_type; + /** MIME type to use for SRGS XML grammars */ + const char *srgs_xml_mime_type; + /** MIME type to use for SRGS ABNF grammars */ + const char *srgs_mime_type; +}; +typedef struct profile profile_t; +static switch_status_t profile_create(profile_t **profile, const char *name, switch_memory_pool_t *pool); + +/** * Defines XML parsing instructions */ static switch_xml_config_item_t instructions[] = { @@ -319,6 +317,7 @@ static switch_status_t speech_channel_write(speech_channel_t *schannel, void *data, switch_size_t *len); static switch_status_t speech_channel_read(speech_channel_t *schannel, void *data, switch_size_t *len, int block); static switch_status_t speech_channel_set_state(speech_channel_t *schannel, speech_channel_state_t state); +static switch_status_t speech_channel_set_state_unlocked(speech_channel_t *schannel, speech_channel_state_t state); static const char *speech_channel_state_to_string(speech_channel_state_t state); static const char *speech_channel_type_to_string(speech_channel_type_t type); @@ -453,7 +452,7 @@ * @param profile the created profile * @param name the profile name * @param pool the memory pool to use - * @return SWITCH_STATUS_SUCCESS + * @return SWITCH_STATUS_SUCCESS if the profile is created */ static switch_status_t profile_create(profile_t **profile, const char *name, switch_memory_pool_t *pool) { @@ -590,6 +589,7 @@ * @param queue the queue to write to * @param data the data to write * @param data_len the number of octets to write + * @return SWITCH_STATUS_SUCCESS if data was written, SWITCH_STATUS_FALSE if data can't be written because queue is full */ static switch_status_t audio_queue_write(audio_queue_t *queue, void *data, switch_size_t *data_len) { @@ -628,7 +628,7 @@ * @param data the read data * @param data_len the amount of data requested / actual amount of data read (returned) * @param block 1 if blocking is allowed - * @return SWITCH_STATUS_SUCCESS if successful. SWITCH_STATUS_FALSE if the queue is not allocated + * @return SWITCH_STATUS_SUCCESS if successful. SWITCH_STATUS_FALSE if no data was requested, or there was a timeout while waiting to read */ static switch_status_t audio_queue_read(audio_queue_t *queue, void *data, switch_size_t *data_len, int block) { @@ -677,6 +677,7 @@ /** * Empty the queue * + * @param queue the queue to empty * @return SWITCH_STATUS_SUCCESS */ static switch_status_t audio_queue_clear(audio_queue_t *queue) @@ -923,7 +924,7 @@ * Send SPEAK request to synthesizer * * @param schannel the synthesizer channel - * @param text the text to speak + * @param text The text to speak. This may be plain text or SSML. * @return SWITCH_STATUS_SUCCESS if successful */ static switch_status_t synth_channel_speak(speech_channel_t *schannel, const char *text) @@ -1288,7 +1289,7 @@ * @param schannel the speech channel * @param data the speech data * @param the number of octets to write / actual number written - * @return SWITCH_STATUS_SUCCESS if successful + * @return SWITCH_STATUS_SUCCESS */ static switch_status_t speech_channel_write(speech_channel_t *schannel, void *data, switch_size_t *len) { @@ -1308,7 +1309,7 @@ * @param data the speech data * @param the number of octets to read / actual number read * @param block 1 if blocking is allowed - * @return SWITCH_STATUS_SUCCESS if successful + * @return SWITCH_STATUS_SUCCESS if successful, SWITCH_STATUS_BREAK if channel is no longer processing */ static switch_status_t speech_channel_read(speech_channel_t *schannel, void *data, switch_size_t *len, int block) { @@ -1347,20 +1348,35 @@ * * @param schannel the channel * @param state the new channel state - * @return SWITCH_STATUS_SUCCESS if successful + * @return SWITCH_STATUS_SUCCESS, if successful */ static switch_status_t speech_channel_set_state(speech_channel_t *schannel, speech_channel_state_t state) { + switch_status_t status; + switch_mutex_lock(schannel->mutex); + status = speech_channel_set_state_unlocked(schannel, state); + switch_mutex_unlock(schannel->mutex); + return status; +} + +/** + * Use this function to set the current channel state without locking the + * speech channel. Do this if you already have the speech channel locked. + * + * @param schannel the channel + * @param state the new channel state + * @return SWITCH_STATUS_SUCCESS + */ +static switch_status_t speech_channel_set_state_unlocked(speech_channel_t *schannel, speech_channel_state_t state) +{ if (schannel->state == SPEECH_CHANNEL_PROCESSING && state != SPEECH_CHANNEL_PROCESSING) { /* wake anyone waiting for audio data */ audio_queue_clear(schannel->audio_queue); } - switch_mutex_lock(schannel->mutex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s ==> %s\n", schannel->name, speech_channel_state_to_string(schannel->state), speech_channel_state_to_string(state)); schannel->state = state; switch_thread_cond_signal(schannel->cond); - switch_mutex_unlock(schannel->mutex); return SWITCH_STATUS_SUCCESS; } @@ -2002,9 +2018,7 @@ apt_string_assign(&mrcp_message->body, data, mrcp_message->pool); /* send message and wait for response */ - switch_mutex_unlock(schannel->mutex); - speech_channel_set_state(schannel, SPEECH_CHANNEL_PROCESSING); - switch_mutex_lock(schannel->mutex); + speech_channel_set_state_unlocked(schannel, SPEECH_CHANNEL_PROCESSING); if (mrcp_application_message_send(schannel->unimrcp_session, schannel->unimrcp_channel, mrcp_message) == FALSE) { status = SWITCH_STATUS_FALSE; goto done; @@ -3221,9 +3235,13 @@ apt_bool_t offer_new_connection = FALSE; mrcp_connection_agent_t *connection_agent; mpf_engine_t *media_engine; - + apt_dir_layout_t *dir_layout; + /* create the client */ - client = mrcp_client_create(globals.unimrcp_dir_layout); + if ((dir_layout = apt_default_dir_layout_create("../", mod_pool)) == NULL) { + goto done; + } + client = mrcp_client_create(dir_layout); if (!client) goto done; @@ -3394,9 +3412,6 @@ /* get MRCP module configuration */ mod_unimrcp_do_config(); - if ((globals.unimrcp_dir_layout = apt_default_dir_layout_create("../", pool)) == NULL) { - return SWITCH_STATUS_FALSE; - } if (switch_strlen_zero(globals.unimrcp_default_synth_profile)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing default-tts-profile\n"); return SWITCH_STATUS_FALSE;

1 0

[commit] r14048 - freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: ledr Date: Tue Jun 30 08:01:56 2009 New Revision: 14048 Log: changed directory templates to be compliant with conf/directory/default.xml Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory.xml Tue Jun 30 08:01:56 2009 @@ -80,7 +80,9 @@ dir_groups_users.dir_group_id = dir_groups.id AND dir_user_id = '${user_id}';"> <group name="${group_name}"> - <user id="${user}" type="pointer"/> + <users> + <user id="${user}" type="pointer"/> + </users> </group> </xml-odbc-do> </groups> Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/xml_odbc_templates/directory_swk.xml Tue Jun 30 08:01:56 2009 @@ -80,7 +80,9 @@ group_members.groups_uid = groups.uid AND users_uid = '${users_uid}';"> <group name="${group_name}"> - <user id="${user}" type="pointer"/> + <users> + <user id="${user}" type="pointer"/> + </users> </group> </xml-odbc-do> </groups>

1 0

[commit] r14047 - freeswitch/trunk/contrib/ledr/mod_xml_odbc
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: ledr Date: Tue Jun 30 07:04:35 2009 New Revision: 14047 Log: temporarily removed free Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Modified: freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c ============================================================================== --- freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c (original) +++ freeswitch/trunk/contrib/ledr/mod_xml_odbc/mod_xml_odbc.c Tue Jun 30 07:04:35 2009 @@ -272,9 +272,9 @@ tmp_attr = switch_event_expand_headers(params, xml_in->attr[i+1]); switch_xml_set_attr(xml_out, xml_in->attr[i], tmp_attr); - if (tmp_attr != xml_in->attr[i+1]) { - switch_safe_free(tmp_attr); - } +// if (tmp_attr != xml_in->attr[i+1]) { +// switch_safe_free(tmp_attr); +// } }

1 0

[commit] r14046 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . src
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: raulfragoso Date: Tue Jun 30 04:20:34 2009 New Revision: 14046 Log: More flag checks Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Tue Jun 30 04:20:34 2009 @@ -166,6 +166,8 @@ */ static switch_status_t tech_init(KhompPvt *tech_pvt, switch_core_session_t *session) { + tech_pvt->flags = 0; + tech_pvt->_read_frame.data = tech_pvt->_databuf; tech_pvt->_read_frame.buflen = sizeof(tech_pvt->_databuf); Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Tue Jun 30 04:20:34 2009 @@ -241,6 +241,9 @@ bool KhompPvt::start_stream(void) { + if(switch_test_flag(this, TFLAG_STREAM)) + return true; + try { Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsPlay, _KChannelId); @@ -258,6 +261,9 @@ bool KhompPvt::stop_stream(void) { + if(!switch_test_flag(this, TFLAG_STREAM)) + return true; + try { Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsGenerator, kmtSilence); @@ -275,6 +281,9 @@ bool KhompPvt::start_listen(bool conn_rx) { + if(switch_test_flag(this, TFLAG_LISTEN)) + return true; + const size_t buffer_size = KHOMP_PACKET_SIZE; if (conn_rx) @@ -299,6 +308,9 @@ bool KhompPvt::stop_listen(void) { + if(!switch_test_flag(this, TFLAG_LISTEN)) + return true; + try { Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_STOP_LISTEN);

1 0

[commit] r14045 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . include src
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: raulfragoso Date: Tue Jun 30 04:09:22 2009 New Revision: 14045 Log: Moved the function definitions from the header to the cpp file to keep the compiler happy; Included some flags to indicate when stream and audio callbacks are enabled or disabled; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h Tue Jun 30 04:09:22 2009 @@ -2,6 +2,7 @@ #define _KHOMP_PVT_H_ #include "globals.h" +#include "mod_khomp.h" #define KHOMP_PACKET_SIZE 16 Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/mod_khomp.h Tue Jun 30 04:09:22 2009 @@ -59,26 +59,6 @@ #include "opt.h" /*! - \brief Callback generated from K3L API for every new event on the board. - \param[in] obj Object ID (could be a channel or a board, depends on device type) which generated the event. - \param[in] e The event itself. - \return ksSuccess if the event was treated - \see K3L_EVENT Event specification - */ -static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e); - -/*! - \brief Callback generated from K3L API everytime audio is available on the board. - @param[in] deviceid Board on which we get the event - @param[in] objectid The channel we are getting the audio from - @param[out] read_buffer The audio buffer itself (RAW) - @param[in] read_size The buffer size, meaning the amount of data to be read - \return ksSuccess if the event was treated - */ -static void Kstdcall khomp_audio_listener(int32 deviceid, int32 objectid, - byte * read_buffer, int32 read_size); - -/*! \brief Defined by mod_reference, defines statuses for the switch_channel \param TFLAG_IO Enables the IO state of a channel \param TFLAG_INBOUND Sets a channel as inbound @@ -94,105 +74,10 @@ TFLAG_HANGUP = (1 << 5), TFLAG_LINEAR = (1 << 6), TFLAG_CODEC = (1 << 7), - TFLAG_BREAK = (1 << 8) + TFLAG_BREAK = (1 << 8), + TFLAG_STREAM = (1 << 9), + TFLAG_LISTEN = (1 << 10) } TFLAGS; -/*! - \brief Load the module. Expadend by a FreeSWITCH macro. - Things we do here: - \li Initialize a static structure on KhompPvt - \li Load the configuration - \li Start the K3L API, responsible for connecting to KServer - \li Register mod APIs and APPs - \li Register audio callback for KServer - \li Register event callback for KServer - \see Opt Where all the configs are handled - \see khomp_event_callback To where we bind the event handler - \see khomp_audio_listener To where we bind the audio handlers - */ -SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load); -SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown); -SWITCH_MODULE_DEFINITION(mod_khomp, mod_khomp_load, mod_khomp_shutdown, NULL); - -/* State handlers for FreeSWITCH */ -static switch_status_t channel_on_init(switch_core_session_t *session); -static switch_status_t channel_on_routing(switch_core_session_t *session); -static switch_status_t channel_on_execute(switch_core_session_t *session); -static switch_status_t channel_on_hangup(switch_core_session_t *session); -static switch_status_t channel_on_exchange_media( - switch_core_session_t *session); -static switch_status_t channel_on_soft_execute(switch_core_session_t *session); -static switch_status_t channel_on_destroy(switch_core_session_t *session); - -switch_state_handler_table_t khomp_state_handlers = { - /*.on_init */ channel_on_init, - /*.on_routing */ channel_on_routing, - /*.on_execute */ channel_on_execute, - /*.on_hangup */ channel_on_hangup, - /*.on_exchange_media */ channel_on_exchange_media, - /*.on_soft_execute */ channel_on_soft_execute, - /*.on_consume_media */ NULL, - /*.on_hibernate */ NULL, - /*.on_reset */ NULL, - /*.on_park*/ NULL, - /*.on_reporting*/ NULL, - /*.on_destroy*/ channel_on_destroy -}; - -/* Callbacks for FreeSWITCH */ -static switch_call_cause_t channel_outgoing_channel( - switch_core_session_t *session, - switch_event_t *var_event, - switch_caller_profile_t *outbound_profile, - switch_core_session_t **new_session, - switch_memory_pool_t **pool, - switch_originate_flag_t flags); -static switch_status_t channel_read_frame(switch_core_session_t *session, - switch_frame_t **frame, - switch_io_flag_t flags, - int stream_id); -static switch_status_t channel_write_frame(switch_core_session_t *session, - switch_frame_t *frame, - switch_io_flag_t flags, - int stream_id); -static switch_status_t channel_kill_channel(switch_core_session_t *session, - int sig); -static switch_status_t channel_send_dtmf(switch_core_session_t *session, - const switch_dtmf_t *dtmf); -static switch_status_t channel_receive_message(switch_core_session_t *session, - switch_core_session_message_t *msg); -static switch_status_t channel_receive_event(switch_core_session_t *session, - switch_event_t *event); - - -switch_io_routines_t khomp_io_routines = { - /*.outgoing_channel */ channel_outgoing_channel, - /*.read_frame */ channel_read_frame, - /*.write_frame */ channel_write_frame, - /*.kill_channel */ channel_kill_channel, - /*.send_dtmf */ channel_send_dtmf, - /*.receive_message */ channel_receive_message, - /*.receive_event */ channel_receive_event -}; - -/* Macros to define specific API functions */ -SWITCH_STANDARD_API(khomp); - -/*! - \brief Print a system summary for all the boards. [khomp show info] - */ -static void printSystemSummary(switch_stream_handle_t* stream); -/*! - \brief Print link status. [khomp show links] - */ -static void printLinks(switch_stream_handle_t* stream, unsigned int device, - unsigned int link); -/*! - \brief Print board channel status. [khomp show channels] - */ -static void printChannels(switch_stream_handle_t* stream, unsigned int device, - unsigned int link); - - #endif /* _MOD_KHOMP_H_ */ Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Tue Jun 30 04:09:22 2009 @@ -43,6 +43,124 @@ #include "mod_khomp.h" /*! + \brief Callback generated from K3L API for every new event on the board. + \param[in] obj Object ID (could be a channel or a board, depends on device type) which generated the event. + \param[in] e The event itself. + \return ksSuccess if the event was treated + \see K3L_EVENT Event specification + */ +static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e); + +/*! + \brief Callback generated from K3L API everytime audio is available on the board. + @param[in] deviceid Board on which we get the event + @param[in] objectid The channel we are getting the audio from + @param[out] read_buffer The audio buffer itself (RAW) + @param[in] read_size The buffer size, meaning the amount of data to be read + \return ksSuccess if the event was treated + */ +static void Kstdcall khomp_audio_listener(int32 deviceid, int32 objectid, + byte * read_buffer, int32 read_size); + +/*! + \brief Load the module. Expadend by a FreeSWITCH macro. + Things we do here: + \li Initialize a static structure on KhompPvt + \li Load the configuration + \li Start the K3L API, responsible for connecting to KServer + \li Register mod APIs and APPs + \li Register audio callback for KServer + \li Register event callback for KServer + \see Opt Where all the configs are handled + \see khomp_event_callback To where we bind the event handler + \see khomp_audio_listener To where we bind the audio handlers + */ +SWITCH_MODULE_LOAD_FUNCTION(mod_khomp_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_khomp_shutdown); +SWITCH_MODULE_DEFINITION(mod_khomp, mod_khomp_load, mod_khomp_shutdown, NULL); + +/* State handlers for FreeSWITCH */ +static switch_status_t channel_on_init(switch_core_session_t *session); +static switch_status_t channel_on_routing(switch_core_session_t *session); +static switch_status_t channel_on_execute(switch_core_session_t *session); +static switch_status_t channel_on_hangup(switch_core_session_t *session); +static switch_status_t channel_on_exchange_media( + switch_core_session_t *session); +static switch_status_t channel_on_soft_execute(switch_core_session_t *session); +static switch_status_t channel_on_destroy(switch_core_session_t *session); + +switch_state_handler_table_t khomp_state_handlers = { + /*.on_init */ channel_on_init, + /*.on_routing */ channel_on_routing, + /*.on_execute */ channel_on_execute, + /*.on_hangup */ channel_on_hangup, + /*.on_exchange_media */ channel_on_exchange_media, + /*.on_soft_execute */ channel_on_soft_execute, + /*.on_consume_media */ NULL, + /*.on_hibernate */ NULL, + /*.on_reset */ NULL, + /*.on_park*/ NULL, + /*.on_reporting*/ NULL, + /*.on_destroy*/ channel_on_destroy +}; + +/* Callbacks for FreeSWITCH */ +static switch_call_cause_t channel_outgoing_channel( + switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, + switch_memory_pool_t **pool, + switch_originate_flag_t flags); +static switch_status_t channel_read_frame(switch_core_session_t *session, + switch_frame_t **frame, + switch_io_flag_t flags, + int stream_id); +static switch_status_t channel_write_frame(switch_core_session_t *session, + switch_frame_t *frame, + switch_io_flag_t flags, + int stream_id); +static switch_status_t channel_kill_channel(switch_core_session_t *session, + int sig); +static switch_status_t channel_send_dtmf(switch_core_session_t *session, + const switch_dtmf_t *dtmf); +static switch_status_t channel_receive_message(switch_core_session_t *session, + switch_core_session_message_t *msg); +static switch_status_t channel_receive_event(switch_core_session_t *session, + switch_event_t *event); + + +switch_io_routines_t khomp_io_routines = { + /*.outgoing_channel */ channel_outgoing_channel, + /*.read_frame */ channel_read_frame, + /*.write_frame */ channel_write_frame, + /*.kill_channel */ channel_kill_channel, + /*.send_dtmf */ channel_send_dtmf, + /*.receive_message */ channel_receive_message, + /*.receive_event */ channel_receive_event +}; + +/* Macros to define specific API functions */ +SWITCH_STANDARD_API(khomp); + +/*! + \brief Print a system summary for all the boards. [khomp show info] + */ +static void printSystemSummary(switch_stream_handle_t* stream); +/*! + \brief Print link status. [khomp show links] + */ +static void printLinks(switch_stream_handle_t* stream, unsigned int device, + unsigned int link); +/*! + \brief Print board channel status. [khomp show channels] + */ +static void printChannels(switch_stream_handle_t* stream, unsigned int device, + unsigned int link); + + + +/*! \brief Will init part of our private structure and setup all the read/write buffers along with the proper codecs. Right now, only PCMA. */ Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Tue Jun 30 04:09:22 2009 @@ -245,12 +245,14 @@ { Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsPlay, _KChannelId); Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_START_STREAM_BUFFER); - //flags.set(kflags::STREAM_UP); } catch(...) { return false; } + + switch_set_flag_locked(this, TFLAG_STREAM); + return true; } @@ -260,13 +262,14 @@ { Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsGenerator, kmtSilence); Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_STOP_STREAM_BUFFER); - //flags.clear(kflags::STREAM_UP); } catch(...) { return false; } - + + switch_clear_flag_locked(this, TFLAG_STREAM); + return true; } @@ -289,8 +292,7 @@ return false; } - /* always set this flag to avoid constant 'ksInvalidState' messages. */ - //flags.set(kflags::LISTEN_UP); + switch_set_flag_locked(this, TFLAG_LISTEN); return true; } @@ -306,7 +308,7 @@ return false; } - //flags.clear(kflags::LISTEN_UP); + switch_clear_flag_locked(this, TFLAG_LISTEN); return true; }

1 0

[commit] r14044 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . commons include src
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: raulfragoso Date: Tue Jun 30 02:38:50 2009 New Revision: 14044 Log: Implemented some helper functions to start/stop the board mixer and audio callbacks; The channel states are now working as they should ! Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/commons/k3lapi.cpp freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/commons/k3lapi.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/commons/k3lapi.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/commons/k3lapi.cpp Tue Jun 30 02:38:50 2009 @@ -40,24 +40,24 @@ void K3LAPI::mixer(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) { - KMixerCommand mix; + KMixerCommand mix; mix.Track = track; - mix.Source = src; + mix.Source = src; mix.SourceIndex = index; - command(dev, obj, CM_MIXER, (const char *) &mix); + command(dev, obj, CM_MIXER, (const char *) &mix); } void K3LAPI::mixerCTbus(int32 dev, int32 obj, byte track, KMixerSource src, int32 index) { - KMixerCommand mix; + KMixerCommand mix; mix.Track = track; - mix.Source = src; + mix.Source = src; mix.SourceIndex = index; - command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix); + command(dev, obj, CM_MIXER_CTBUS, (const char *) &mix); } void K3LAPI::command(int32 dev, int32 obj, int32 code, std::string & str) @@ -69,12 +69,12 @@ { K3L_COMMAND cmd; - cmd.Cmd = code; + cmd.Cmd = code; cmd.Object = obj; - cmd.Params = (byte *)parms; + cmd.Params = (byte *)parms; int32 rc = k3lSendCommand(dev, &cmd); - + if (rc != ksSuccess) throw failed_command(code, dev, obj, rc); } Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h Tue Jun 30 02:38:50 2009 @@ -3,6 +3,8 @@ #include "globals.h" +#define KHOMP_PACKET_SIZE 16 + /*! \brief This struct holds a static linked list representing all the Khomp channels found in the host. It's also a place holder for session objects and some @@ -14,15 +16,37 @@ typedef std::vector < KhompPvt * > PvtVectorType; /*!< Collection of pointers of KhompPvts */ typedef std::vector < PvtVectorType > PvtVector2Type; /*!< Collection of PvtVectorType */ typedef PvtVector2Type KhompPvtVector; /*!< A bidimensional array o KhompPvts, meaning [board][channel] */ - + + K3LAPI::target _target; /*!< The card/device pair to bind this pvt to */ + switch_core_session_t * _session; /*!< The session to which this pvt is associated with */ + + unsigned int flags; //TODO: Alterar o nome depois + + switch_codec_t _read_codec; + switch_codec_t _write_codec; + + switch_frame_t _read_frame; + + switch_buffer_t * _audio_buffer; /*!< Audio buffer used to write data in the khomp callback and read by FS callback */ + + unsigned char _databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + + switch_caller_profile_t *_caller_profile; + + switch_mutex_t *_mutex; + switch_mutex_t *flag_mutex; //TODO: Alterar o nome depois + + unsigned int _KDeviceId; /*!< Represent de board we are making the call from */ + unsigned int _KChannelId; /*!< Represent the channel we are making the call from */ + KhompPvt(K3LAPI::target & target) - : _target(target), _session(NULL) {}; + : _target(target), _session(NULL) {}; K3LAPI::target target() { return _target; } - + void session(switch_core_session_t * newSession) { _session = newSession; @@ -33,6 +57,23 @@ return _session; } + int32 get_audio_dsp(); + + bool obtain_both(void); + bool obtain_rx(bool with_delay); + bool obtain_tx(void); + + bool start_stream(void); + bool stop_stream(void); + + bool start_listen(bool conn_rx = true); + bool stop_listen(void); + + /* static stuff */ + static switch_mutex_t *_pvts_mutex; + + static KhompPvtVector _pvts; /*!< Static structure that contains all the pvts. Will be initialized by KhompPvt::initialize */ + static KhompPvt * khompPvt(int32 device, int32 object) { if (!Globals::_k3lapi.valid_channel(device, object)) @@ -90,33 +131,7 @@ } } } - - K3LAPI::target _target; - switch_core_session_t * _session; /*!< The session to which this pvt is associated with */ - - unsigned int flags; //TODO: Alterar o nome depois - - switch_codec_t _read_codec; - switch_codec_t _write_codec; - - switch_frame_t _read_frame; - - switch_buffer_t * _audio_buffer; - unsigned char _databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; - - switch_caller_profile_t *_caller_profile; - - switch_mutex_t *_mutex; - switch_mutex_t *flag_mutex; //TODO: Alterar o nome depois - - unsigned int _KDeviceId; /*!< Represent de board we are making the call from */ - unsigned int _KChannelId; /*!< Represent the channel we are making the call from */ - - /* static stuff */ - static switch_mutex_t *_pvts_mutex; - - static KhompPvtVector _pvts; /*!< Static structure that contains all the pvts. Will be initialized by KhompPvt::initialize */ }; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Tue Jun 30 02:38:50 2009 @@ -993,8 +993,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not hangup channel: %u on board %u. Releasing board channel anyway. [EV_DISCONNECT]\n", obj, e->DeviceId); try { - //Globals::_k3lapi.command(e->DeviceId, obj, CM_STOP_LISTEN, NULL); + /* Stop the audio callbacks */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping audio callbacks ...\n"); + KhompPvt::khompPvt(e->DeviceId, obj)->stop_listen(); + KhompPvt::khompPvt(e->DeviceId, obj)->stop_stream(); KhompPvt::khompPvt(e->DeviceId, obj)->session(NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio callbacks stopped successfully\n"); } catch(K3LAPI::invalid_channel & err) { @@ -1012,10 +1016,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Call will be answered on board %u, channel %u. [EV_CONNECT]\n", e->DeviceId, obj); switch_channel_mark_answered(channel); /* Start listening for audio */ - /* - const size_t buffer_size = 16; - Globals::_k3lapi.command(e->DeviceId, obj, CM_LISTEN, (const char *) &buffer_size); - */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting audio callbacks ...\n"); + KhompPvt::khompPvt(e->DeviceId, obj)->start_stream(); + KhompPvt::khompPvt(e->DeviceId, obj)->start_listen(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio callbacks initialized successfully\n"); } catch (K3LAPI::invalid_session & err) { Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/src/khomp_pvt.cpp Tue Jun 30 02:38:50 2009 @@ -153,3 +153,161 @@ switch_mutex_unlock(_pvts_mutex); return pvt; } + +/* Helper functions - based on code from chan_khomp */ + +int32 KhompPvt::get_audio_dsp() +{ + switch (Globals::_k3lapi.device_type(_KDeviceId)) + { + case kdtFXO: + case kdtFXOVoIP: + case kdtGSM: + case kdtGSMSpx: + return 0; + default: + return 1; + } +} + +bool KhompPvt::obtain_both(void) +{ + /* estes buffers *NAO PODEM SER ESTATICOS*! */ + char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x05, 0xff }; + char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x00, 0xff }; + + cmd1[2] = cmd1[5] = cmd2[2] = cmd2[5] = _KChannelId; + + int32 val = get_audio_dsp(); + + try + { + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd1, 6); + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd2, 6); + } + catch(...) + { + return false; + } + + return true; +} + +bool KhompPvt::obtain_rx(bool with_delay) +{ + /* estes buffers *NAO PODEM SER ESTATICOS*! */ + char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, (with_delay ? 0x05 : 0x0a), 0xff }; + char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x09, 0x0f }; + + cmd1[2] = cmd1[5] = cmd2[2] = _KChannelId; + + int32 val = get_audio_dsp(); + + try + { + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd1, 6); + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd2, 6); + } + catch(...) + { + return false; + } + + return true; +} + +bool KhompPvt::obtain_tx(void) +{ + /* estes buffers *NAO PODEM SER ESTATICOS*! */ + char cmd1[] = { 0x3f, 0x03, 0xff, 0x00, 0x00, 0xff }; + char cmd2[] = { 0x3f, 0x03, 0xff, 0x01, 0x09, 0x0f }; + + cmd1[2] = cmd1[5] = cmd2[2] = _KChannelId; + + int32 val = get_audio_dsp(); + + try + { + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd1, 6); + Globals::_k3lapi.raw_command(_KDeviceId, val, cmd2, 6); + } + catch(...) + { + return false; + } + + return true; +} + +bool KhompPvt::start_stream(void) +{ + try + { + Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsPlay, _KChannelId); + Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_START_STREAM_BUFFER); + //flags.set(kflags::STREAM_UP); + } + catch(...) + { + return false; + } + return true; +} + +bool KhompPvt::stop_stream(void) +{ + try + { + Globals::_k3lapi.mixer(_KDeviceId, _KChannelId, 0, kmsGenerator, kmtSilence); + Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_STOP_STREAM_BUFFER); + //flags.clear(kflags::STREAM_UP); + } + catch(...) + { + return false; + } + + return true; +} + +bool KhompPvt::start_listen(bool conn_rx) +{ + const size_t buffer_size = KHOMP_PACKET_SIZE; + + if (conn_rx) + { + if (!obtain_rx(false)) // no delay, by default.. + return false; + } + + try + { + Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_LISTEN, (const char *) &buffer_size); + } + catch(...) + { + return false; + } + + /* always set this flag to avoid constant 'ksInvalidState' messages. */ + //flags.set(kflags::LISTEN_UP); + + return true; +} + +bool KhompPvt::stop_listen(void) +{ + try + { + Globals::_k3lapi.command(_KDeviceId, _KChannelId, CM_STOP_LISTEN); + } + catch(...) + { + return false; + } + + //flags.clear(kflags::LISTEN_UP); + + return true; +} +

1 0

[commit] r14043 - in freeswitch/trunk/contrib/mod/endpoints/mod_khomp: . include
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: raulfragoso Date: Mon Jun 29 21:12:56 2009 New Revision: 14043 Log: KhompPvt lacked some proper cleanup during shutdown Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/include/khomp_pvt.h Mon Jun 29 21:12:56 2009 @@ -79,7 +79,16 @@ static void terminate() { + switch_mutex_lock(_pvts_mutex); + for(KhompPvtVector::iterator it_board = _pvts.begin(); it_board != _pvts.end(); it_board++) + { + for(PvtVectorType::iterator it_channel = it_board->begin(); it_channel != it_board->begin(); it_channel++) + { + KhompPvt * pvt = *it_channel; + delete pvt; + } + } } K3LAPI::target _target; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.cpp Mon Jun 29 21:12:56 2009 @@ -561,6 +561,7 @@ /* Finnish him! */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stopping K3L...\n"); + KhompPvt::terminate(); Globals::_k3lapi.stop(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "the K3L API has been stopped!\n");

1 0

[commit] r14042 - in freeswitch/trunk/src/mod/applications: mod_commands mod_expr
by FreeSWITCH SVN 30 Jun '09

30 Jun '09

Author: brian Date: Mon Jun 29 21:12:35 2009 New Revision: 14042 Log: corrections thanks diego Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jun 29 21:12:35 2009 @@ -3532,7 +3532,7 @@ SWITCH_ADD_API(commands_api_interface, "domain_exists", "check if a domain exists", domain_exists_function, "<domain>"); SWITCH_ADD_API(commands_api_interface, "uuid_send_dtmf", "send dtmf digits", uuid_send_dtmf_function, UUID_SEND_DTMF_SYNTAX); SWITCH_ADD_API(commands_api_interface, "eval", "eval (noop)", eval_function, "[uuid:<uuid> ]<expression>"); - SWITCH_ADD_API(commands_api_interface, "expand", "expand vars and exexute", expand_function, "[uuid:<uuid> ]<cmd> <args>"); + SWITCH_ADD_API(commands_api_interface, "expand", "expand vars and execute", expand_function, "[uuid:<uuid> ]<cmd> <args>"); SWITCH_ADD_API(commands_api_interface, "echo", "echo", echo_function, "<data>"); SWITCH_ADD_API(commands_api_interface, "stun", "stun", stun_function, "<stun_server>[:port]"); SWITCH_ADD_API(commands_api_interface, "system", "Execute a system command", system_function, SYSTEM_SYNTAX); Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.c Mon Jun 29 21:12:35 2009 @@ -195,7 +195,7 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_API(commands_api_interface, "expr", "Eval an expession", expr_function, "<expr>"); + SWITCH_ADD_API(commands_api_interface, "expr", "Eval an expression", expr_function, "<expr>"); /* indicate that the module should continue to be loaded */

1 0