June 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

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

27 Jun '09

Author: raulfragoso Date: Sat Jun 27 01:47:06 2009 New Revision: 14011 Log: No more crashes ! 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 Sat Jun 27 01:47:06 2009 @@ -54,6 +54,7 @@ K3LAPI::target tgt(Globals::_k3lapi, K3LAPI::target::CHANNEL, dev, obj); KhompPvt * pvt = new KhompPvt(tgt); _pvts.back().push_back(pvt); + Globals::_k3lapi.command(dev, obj, CM_DISCONNECT, NULL); } } } 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 Sat Jun 27 01:47:06 2009 @@ -1048,17 +1048,23 @@ } break; case EV_DISCONNECT: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj); - if (channel_on_hangup(KhompPvt::khompPvt(e->DeviceId, obj)->session()) != SWITCH_STATUS_SUCCESS) - 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_DISCONNECT, NULL); - KhompPvt::khompPvt(e->DeviceId, obj)->session(NULL); - } - catch(K3LAPI::invalid_channel & err) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not send CM_DISCONNECT!\n"); + switch_core_session_t * session = KhompPvt::khompPvt(e->DeviceId, obj)->session(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Called party dropped the call on: %u. Releasing channel. [EV_DISCONNECT]\n", obj); + if(session == NULL) + break; + + if (channel_on_hangup(session) != SWITCH_STATUS_SUCCESS) + 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_DISCONNECT, NULL); + KhompPvt::khompPvt(e->DeviceId, obj)->session(NULL); + } + catch(K3LAPI::invalid_channel & err) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not send CM_DISCONNECT!\n"); + } } break; case EV_CONNECT:

1 0

