January 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11516 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: andrew Date: Tue Jan 27 15:39:29 2009 New Revision: 11516 Log: Cleanup after log/event handler process exit, fix event handler stuff to work again and do some minor tweaks Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/handle_msg.c Tue Jan 27 15:39:29 2009 @@ -605,20 +605,23 @@ } else if (!strncmp(atom, "nolog", MAXATOMLEN)) { if (switch_test_flag(listener, LFLAG_LOG)) { + void *pop; + /*purge the log queue */ + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); switch_clear_flag_locked(listener, LFLAG_LOG); } ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_log_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); listener->log_process.type = ERLANG_PID; - listener->log_process.pid = msg->from; + memcpy(&listener->log_process.pid, &msg->from, sizeof(erlang_pid)); listener->level = SWITCH_LOG_DEBUG; switch_set_flag(listener, LFLAG_LOG); ei_x_encode_atom(rbuf, "ok"); } else if (!strncmp(atom, "register_event_handler", MAXATOMLEN)) { ei_link(listener, ei_self(listener->ec), &msg->from); listener->event_process.type = ERLANG_PID; - listener->event_process.pid = msg->from; + memcpy(&listener->event_process.pid, &msg->from, sizeof(erlang_pid)); if (!switch_test_flag(listener, LFLAG_EVENTS)) { switch_set_flag_locked(listener, LFLAG_EVENTS); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Tue Jan 27 15:39:29 2009 @@ -190,12 +190,13 @@ /* test all of the sessions attached to this event in case one of them should receive it as well */ + send_event_to_attached_sessions(l,event); if (!switch_test_flag(l, LFLAG_EVENTS)) { continue; } - + if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_epoch_time_now(NULL) - l->last_flush > l->timeout) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id); remove_listener(l); @@ -210,6 +211,7 @@ send = 1; } } + if (send) { if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { @@ -397,7 +399,7 @@ /*int index = 3;*/ while (!(rep = (ei_x_buff *) switch_core_hash_find(ptr->listener->fetch_reply_hash, uuid_str))) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for XML fetch response!\n"); return NULL; } i++; @@ -603,10 +605,11 @@ static void check_event_queue(listener_t *listener) { void* pop; + /* send out any pending crap in the event queue */ if (switch_test_flag(listener, LFLAG_EVENTS)) { if (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { - + switch_event_t *pevent = (switch_event_t *) pop; ei_x_buff ebuf; @@ -615,7 +618,7 @@ ei_encode_switch_event(&ebuf, pevent); switch_mutex_lock(listener->sock_mutex); - ei_sendto(listener->ec, listener->sockfd, &listener->log_process, &ebuf); + ei_sendto(listener->ec, listener->sockfd, &listener->event_process, &ebuf); switch_mutex_unlock(listener->sock_mutex); ei_x_free(&ebuf); @@ -624,6 +627,50 @@ } } +static void handle_exit(listener_t *listener, erlang_pid *pid) +{ + session_elem_t *s; + + remove_binding(NULL, pid); /* TODO - why don't we pass the listener as the first argument? */ + if ((s = find_session_elem_by_pid(listener, pid))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Outbound session for %s exited unexpectedly!\n", + switch_core_session_get_uuid(s->session)); + /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ + remove_session_elem_from_listener(listener, s); + } + + if (listener->log_process.type == ERLANG_PID && !ei_compare_pids(&listener->log_process.pid, pid)) { + void *pop; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Log handler process for node %s exited\n", pid->node); + /*purge the log queue */ + while (switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS); + + if (switch_test_flag(listener, LFLAG_LOG)) { + switch_clear_flag_locked(listener, LFLAG_LOG); + } + } + + if (listener->event_process.type == ERLANG_PID && !ei_compare_pids(&listener->event_process.pid, pid)) { + void *pop; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Event handler process for node %s exited\n", pid->node); + /*purge the event queue */ + while (switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS); + + if (switch_test_flag(listener, LFLAG_EVENTS)) { + uint8_t x = 0; + switch_clear_flag_locked(listener, LFLAG_EVENTS); + for (x = 0; x <= SWITCH_EVENT_ALL; x++) { + listener->event_list[x] = 0; + } + /* wipe the hash */ + switch_core_hash_destroy(&listener->event_hash); + switch_core_hash_init(&listener->event_hash, listener->pool); + } + } +} + static void listener_main_loop(listener_t *listener) { int status = 1; @@ -681,10 +728,7 @@ break; case ERL_EXIT : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial); - remove_binding(NULL, &msg.from); - /* TODO - if a spawned process that was handling an outbound call fails.. what do we do with the call? */ - remove_session_elem_from_listener(listener, find_session_elem_by_pid(listener, &msg.from)); - /* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */ + handle_exit(listener, &msg.from); break; default : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unexpected msg type %d\n", (int)(msg.msgtype)); @@ -1030,7 +1074,7 @@ while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) { if (i > 50) { /* half a second timeout */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Timed out when waiting for outbound pid\n"); switch_core_session_rwunlock(session); remove_session_elem_from_listener(listener,session_element); return NULL;

