- Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r11501 - freeswitch/trunk/libs/esl/src/include
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: mrene Date: Mon Jan 26 21:07:20 2009 New Revision: 11501 Log: its __cplusplus not _cplusplus Modified: freeswitch/trunk/libs/esl/src/include/esl.h freeswitch/trunk/libs/esl/src/include/esl_config.h freeswitch/trunk/libs/esl/src/include/esl_event.h freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h Modified: freeswitch/trunk/libs/esl/src/include/esl.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl.h Mon Jan 26 21:07:20 2009 @@ -36,9 +36,9 @@ #include <stdarg.h> -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #define esl_copy_string(_x, _y, _z) strncpy(_x, _y, _z - 1) #define esl_set_string(_x, _y) esl_copy_string(_x, _y, sizeof(_x)) @@ -341,9 +341,9 @@ #define esl_recv_timed(_h, _ms) esl_recv_event_timed(_h, _ms, NULL) -#ifdef _cplusplus +#ifdef __cplusplus } -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #endif /* defined(_ESL_H_) */ Modified: freeswitch/trunk/libs/esl/src/include/esl_config.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_config.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_config.h Mon Jan 26 21:07:20 2009 @@ -54,9 +54,9 @@ #include "esl.h" -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #define ESL_URL_SEPARATOR "://" @@ -160,9 +160,9 @@ /** @} */ -#ifdef _cplusplus +#ifdef __cplusplus } -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #endif /* defined(ESL_CONFIG_H) */ Modified: freeswitch/trunk/libs/esl/src/include/esl_event.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_event.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_event.h Mon Jan 26 21:07:20 2009 @@ -36,9 +36,9 @@ #include <esl.h> -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ typedef enum { ESL_STACK_BOTTOM, @@ -272,9 +272,9 @@ ///\} -#ifdef _cplusplus +#ifdef __cplusplus } -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #endif /* defined(ESL_EVENT_H) */ Modified: freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h Mon Jan 26 21:07:20 2009 @@ -23,9 +23,9 @@ #include "esl.h" -#ifdef _cplusplus +#ifdef __cplusplus extern "C" { -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ typedef struct esl_mutex esl_mutex_t; typedef struct esl_thread esl_thread_t; @@ -40,9 +40,9 @@ ESL_DECLARE(esl_status_t) esl_mutex_trylock(esl_mutex_t *mutex); ESL_DECLARE(esl_status_t) esl_mutex_unlock(esl_mutex_t *mutex); -#ifdef _cplusplus +#ifdef __cplusplus } -#endif /* defined(_cplusplus) */ +#endif /* defined(__cplusplus) */ #endif /* defined(_ESL_THREADMUTEX_H) */

1 0

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

27 Jan '09

Author: andrew Date: Mon Jan 26 19:50:12 2009 New Revision: 11500 Log: Ensure events received while a pid session is being created aren't discarded but are queued instead 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.h 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 Mon Jan 26 19:50:12 2009 @@ -487,6 +487,10 @@ sp = listener->session_list; last = NULL; while(sp) { + if (switch_test_flag(sp, LFLAG_WAITING_FOR_PID)) { + break; + } + if (!switch_test_flag(sp, LFLAG_OUTBOUND_INIT)) { status = notify_new_session(listener, sp->session, sp->process); if (status != SWITCH_STATUS_SUCCESS) @@ -494,7 +498,7 @@ switch_set_flag(sp, LFLAG_OUTBOUND_INIT); } /* check event queue for this session */ - if (switch_queue_trypop(sp->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + if (switch_queue_trypop(sp->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_event_t *pevent = (switch_event_t *) pop; /* events from attached sessions are wrapped in a {call_event,<EVT>} tuple @@ -997,6 +1001,12 @@ erlang_pid *pid; erlang_ref ref; + switch_set_flag(session_element, LFLAG_WAITING_FOR_PID); + switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session)); + switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + /* attach the session to the listener */ + add_session_elem_to_listener(listener,session_element); + if (!strcmp(function, "!")) { /* send a message to request a pid */ ei_x_buff rbuf; @@ -1022,6 +1032,7 @@ if (i > 50) { /* half a second timeout */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "timed out!\n"); switch_core_session_rwunlock(session); + remove_session_elem_from_listener(listener,session_element); return NULL; } i++; @@ -1030,16 +1041,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n"); - ei_link(listener, ei_self(listener->ec), pid); - session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid)); switch_set_flag(session_element, LFLAG_SESSION_ALIVE); switch_clear_flag(session_element, LFLAG_OUTBOUND_INIT); - switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, switch_core_session_get_pool(session)); - switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); - /* attach the session to the listener */ - add_session_elem_to_listener(listener,session_element); + switch_clear_flag(session_element, LFLAG_WAITING_FOR_PID); + + ei_link(listener, ei_self(listener->ec), pid); } } return session_element; 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 Mon Jan 26 19:50:12 2009 @@ -35,8 +35,9 @@ #define EI_DEBUG typedef enum { - LFLAG_OUTBOUND_INIT = (1 << 0), /* Erlang peer has been notified of this session */ - LFLAG_SESSION_ALIVE + 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 */ + LFLAG_SESSION_ALIVE = (1 << 2), } session_flag_t; typedef enum {