[commit] r14010 - freeswitch/trunk/contrib/mod/endpoints/mod_khomp
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: raulfragoso Date: Sat Jun 27 01:24:25 2009 New Revision: 14010 Log: Implemented proper khompe_channel_from_event to build a new session and assign it to the static khomp_pvt; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/mod_khomp.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 Sat Jun 27 01:24:25 2009 @@ -928,6 +928,104 @@ /* End of helper functions */ +/* Create a new channel on incoming call */ +KLibraryStatus khomp_channel_from_event(unsigned int KDeviceId, unsigned int KChannel, K3L_EVENT * event) +{ + switch_core_session_t *session = NULL; + KhompPvt *tech_pvt = NULL; + switch_channel_t *channel = NULL; + char name[128]; + + if (!(session = switch_core_session_request(Globals::_khomp_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n"); + return ksFail; + } + + switch_core_session_add_stream(session, NULL); + + tech_pvt = KhompPvt::khompPvt(KDeviceId, KChannel); + assert(tech_pvt != NULL); + channel = switch_core_session_get_channel(session); + if (tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Initilization Error!\n"); + switch_core_session_destroy(&session); + return ksFail; + } + + + /* Get all data from event */ + std::string cidNum; + std::string destination_number; + try + { + cidNum = Globals::_k3lapi.get_param(event, "orig_addr"); + destination_number = Globals::_k3lapi.get_param(event, "dest_addr"); + } + catch ( K3LAPI::get_param_failed & err ) + { + // TODO: Can we set NULL variables? What should we do if this fails? + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Could not get param %s on channel %u, board %u.\n", err.name.c_str(), KChannel, KDeviceId); + } + + /*if (switch_strlen_zero(sigmsg->channel->caller_data.cid_num.digits)) { + if (!switch_strlen_zero(sigmsg->channel->caller_data.ani.digits)) { + switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->caller_data.ani.digits); + } else { + switch_set_string(sigmsg->channel->caller_data.cid_num.digits, sigmsg->channel->chan_number); + } + } + */ + + /* Set the caller profile - Look at documentation */ + tech_pvt->_caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), + "Khomp", + "XML", // TODO: Dialplan module to use? + NULL, + NULL, + NULL, + cidNum.c_str(), + NULL, + NULL, + (char *) modname, + "default", // TODO: Context to look for on the dialplan? + destination_number.c_str()); + + assert(tech_pvt->_caller_profile != NULL); + /* END */ + + /* WHAT??? - Look at documentation */ + //switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_NONE); + /* END */ + + /* */ + snprintf(name, sizeof(name), "Khomp/%u/%u/%s", KDeviceId, KChannel, tech_pvt->_caller_profile->destination_number); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connect inbound channel %s\n", name); + switch_channel_set_name(channel, name); + switch_channel_set_caller_profile(channel, tech_pvt->_caller_profile); + /* END */ + + + switch_channel_set_state(channel, CS_INIT); + if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n"); + switch_core_session_destroy(&session); + return ksFail; + } + + /* WHAT? + if (zap_channel_add_token(sigmsg->channel, switch_core_session_get_uuid(session), 0) != ZAP_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error adding token\n"); + switch_core_session_destroy(&session); + return ZAP_FAIL; + } + */ + + /* Set the session to the channel */ + KhompPvt::khompPvt(KDeviceId, KChannel)->session(session); + + return ksSuccess; +} + static int32 Kstdcall khomp_event_callback(int32 obj, K3L_EVENT * e) { /* TODO: How do we make sure channels inside FreeSWITCH only change to valid states on K3L? */ @@ -935,6 +1033,11 @@ { case EV_NEW_CALL: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "New call on %u to %s. [EV_NEW_CALL]\n", obj, Globals::_k3lapi.get_param(e, "dest_addr").c_str()); + if (khomp_channel_from_event(e->DeviceId, obj, e) != ksSuccess ) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Something bad happened while getting channel session. Device:%u/Channel:%u. [EV_CONNECT]\n", e->DeviceId, obj); + return ksFail; + } try { Globals::_k3lapi.command(e->DeviceId, obj, CM_RINGBACK, NULL); Globals::_k3lapi.command(e->DeviceId, obj, CM_CONNECT, NULL);

1 0

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

27 Jun '09

Author: raulfragoso Date: Sat Jun 27 01:16:07 2009 New Revision: 14009 Log: Fixed khomp_pvt to have a *REAL* array of static channels; Included debug in the makefile; Modified: freeswitch/trunk/contrib/mod/endpoints/mod_khomp/Makefile 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/Makefile ============================================================================== --- freeswitch/trunk/contrib/mod/endpoints/mod_khomp/Makefile (original) +++ freeswitch/trunk/contrib/mod/endpoints/mod_khomp/Makefile Sat Jun 27 01:16:07 2009 @@ -1,6 +1,6 @@ MODNAME=mod_khomp VERBOSE=1 -LOCAL_CFLAGS=-I./include -I./commons -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM +LOCAL_CFLAGS=-I./include -I./commons -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -g -ggdb LOCAL_LDFLAGS=-lk3l LOCAL_OBJS= ./commons/k3lapi.o ./commons/config_options.o ./commons/format.o ./commons/strings.o LOCAL_OBJS+= ./src/globals.o ./src/opt.o ./src/khomp_pvt.o 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 Sat Jun 27 01:16:07 2009 @@ -43,15 +43,19 @@ static void initialize(void) { - -//// tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t)) - //for (unsigned dev = 0; dev < Globals::_k3lapi.device_count(); dev++) - //{ - // _pvts.push_back(std::vector<KhompPvt>()); - - //for (unsigned obj = 0; obj < Globals::_k3lapi.channel_count(obj); obj++) - //_pvts.back().push_back(KhompPvt(K3LAPI::target(Globals::_k3lapi, K3LAPI::target::CHANNEL, dev, obj))); - // } + for (unsigned dev = 0; dev < Globals::_k3lapi.device_count(); dev++) + { + // KhompPvt * tech_pvt; + //tech= (KhompPvt *) switch_core_session_alloc(*new_session, sizeof(KhompPvt)); + _pvts.push_back(std::vector<KhompPvt*>()); + + for (unsigned obj = 0; obj < Globals::_k3lapi.channel_count(dev); obj++) + { + K3LAPI::target tgt(Globals::_k3lapi, K3LAPI::target::CHANNEL, dev, obj); + KhompPvt * pvt = new KhompPvt(tgt); + _pvts.back().push_back(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 Sat Jun 27 01:16:07 2009 @@ -579,6 +579,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Starting K3L...\n"); try { Globals::_k3lapi.start(); + KhompPvt::initialize(); } catch (K3LAPI::start_failed & e) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "K3L not started. Reason:%s.\n", e.msg.c_str()); return SWITCH_STATUS_TERM;

1 0

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

27 Jun '09

Author: raulfragoso Date: Fri Jun 26 22:34:07 2009 New Revision: 14008 Log: Some more work to get calls working again, but still crashing :/ 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 Fri Jun 26 22:34:07 2009 @@ -71,6 +71,9 @@ 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 _KChannel; // Represent the channel we are making the call from + /* static stuff */ static KhompPvtVector _pvts; }; 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 Fri Jun 26 22:34:07 2009 @@ -127,10 +127,12 @@ { tech_pvt->_read_frame.data = tech_pvt->_databuf; tech_pvt->_read_frame.buflen = sizeof(tech_pvt->_databuf); - switch_mutex_init(&tech_pvt->_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_mutex_init(&tech_pvt->_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + switch_core_session_set_private(session, tech_pvt); + tech_pvt->_session = session; if (switch_core_codec_init(&tech_pvt->_read_codec, @@ -160,6 +162,7 @@ switch_core_session_set_read_codec(tech_pvt->_session, &tech_pvt->_read_codec); switch_core_session_set_write_codec(tech_pvt->_session, &tech_pvt->_write_codec); + switch_set_flag_locked(tech_pvt, TFLAG_CODEC); tech_pvt->_read_frame.codec = &tech_pvt->_read_codec; @@ -255,6 +258,16 @@ switch_core_codec_destroy(&tech_pvt->_write_codec); } + try + { + Globals::_k3lapi.command(tech_pvt->_KDeviceId, tech_pvt->_KChannel, CM_DISCONNECT, NULL); + } + catch(K3LAPI::failed_command & e) + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "WE COULD NOT HANGUP THE CHANNEL! rc:%d\n", e.rc); + return SWITCH_STATUS_TERM; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s Originator Hangup.\n", switch_channel_get_name(channel)); switch_mutex_lock(Globals::_mutex); Globals::_calls--; @@ -343,7 +356,6 @@ return SWITCH_STATUS_FALSE; } - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->_read_frame.datalen) { continue; } @@ -447,7 +459,7 @@ switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { - char *argv[3] = { 0 }; + char *argv[3] = { 0 }; int argc = 0; if ((*new_session = switch_core_session_request(Globals::_khomp_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) != 0) { @@ -480,12 +492,12 @@ else { // usar algoritmo de busca de canais (spec.*). -// tech_pvt->_KDeviceId = atoi(argv[0]); -// tech_pvt->_KChannel = atoi(argv[1]); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Dialing to %s out\n",// from Board:%u, Channel:%u.\n", - argv[2] - //, tech_pvt->_KDeviceId, tech_pvt->_KChannel - ); + tech_pvt->_KDeviceId = atoi(argv[0]); + tech_pvt->_KChannel = atoi(argv[1]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Dialing to %s out from Board:%u, Channel:%u.\n", + argv[2], + tech_pvt->_KDeviceId, + tech_pvt->_KChannel); } @@ -496,7 +508,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); switch_core_session_destroy(new_session); /* Destroy the channel session */ - // Globals::_k3lapi.setSession(tech_pvt->_KDeviceId, tech_pvt->_KChannel, NULL); + KhompPvt::khompPvt(tech_pvt->_KDeviceId, tech_pvt->_KChannel)->session(NULL); return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } @@ -509,9 +521,9 @@ try { /* Lets make the call! */ char params[ 255 ]; - sprintf(params, "dest_addr=\"%s\"", argv[2]); + snprintf(params, sizeof(params), "dest_addr=\"%s\" orig_addr=\"%s\"", argv[2], outbound_profile->caller_id_number); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "We are calling with params: %s.\n", params); - //Globals::_k3lapi.command(tech_pvt->_KDeviceId,tech_pvt->_KChannel, CM_MAKE_CALL, params); + Globals::_k3lapi.command(tech_pvt->_KDeviceId,tech_pvt->_KChannel, CM_MAKE_CALL, params); } catch(K3LAPI::failed_command & e) { @@ -520,7 +532,7 @@ } /* Add the new session the the channel's info */ - //Globals::_k3lapi.setSession(tech_pvt->_KDeviceId, tech_pvt->_KChannel, *new_session); + KhompPvt::khompPvt(tech_pvt->_KDeviceId, tech_pvt->_KChannel)->session(*new_session); return SWITCH_CAUSE_SUCCESS; } @@ -629,7 +641,7 @@ */ SWITCH_STANDARD_API(khomp) { - char *argv[10] = { 0 }; + char *argv[10] = { 0 }; int argc = 0; void *val; char *myarg = NULL;

1 0

[commit] r14007 - in freeswitch/trunk/scripts: javascript/js_modules js_modules
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:44:10 2009 New Revision: 14007 Log: moving js_modules to javascript Added: freeswitch/trunk/scripts/javascript/js_modules/ - copied from r14000, /freeswitch/trunk/scripts/js_modules/ Removed: freeswitch/trunk/scripts/js_modules/

1 0

[commit] r14006 - in freeswitch/trunk/scripts: perl/scenario scenario
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:43:52 2009 New Revision: 14006 Log: move scenario files to perl Added: freeswitch/trunk/scripts/perl/scenario/ - copied from r14000, /freeswitch/trunk/scripts/scenario/ Removed: freeswitch/trunk/scripts/scenario/

1 0

[commit] r14005 - in freeswitch/trunk/scripts: . perl
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:43:28 2009 New Revision: 14005 Log: moving things to more logical layout Added: freeswitch/trunk/scripts/perl/sendmail - copied unchanged from r14000, /freeswitch/trunk/scripts/sendmail Removed: freeswitch/trunk/scripts/sendmail freeswitch/trunk/scripts/sipsetup

1 0

[commit] r14004 - in freeswitch/trunk/scripts: multicast perl/multicast
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:42:36 2009 New Revision: 14004 Log: move multicast to perl Added: freeswitch/trunk/scripts/perl/multicast/ - copied from r14000, /freeswitch/trunk/scripts/multicast/ Removed: freeswitch/trunk/scripts/multicast/

1 0

[commit] r14003 - in freeswitch/trunk/scripts: perl/tonegen tonegen
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:42:16 2009 New Revision: 14003 Log: move tonegen to perl Added: freeswitch/trunk/scripts/perl/tonegen/ - copied from r14000, /freeswitch/trunk/scripts/tonegen/ Removed: freeswitch/trunk/scripts/tonegen/

1 0

[commit] r14002 - in freeswitch/trunk/scripts: POE-Filter-FSSocket perl/POE-Filter-FSSocket
by FreeSWITCH SVN 27 Jun '09

27 Jun '09

Author: brian Date: Fri Jun 26 19:41:39 2009 New Revision: 14002 Log: move this to perl Added: freeswitch/trunk/scripts/perl/POE-Filter-FSSocket/ - copied from r14000, /freeswitch/trunk/scripts/POE-Filter-FSSocket/ Removed: freeswitch/trunk/scripts/POE-Filter-FSSocket/

1 0