1 0

[commit] r11515 - freeswitch/trunk/src/mod/applications/mod_skel
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:32:15 2009 New Revision: 11515 Log: Add a couple comments to mod_skel Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Modified: freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/trunk/src/mod/applications/mod_skel/mod_skel.c Tue Jan 27 15:32:15 2009 @@ -32,12 +32,17 @@ */ #include <switch.h> +/* Prototypes */ //SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown); //SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime); - SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load); + +/* SWITCH_MODULE_DEFINITION(name, load, shutdown, runtime) + * Defines a switch_loadable_module_function_table_t and a static const char[] modname + */ SWITCH_MODULE_DEFINITION(mod_skel, mod_skel_load, NULL, NULL); +/* Macro expands to: switch_status_t mod_skel_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */ SWITCH_MODULE_LOAD_FUNCTION(mod_skel_load) { /* connect my internal structure to the blank pointer passed to me */ @@ -51,6 +56,7 @@ /* Called when the system shuts down + Macro expands to: switch_status_t mod_skel_shutdown() SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skel_shutdown) { return SWITCH_STATUS_SUCCESS; @@ -60,6 +66,7 @@ /* If it exists, this is called in it's own thread when the module-load completes If it returns anything but SWITCH_STATUS_TERM it will be called again automatically + Macro expands to: switch_status_t mod_skel_runtime() SWITCH_MODULE_RUNTIME_FUNCTION(mod_skel_runtime) { while(looping)

1 0

[commit] r11514 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:19:40 2009 New Revision: 11514 Log: Add doxygen comments and const to switch_ivr_schedule_broadcast Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Jan 27 15:19:40 2009 @@ -107,6 +107,7 @@ \brief Wait for time to pass for a specified number of milliseconds \param session the session to wait for. \param ms the number of milliseconds + \param sync synchronize the channel's audio before waiting \param args arguements to pass for callbacks etc \return SWITCH_STATUS_SUCCESS if the channel is still up */ @@ -389,6 +390,7 @@ \param cid_name_override override the caller id name \param cid_num_override override the caller id number \param caller_profile_override override the entire calling caller profile + \param ovars variables to be set on the outgoing channel \param flags flags to pass \return SWITCH_STATUS_SUCCESS if bleg is a running session. \note bleg will be read locked which must be unlocked with switch_core_session_rwunlock() before losing scope @@ -524,7 +526,7 @@ \param flags flags to send to the request (SMF_ECHO_BRIDGED to send the broadcast to both sides of the call) \return the id of the task */ -SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, char *uuid, char *path, switch_media_flag_t flags); +SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, const char *uuid, const char *path, switch_media_flag_t flags); /*! \brief Signal the session to broadcast audio Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jan 27 15:19:40 2009 @@ -2147,7 +2147,7 @@ switch_ivr_broadcast(helper->uuid_str, helper->path, helper->flags); } -SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, char *uuid, char *path, switch_media_flag_t flags) +SWITCH_DECLARE(uint32_t) switch_ivr_schedule_broadcast(time_t runtime, const char *uuid, const char *path, switch_media_flag_t flags) { struct broadcast_helper *helper; size_t len = sizeof(*helper) + strlen(path) + 1;

1 0

[commit] r11513 - freeswitch/trunk/scripts/contrib/jmesquita/fsgui
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Tue Jan 27 15:15:40 2009 New Revision: 11513 Log: including esl.h is enough Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Tue Jan 27 15:15:40 2009 @@ -4,9 +4,6 @@ #include <QtGui> #include "esl.h" -#include "esl_event.h" -#include "esl_threadmutex.h" -#include "esl_config.h" class conn_event_handler : public QObject {