1 0

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

27 Jan '09

Author: andrew Date: Mon Jan 26 19:13:59 2009 New Revision: 11499 Log: Support sending a message to a registered process to request a pid (when spawning won't cut it) Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c 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 Mon Jan 26 19:13:59 2009 @@ -899,6 +899,7 @@ return 0; } + static listener_t* new_listener(struct ei_cnode_s *ec, int clientfd) { switch_memory_pool_t *listener_pool = NULL; @@ -950,6 +951,7 @@ return listener; } + session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session) { /* create a session list element */ @@ -976,6 +978,7 @@ return session_element; } + session_elem_t* attach_call_to_spawned_process(listener_t* listener, char *module, char *function, switch_core_session_t *session) { /* create a session list element */ @@ -993,8 +996,26 @@ session_element->session = session; erlang_pid *pid; erlang_ref ref; - - ei_spawn(listener->ec, listener->sockfd, &ref, module, function, 0, argv); + + if (!strcmp(function, "!")) { + /* send a message to request a pid */ + ei_x_buff rbuf; + ei_x_new_with_version(&rbuf); + + ei_init_ref(listener->ec, &ref); + ei_x_encode_tuple_header(&rbuf, 3); + ei_x_encode_atom(&rbuf, "new_pid"); + ei_x_encode_ref(&rbuf, &ref); + ei_x_encode_pid(&rbuf, ei_self(listener->ec)); + ei_reg_send(listener->ec, listener->sockfd, module, rbuf.buff, rbuf.index); +#ifdef EI_DEBUG + ei_x_print_reg_msg(&rbuf, module, 1); +#endif + ei_x_free(&rbuf); + } else { + ei_spawn(listener->ec, listener->sockfd, &ref, module, function, 0, argv); + } + ei_hash_ref(&ref, hash); while (!(pid = (erlang_pid *) switch_core_hash_find(listener->spawn_pid_hash, hash))) {

1 0

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

27 Jan '09

Author: mrene Date: Mon Jan 26 19:00:29 2009 New Revision: 11498 Log: Fix build and remove extra delete Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro 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 19:00:29 2009 @@ -8,7 +8,6 @@ conn_event_handler::~conn_event_handler(void){ getDisconnected(); - delete &handle; } void conn_event_handler::getDisconnected(){ Modified: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro ============================================================================== --- freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro (original) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro Mon Jan 26 19:00:29 2009 @@ -9,7 +9,7 @@ conn_event_handler.cpp \ serverlogin.cpp -INCLUDEPATH = ./../../../libs/esl/src/include +INCLUDEPATH += ../../../../libs/esl/src/include HEADERS += fsgui.h \ conn_event_handler.h \ @@ -21,4 +21,4 @@ FORMS += fsgui.ui \ serverlogin.ui -LIBS += -L.. -lesl +LIBS += -L../../../../libs/esl -lesl

1 0

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

27 Jan '09

Author: jmesquita Date: Mon Jan 26 18:48:49 2009 New Revision: 11497 Log: Initial commit of FSGui. It works only for send_recv events and not multithreaded. Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/ 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 freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.ui freeswitch/trunk/scripts/contrib/jmesquita/fsgui/main.cpp freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.cpp freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.h freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.ui Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.cpp Mon Jan 26 18:48:49 2009 @@ -0,0 +1,88 @@ +#include "conn_event_handler.h" + + +conn_event_handler::conn_event_handler() +{ + memset(&handle, 0, sizeof(esl_handle_t)); +} + +conn_event_handler::~conn_event_handler(void){ + getDisconnected(); + delete &handle; +} + +void conn_event_handler::getDisconnected(){ + 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::handleError(){ + return; +} + +void conn_event_handler::readClient() +{ + return; +} + +void conn_event_handler::sendMessage(QString message) +{ + if (isConnected()) + { + esl_status_t status = esl_send_recv(&handle, message.toAscii()); + QString reply; + if (status != ESL_FAIL) + { + if (message.contains("nolog") || + message.contains("event") || + message.contains("noevent") || + message.contains("nixevent") || + message.contains("log") || + message.contains("nolog") || + message.contains("filter") + ) + { + reply = handle.last_sr_reply; + reply+="\n"; + } + else if (message.contains("exit")) + { + emit connectionError("Disconnected!"); + handle.connected = ESL_FALSE; + reply = "See you!\n"; + } + else + { + reply = handle.last_sr_event->body; + } + } + emit messageSignal(reply); + } + return; +} + +void conn_event_handler::handleRecvMessage(QString msg) +{ + return; +} + +bool conn_event_handler::isConnected() +{ + return handle.connected; +} Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/conn_event_handler.h Mon Jan 26 18:48:49 2009 @@ -0,0 +1,39 @@ +#ifndef CONN_EVENT_HANDLER_H +#define CONN_EVENT_HANDLER_H + +#include <QtGui> + +extern "C" { + #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); +private slots: + void handleError(); + void readClient(void); +public slots: + void sendMessage(QString); +private: + void handleRecvMessage(QString); + esl_handle_t handle; +signals: + void connectionError(QString); + void gotConnected(void); + void messageSignal(QString); +}; + +#endif // CONN_EVENT_HANDLER_H Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.cpp Mon Jan 26 18:48:49 2009 @@ -0,0 +1,80 @@ +#include "fsgui.h" +#include "ui_fsgui.h" +#include "serverlogin.h" + +FSGui::FSGui(QWidget *parent) + : QMainWindow(parent), ui(new Ui::FSGuiClass) +{ + ui->setupUi(this); + serverLogin = new ServerLogin(this); + serverLogin->show(); + + connect( serverLogin , SIGNAL(acceptedSignal(QString, QString, QString)), + this, SLOT(connectSlot(QString, QString, QString)) ); + + connect(ui->btnSend, SIGNAL(clicked()), this, SLOT(btnSendClickedSlot())); + connect(ui->lineCmd, SIGNAL(textChanged(QString)), this, SLOT(lineCmdEditedSlot(QString))); + connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close())); + connect(ui->actionConnect, SIGNAL(triggered()), serverLogin, SLOT(show())); + +} + +FSGui::~FSGui() +{ + delete socket; + delete ui; +} + +void FSGui::error(QString msg){ + ui->statusBar->showMessage(msg); +} + +void FSGui::connectSlot(QString hostname, QString port, QString password){ + socket = new conn_event_handler(); + connect( socket , SIGNAL( connectionError(QString) ), + this, SLOT( error(QString) ) ); + connect(socket , SIGNAL( gotConnected() ), + 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); + ui->btnSend->setEnabled(true); +} + +void FSGui::connectionSuccessful(void){ + ui->statusBar->showMessage(tr("Connected!")); +} + +void FSGui::btnSendClickedSlot() +{ + emit btnSendClickedSignal(ui->lineCmd->text()); + ui->lineCmd->clear(); +} + +void FSGui::lineCmdEditedSlot(QString text) +{ + if (socket->isConnected() && !text.isEmpty()) + { + ui->btnSend->setEnabled(true); + } + else + { + ui->btnSend->setEnabled(false); + } +} + +void FSGui::messageSlot(QString msg) +{ + if (!msg.isEmpty()) + { + QTime timestamp = QTime::currentTime(); + QStringList msgList = msg.split("\n", QString::SkipEmptyParts); + for (int i = 0 ; i < msgList.size() ; ++i) + { + QString message = timestamp.toString("hh:mm:ss.zzz") + " : " + msgList[i] + "\n"; + ui->textConsole->insertPlainText(message); + } + } +} Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.h Mon Jan 26 18:48:49 2009 @@ -0,0 +1,40 @@ +#ifndef FSGUI_H +#define FSGUI_H + +#include <QtGui/QMainWindow> +#include "conn_event_handler.h" + + +namespace Ui +{ + class FSGuiClass; +} + +class FSGui : public QMainWindow +{ + Q_OBJECT + +public: + FSGui(QWidget *parent = 0); + ~FSGui(); + +private: + Ui::FSGuiClass *ui; + conn_event_handler* socket; + QDialog * serverLogin; + QLabel * statusBarLabel; + +private slots: + void error(QString); + void connectionSuccessful(void); + void connectSlot(QString, QString, QString); + void btnSendClickedSlot(); + void lineCmdEditedSlot(QString); + void messageSlot(QString); + +signals: + void btnSendClickedSignal(QString); + +}; + +#endif // FSGUI_H Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.pro Mon Jan 26 18:48:49 2009 @@ -0,0 +1,24 @@ +# ------------------------------------------------- +# Project created by QtCreator 2009-01-18T13:57:52 +# ------------------------------------------------- +TARGET = fs_gui +TEMPLATE = app + +SOURCES += main.cpp \ + fsgui.cpp \ + conn_event_handler.cpp \ + serverlogin.cpp + +INCLUDEPATH = ./../../../libs/esl/src/include + +HEADERS += fsgui.h \ + conn_event_handler.h \ + serverlogin.h \ + esl.h \ + esl_threadmutex.h \ + esl_config.h + +FORMS += fsgui.ui \ + serverlogin.ui + +LIBS += -L.. -lesl Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.ui ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/fsgui.ui Mon Jan 26 18:48:49 2009 @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>FSGuiClass</class> + <widget class="QMainWindow" name="FSGuiClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>400</height> + </rect> + </property> + <property name="windowTitle"> + <string>FSGui - The console for humans</string> + </property> + <widget class="QWidget" name="centralWidget"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="2"> + <widget class="QTextEdit" name="textConsole"> + <property name="undoRedoEnabled"> + <bool>false</bool> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="lineCmd"/> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="btnSend"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Send</string> + </property> + <property name="shortcut"> + <string>Return</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QMenuBar" name="menuBar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>600</width> + <height>22</height> + </rect> + </property> + <widget class="QMenu" name="menuFile"> + <property name="title"> + <string>&File</string> + </property> + <addaction name="actionConnect"/> + <addaction name="separator"/> + <addaction name="actionQuit"/> + </widget> + <widget class="QMenu" name="menuHelp"> + <property name="title"> + <string>&Help</string> + </property> + <addaction name="actionAbout"/> + </widget> + <addaction name="menuFile"/> + <addaction name="menuHelp"/> + </widget> + <widget class="QStatusBar" name="statusBar"/> + <action name="actionQuit"> + <property name="text"> + <string>&Quit</string> + </property> + </action> + <action name="actionAbout"> + <property name="text"> + <string>&About</string> + </property> + </action> + <action name="actionConnect"> + <property name="text"> + <string>&Connect</string> + </property> + <property name="shortcut"> + <string>Ctrl+C</string> + </property> + </action> + </widget> + <layoutdefault spacing="6" margin="11"/> + <tabstops> + <tabstop>lineCmd</tabstop> + <tabstop>textConsole</tabstop> + <tabstop>btnSend</tabstop> + </tabstops> + <resources/> + <connections/> +</ui> Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/main.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/main.cpp Mon Jan 26 18:48:49 2009 @@ -0,0 +1,10 @@ +#include <QtGui/QApplication> +#include "fsgui.h" + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + FSGui w; + w.show(); + return a.exec(); +} Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.cpp Mon Jan 26 18:48:49 2009 @@ -0,0 +1,33 @@ +#include "serverlogin.h" +#include "ui_serverlogin.h" + +ServerLogin::ServerLogin(QWidget *parent) : + QDialog(parent), + m_ui(new Ui::ServerLogin) +{ + m_ui->setupUi(this); + this->setModal(true); + + connect (this, SIGNAL(accepted()), this, SLOT(acceptedSlot())); +} + +ServerLogin::~ServerLogin() +{ + delete m_ui; +} + +void ServerLogin::changeEvent(QEvent *e) +{ + switch (e->type()) { + case QEvent::LanguageChange: + m_ui->retranslateUi(this); + break; + default: + break; + } +} + +void ServerLogin::acceptedSlot() +{ + emit acceptedSignal(m_ui->editHostname->text(), m_ui->editPort->text(), m_ui->editPassword->text()); +} Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.h ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.h Mon Jan 26 18:48:49 2009 @@ -0,0 +1,30 @@ +#ifndef SERVERLOGIN_H +#define SERVERLOGIN_H + +#include <QtGui/QDialog> + +namespace Ui { + class ServerLogin; +} + +class ServerLogin : public QDialog { + Q_OBJECT + Q_DISABLE_COPY(ServerLogin) +public: + explicit ServerLogin(QWidget *parent = 0); + virtual ~ServerLogin(); + +protected: + virtual void changeEvent(QEvent *e); + +private: + Ui::ServerLogin *m_ui; + +private slots: + void acceptedSlot(); + +signals: + void acceptedSignal(QString, QString, QString); +}; + +#endif // SERVERLOGIN_H Added: freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.ui ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/jmesquita/fsgui/serverlogin.ui Mon Jan 26 18:48:49 2009 @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ServerLogin</class> + <widget class="QDialog" name="ServerLogin"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>218</width> + <height>148</height> + </rect> + </property> + <property name="windowTitle"> + <string>Server Login</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QFormLayout" name="formLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Hostname:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLineEdit" name="editHostname"> + <property name="maxLength"> + <number>32767</number> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Port:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="editPort"> + <property name="inputMask"> + <string>999999; </string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Password:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLineEdit" name="editPassword"/> + </item> + </layout> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + <property name="centerButtons"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <tabstops> + <tabstop>buttonBox</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>ServerLogin</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>ServerLogin</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui>

1 0

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

27 Jan '09

Author: andrew Date: Mon Jan 26 18:25:01 2009 New Revision: 11496 Log: Allow certain tuple elements to be binaries or strings, to reduce conversion requirements on the erlang side Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c 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 freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c Mon Jan 26 18:25:01 2009 @@ -272,6 +272,28 @@ } +int ei_decode_string_or_binary(char *buf, int *index, int maxlen, char *dst) { + int type, size, res; + long len; + + ei_get_type(buf, index, &type, &size); + + if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) { + return -1; + } else if (size > maxlen) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Requested decoding of %s with size %d into a buffer of size %d\n", type == ERL_BINARY_EXT ? "binary" : "string", size, maxlen); + return -1; + } else if (type == ERL_BINARY_EXT) { + res = ei_decode_binary(buf, index, dst, &len); + dst[len] = '\0'; /* binaries aren't null terminated */ + } else { + res = ei_decode_string(buf, index, dst); + } + + return res; +} + + switch_status_t initialise_ei(struct ei_cnode_s *ec) { switch_status_t rv; 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 Mon Jan 26 18:25:01 2009 @@ -164,12 +164,11 @@ { char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; - if (ei_decode_string(buf->buff, &buf->index, uuid_str)) { + if (ei_decode_string_or_binary(buf->buff, &buf->index, SWITCH_UUID_FORMATTED_LENGTH, uuid_str)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); ei_x_encode_atom(rbuf, "badarg"); - } - else { + } else { ei_x_buff *nbuf = switch_core_alloc(listener->pool, sizeof(nbuf)); nbuf->buff = switch_core_alloc(listener->pool, buf->buffsz); memcpy(nbuf->buff, buf->buff, buf->buffsz); @@ -414,10 +413,10 @@ static switch_status_t handle_msg_sendmsg(listener_t *listener, int arity, ei_x_buff *buf, ei_x_buff *rbuf) { - char uuid[37]; + char uuid[SWITCH_UUID_FORMATTED_LENGTH + 1]; int headerlength; - if (ei_decode_string(buf->buff, &buf->index, uuid) || + if (ei_decode_string_or_binary(buf->buff, &buf->index, SWITCH_UUID_FORMATTED_LENGTH, uuid) || ei_decode_list_header(buf->buff, &buf->index, &headerlength)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); @@ -527,7 +526,7 @@ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; if (arity != 3 || - ei_decode_string(buf->buff, &buf->index, uuid_str) || + ei_decode_string_or_binary(buf->buff, &buf->index, SWITCH_UUID_FORMATTED_LENGTH, uuid_str) || ei_decode_atom(buf->buff, &buf->index, reg_name)) { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); 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 Mon Jan 26 18:25:01 2009 @@ -408,12 +408,12 @@ ei_get_type(rep->buff, &rep->index, &type, &size); - if (type != ERL_STRING_EXT) /* XXX no unicode or character codes > 255 */ + if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ return NULL; char *xmlstr = switch_core_alloc(ptr->listener->pool, size + 1); - ei_decode_string(rep->buff, &rep->index, xmlstr); + ei_decode_string_or_binary(rep->buff, &rep->index, size, xmlstr); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got data %s after %d milliseconds!\n", xmlstr, i*10); 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 Mon Jan 26 18:25:01 2009 @@ -200,6 +200,7 @@ int ei_sendto(ei_cnode *ec, int fd, struct erlang_process *process, ei_x_buff *buf); void ei_hash_ref(erlang_ref *ref, char *output); int ei_compare_pids(erlang_pid *pid1, erlang_pid *pid2); +int ei_decode_string_or_binary(char *buf, int *index, int maxlen, char *dst); switch_status_t initialise_ei(struct ei_cnode_s *ec); #define ei_encode_switch_event(_b, _e) ei_encode_switch_event_tag(_b, _e, "event")

1 0