1 0

[commit] r11509 - freeswitch/trunk/libs/srtp/crypto/cipher
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: brian Date: Tue Jan 27 12:01:17 2009 New Revision: 11509 Log: FSCORE-280 Modified: freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c Modified: freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c ============================================================================== --- freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c (original) +++ freeswitch/trunk/libs/srtp/crypto/cipher/aes_icm.c Tue Jan 27 12:01:17 2009 @@ -98,15 +98,15 @@ uint8_t *pointer; int tmp; - debug_print(mod_aes_icm, - "allocating cipher with key length %d", key_len); + debug_print(mod_aes_icm, "allocating cipher with key length %d", key_len); - // Ismacryp, for example, uses 16 byte key + 8 byte - // salt so this function is called with key_len = 24. - // The check for key_len = 30 does not apply. Our usage - // of aes functions with key_len = values other than 30 - // has not broken anything. Don't know what would be the - // effect of skipping this check for srtp in general. + /* Ismacryp, for example, uses 16 byte key + 8 byte + salt so this function is called with key_len = 24. + The check for key_len = 30 does not apply. Our usage + of aes functions with key_len = values other than 30 + has not broken anything. Don't know what would be the + effect of skipping this check for srtp in general. + */ if (!forIsmacryp && key_len != 30) return err_status_bad_param; @@ -300,7 +300,7 @@ if (forIsmacryp) { uint32_t temp; - //alex's clock counter forward + /* alex's clock counter forward */ temp = ntohl(c->counter.v32[3]); c->counter.v32[3] = htonl(++temp); } else {

1 0

[commit] r11508 - freeswitch/trunk
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: brian Date: Tue Jan 27 11:58:53 2009 New Revision: 11508 Log: fix spec file Modified: freeswitch/trunk/freeswitch.spec Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Tue Jan 27 11:58:53 2009 @@ -281,7 +281,6 @@ %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/directory %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/directory/default %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/lang -%dir %attr(0750, freeswitch, daemon) %{prefix}/conf/mrcp_profiles %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/sip_profiles %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan/default %dir %attr(0750, freeswitch, daemon) %{prefix}/conf/dialplan/public @@ -342,7 +341,6 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/dialplan/public/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/default/* -%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/mrcp_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/internal/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/sip_profiles/external/*.xml

1 0

[commit] r11507 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: andrew Date: Tue Jan 27 11:43:18 2009 New Revision: 11507 Log: This shouldn't be here Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Tue Jan 27 11:43:18 2009 @@ -32,8 +32,6 @@ * */ -#define EI_DEBUG - typedef enum { LFLAG_WAITING_FOR_PID = (1 << 0), /* waiting for a node to return a pid */ LFLAG_OUTBOUND_INIT = (1 << 1), /* Erlang peer has been notified of this session */

1 0

[commit] r11506 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: brian Date: Tue Jan 27 08:38:37 2009 New Revision: 11506 Log: revert 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 Jan 27 08:38:37 2009 @@ -4282,54 +4282,7 @@ } } - if (sip->sip_replaces) { - nua_handle_t *bnh; - if ((bnh = nua_handle_by_replaces(nua, sip->sip_replaces))) { - sofia_private_t *b_private = NULL; - if ((b_private = nua_handle_magic(bnh))) { - switch_core_session_t *b_session = NULL; - if ((b_session = switch_core_session_locate(b_private->uuid))) { - switch_channel_t *b_channel = switch_core_session_get_channel(b_session); - const char *uuid; - int one_leg = 1; - - if ((uuid = switch_channel_get_variable(b_channel, SWITCH_SIGNAL_BOND_VARIABLE))) { - one_leg = 0; - } else { - uuid = switch_core_session_get_uuid(b_session); - } - - if (uuid) { - switch_core_session_t *c_session = NULL; - int do_conf = 0; - - if ((c_session = switch_core_session_locate(uuid))) { - switch_channel_t *c_channel = switch_core_session_get_channel(c_session); - if (!one_leg && !switch_channel_test_flag(b_channel, CF_HOLD)) { - char *ext = switch_core_session_sprintf(b_session, "conference:%s", uuid); - switch_channel_set_flag(c_channel, CF_REDIRECT); - switch_ivr_session_transfer(b_session, ext, "inline", NULL); - switch_ivr_session_transfer(c_session, ext, "inline", NULL); - switch_channel_clear_flag(c_channel, CF_REDIRECT); - do_conf = 1; - } - switch_core_session_rwunlock(c_session); - } - if (do_conf) { - destination_number = switch_core_session_sprintf(b_session, "answer,conference:%s", uuid); - } else { - destination_number = switch_core_session_sprintf(b_session, "answer,intercept:%s", uuid); - } - - dialplan = "inline"; - } - switch_core_session_rwunlock(b_session); - } - } - nua_handle_unref(bnh); - } - } check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),

1 0

[commit] r11505 - in freeswitch/trunk: scripts/aadir src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: brian Date: Tue Jan 27 08:34:10 2009 New Revision: 11505 Log: FSSCRIPTS-14 Modified: freeswitch/trunk/scripts/aadir/aadir.js freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/scripts/aadir/aadir.js ============================================================================== --- freeswitch/trunk/scripts/aadir/aadir.js (original) +++ freeswitch/trunk/scripts/aadir/aadir.js Tue Jan 27 08:34:10 2009 @@ -57,7 +57,7 @@ re = /[^A-Z0-9\s]/gi; - for each (var variables in xdir.user.variables) { + for each (var variables in xdir.groups.group.users.user.variables) { name = ""; number = ""; 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 Jan 27 08:34:10 2009 @@ -4282,7 +4282,54 @@ } } + if (sip->sip_replaces) { + nua_handle_t *bnh; + if ((bnh = nua_handle_by_replaces(nua, sip->sip_replaces))) { + sofia_private_t *b_private = NULL; + if ((b_private = nua_handle_magic(bnh))) { + switch_core_session_t *b_session = NULL; + if ((b_session = switch_core_session_locate(b_private->uuid))) { + switch_channel_t *b_channel = switch_core_session_get_channel(b_session); + const char *uuid; + int one_leg = 1; + + if ((uuid = switch_channel_get_variable(b_channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + one_leg = 0; + } else { + uuid = switch_core_session_get_uuid(b_session); + } + + if (uuid) { + switch_core_session_t *c_session = NULL; + int do_conf = 0; + + if ((c_session = switch_core_session_locate(uuid))) { + switch_channel_t *c_channel = switch_core_session_get_channel(c_session); + if (!one_leg && !switch_channel_test_flag(b_channel, CF_HOLD)) { + char *ext = switch_core_session_sprintf(b_session, "conference:%s", uuid); + switch_channel_set_flag(c_channel, CF_REDIRECT); + switch_ivr_session_transfer(b_session, ext, "inline", NULL); + switch_ivr_session_transfer(c_session, ext, "inline", NULL); + switch_channel_clear_flag(c_channel, CF_REDIRECT); + do_conf = 1; + } + switch_core_session_rwunlock(c_session); + } + if (do_conf) { + destination_number = switch_core_session_sprintf(b_session, "answer,conference:%s", uuid); + } else { + destination_number = switch_core_session_sprintf(b_session, "answer,intercept:%s", uuid); + } + + dialplan = "inline"; + } + switch_core_session_rwunlock(b_session); + } + } + nua_handle_unref(bnh); + } + } check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),

1 0

[commit] r11502 - freeswitch/trunk/scripts/contrib/jmesquita/fsgui
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Mon Jan 26 21:09:18 2009 New Revision: 11502 Log: Refactor Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp Mon Jan 26 21:09:18 2009 @@ -6,29 +6,32 @@ memset(&handle, 0, sizeof(esl_handle_t)); } -conn_event_handler::~conn_event_handler(void){ - getDisconnected(); +conn_event_handler::~conn_event_handler(void) +{ + if (isConnected()) { + Disconnect(); + } } -void conn_event_handler::getDisconnected(){ +void conn_event_handler::Disconnect() +{ esl_disconnect(&handle); } -void conn_event_handler::getConnected(QString hostname, int port, QString password){ - QByteArray h = hostname.toAscii(); - QByteArray p = password.toAscii(); - const char * Hostname = h.data(); - const char * Password = p.data(); - esl_status_t status = esl_connect(&handle, Hostname, port, Password); - if ( status != ESL_SUCCESS) - { - QString errDesc = handle.err; - emit connectionError(errDesc); - } - else - { - emit gotConnected(); - } +void conn_event_handler::Connect(const QString& hostname, int port, const QString& password) +{ + + esl_status_t status = esl_connect(&handle, hostname.toAscii().data(), port, password.toAscii().data()); + + if ( status != ESL_SUCCESS) + { + QString errDesc = handle.err; + emit connectionError(errDesc); + } + else + { + emit onConnected(); + } } void conn_event_handler::handleError(){ @@ -40,7 +43,7 @@ return; } -void conn_event_handler::sendMessage(QString message) +void conn_event_handler::sendMessage(const QString& message) { if (isConnected()) { @@ -76,12 +79,11 @@ return; } -void conn_event_handler::handleRecvMessage(QString msg) +void conn_event_handler::handleRecvMessage(const QString &msg) { - return; } -bool conn_event_handler::isConnected() +bool conn_event_handler::isConnected() const { return handle.connected; } Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Mon Jan 26 21:09:18 2009 @@ -3,37 +3,33 @@ #include <QtGui> -extern "C" { - #include "esl.h" - #include "esl_event.h" - #include "esl_threadmutex.h" - #include "esl_config.h" -} - +#include "esl.h" +#include "esl_event.h" +#include "esl_threadmutex.h" +#include "esl_config.h" class conn_event_handler : public QObject { - Q_OBJECT public: conn_event_handler(); ~conn_event_handler(); - void getConnected(QString, int, QString); - void getDisconnected(void); - bool isConnected(void); + void Connect(const QString&, int, const QString&); + void Disconnect(void); + bool isConnected(void) const; private slots: void handleError(); void readClient(void); public slots: - void sendMessage(QString); + void sendMessage(const QString&); private: - void handleRecvMessage(QString); + void handleRecvMessage(const QString&); esl_handle_t handle; signals: - void connectionError(QString); - void gotConnected(void); - void messageSignal(QString); + void connectionError(const QString&); + void onConnected(void); + void messageSignal(const QString&); }; #endif // CONN_EVENT_HANDLER_H Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp Mon Jan 26 21:09:18 2009 @@ -25,21 +25,21 @@ delete ui; } -void FSGui::error(QString msg){ +void FSGui::error(const QString &msg){ ui->statusBar->showMessage(msg); } -void FSGui::connectSlot(QString hostname, QString port, QString password){ +void FSGui::connectSlot(const QString& hostname, const QString& port, const QString& password){ socket = new conn_event_handler(); connect( socket , SIGNAL( connectionError(QString) ), this, SLOT( error(QString) ) ); - connect(socket , SIGNAL( gotConnected() ), + connect(socket , SIGNAL( onConnected() ), this, SLOT(connectionSuccessful())); connect(socket , SIGNAL( messageSignal(QString) ), this, SLOT( messageSlot(QString) )); connect(this, SIGNAL(btnSendClickedSignal(QString)), socket, SLOT(sendMessage(QString))); - socket->getConnected(hostname, port.toInt(), password); + socket->Connect(hostname, port.toInt(), password); ui->btnSend->setEnabled(true); } @@ -53,7 +53,7 @@ ui->lineCmd->clear(); } -void FSGui::lineCmdEditedSlot(QString text) +void FSGui::lineCmdEditedSlot(const QString& text) { if (socket->isConnected() && !text.isEmpty()) { @@ -65,7 +65,7 @@ } } -void FSGui::messageSlot(QString msg) +void FSGui::messageSlot(const QString& msg) { if (!msg.isEmpty()) { Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h Mon Jan 26 21:09:18 2009 @@ -4,7 +4,6 @@ #include <QtGui/QMainWindow> #include "conn_event_handler.h" - namespace Ui { class FSGuiClass; @@ -25,15 +24,15 @@ QLabel * statusBarLabel; private slots: - void error(QString); + void error(const QString&); void connectionSuccessful(void); - void connectSlot(QString, QString, QString); + void connectSlot(const QString&, const QString&, const QString&); void btnSendClickedSlot(); - void lineCmdEditedSlot(QString); - void messageSlot(QString); + void lineCmdEditedSlot(const QString&); + void messageSlot(const QString&); signals: - void btnSendClickedSignal(QString); + void btnSendClickedSignal(const QString&); };

1 0