January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

26 Jan '09

Author: andrew Date: Mon Jan 26 17:31:40 2009 New Revision: 11495 Log: Allow the event encoding strategy to be configurable; choices are string or binary Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/ei_helpers.c freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml 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 17:31:40 2009 @@ -41,18 +41,19 @@ * */ #define put8(s,n) do { \ - (s)[0] = (char)((n) & 0xff); \ - (s) += 1; \ + (s)[0] = (char)((n) & 0xff); \ + (s) += 1; \ } while (0) #define put32be(s,n) do { \ - (s)[0] = ((n) >> 24) & 0xff; \ - (s)[1] = ((n) >> 16) & 0xff; \ - (s)[2] = ((n) >> 8) & 0xff; \ - (s)[3] = (n) & 0xff; \ - (s) += 4; \ + (s)[0] = ((n) >> 24) & 0xff; \ + (s)[1] = ((n) >> 16) & 0xff; \ + (s)[2] = ((n) >> 8) & 0xff; \ + (s)[3] = (n) & 0xff; \ + (s) += 4; \ } while (0) + void ei_link(listener_t *listener, erlang_pid *from, erlang_pid *to) { char msgbuf[2048]; char *s; @@ -92,21 +93,21 @@ ei_x_encode_list_header(ebuf, i+1); if (uuid) { - ei_x_encode_string(ebuf, switch_event_get_header(event, "unique-id")); + _ei_x_encode_string(ebuf, switch_event_get_header(event, "unique-id")); } else { ei_x_encode_atom(ebuf, "undefined"); } for (hp = event->headers; hp; hp = hp->next) { ei_x_encode_tuple_header(ebuf, 2); - ei_x_encode_string(ebuf, hp->name); - ei_x_encode_string(ebuf, hp->value); + _ei_x_encode_string(ebuf, hp->name); + _ei_x_encode_string(ebuf, hp->value); } if (event->body) { ei_x_encode_tuple_header(ebuf, 2); - ei_x_encode_string(ebuf, "body"); - ei_x_encode_string(ebuf, event->body); + _ei_x_encode_string(ebuf, "body"); + _ei_x_encode_string(ebuf, event->body); } ei_x_encode_empty_list(ebuf); Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/erlang_event.conf.xml Mon Jan 26 17:31:40 2009 @@ -3,7 +3,10 @@ <param name="listen-ip" value="127.0.0.1"/> <param name="listen-port" value="8031"/> <param name="cookie" value="ClueCon"/> - <param name="shortname" value="true"/> -  + <param name="shortname" value="true"/> +  +  +  +  </settings> </configuration> 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 17:31:40 2009 @@ -101,8 +101,8 @@ else ei_x_encode_atom(&ebuf, "bgerror"); - ei_x_encode_string(&ebuf, acs->uuid_str); - ei_x_encode_string(&ebuf, reply); + _ei_x_encode_string(&ebuf, acs->uuid_str); + _ei_x_encode_string(&ebuf, reply); switch_mutex_lock(acs->listener->sock_mutex); ei_send(acs->listener->sockfd, &acs->pid, ebuf.buff, ebuf.index); @@ -129,7 +129,7 @@ ei_x_encode_atom(&rbuf, "error"); } - ei_x_encode_string(&rbuf, reply); + _ei_x_encode_string(&rbuf, reply); switch_mutex_lock(acs->listener->sock_mutex); @@ -360,7 +360,7 @@ ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "ok"); - ei_x_encode_string(rbuf, acs->uuid_str); + _ei_x_encode_string(rbuf, acs->uuid_str); } return SWITCH_STATUS_SUCCESS; } 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 17:31:40 2009 @@ -380,10 +380,10 @@ ei_x_encode_tuple_header(&buf, 7); ei_x_encode_atom(&buf, "fetch"); ei_x_encode_atom(&buf, sectionstr); - ei_x_encode_string(&buf, tag_name ? tag_name : "undefined"); - ei_x_encode_string(&buf, key_name ? key_name : "undefined"); - ei_x_encode_string(&buf, key_value ? key_value : "undefined"); - ei_x_encode_string(&buf, uuid_str); + _ei_x_encode_string(&buf, tag_name ? tag_name : "undefined"); + _ei_x_encode_string(&buf, key_name ? key_name : "undefined"); + _ei_x_encode_string(&buf, key_value ? key_value : "undefined"); + _ei_x_encode_string(&buf, uuid_str); ei_encode_switch_event_headers(&buf, params); /*switch_core_hash_insert(ptr->reply_hash, uuid_str, );*/ @@ -840,6 +840,7 @@ memset(&prefs, 0, sizeof(prefs)); prefs.shortname = SWITCH_TRUE; + prefs.encoding = ERLANG_STRING; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); @@ -859,6 +860,14 @@ set_pref_nodename(val); } else if (!strcmp(var, "shortname")) { prefs.shortname = switch_true(val); + } else if (!strcmp(var, "encoding")) { + if (!strcasecmp(val, "string")) { + prefs.encoding = ERLANG_STRING; + } else if (!strcasecmp(val, "binary")) { + prefs.encoding = ERLANG_BINARY; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid encoding strategy '%s' specified\n", val); + } } else if (!strcasecmp(var, "apply-inbound-acl")) { if (prefs.acl_count < MAX_ACL) { prefs.acl[prefs.acl_count++] = strdup(val); 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 17:31:40 2009 @@ -44,6 +44,11 @@ ERLANG_REG_PROCESS } process_type; +typedef enum { + ERLANG_STRING = 0, + ERLANG_BINARY +} erlang_encoding_t; + struct erlang_process { process_type type; char *reg_name; @@ -163,6 +168,7 @@ char *acl[MAX_ACL]; uint32_t acl_count; uint32_t id; + erlang_encoding_t encoding; }; typedef struct prefs_struct prefs_t; @@ -197,6 +203,16 @@ 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") +/* crazy macro for toggling encoding type */ +#define _ei_x_encode_string(buf, string) switch (prefs.encoding) { \ + case ERLANG_BINARY: \ + ei_x_encode_binary(buf, string, strlen(string)); \ + break; \ + default: \ + ei_x_encode_string(buf, string); \ + break; \ +} + /* mod_erlang_event.c */ session_elem_t* attach_call_to_registered_process(listener_t* listener, char* reg_name, switch_core_session_t *session); session_elem_t* attach_call_to_spawned_process(listener_t* listener, char *module, char *function, switch_core_session_t *session);

1 0

[commit] r11494 - freeswitch/trunk/scripts/contrib/jmesquita
by FreeSWITCH SVN 26 Jan '09

26 Jan '09

Author: intralanman Date: Mon Jan 26 15:54:37 2009 New Revision: 11494 Log: adding contrib dir for jmesquita Added: freeswitch/trunk/scripts/contrib/jmesquita/

1 0

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

26 Jan '09

Author: andrew Date: Mon Jan 26 14:50:17 2009 New Revision: 11493 Log: Fix a couple minor bugs 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 14:50:17 2009 @@ -334,7 +334,7 @@ switch_mutex_lock(listener->session_mutex); for (s = listener->session_list; s; s = s->next) { - if (s->process.type == ERLANG_PID && ei_compare_pids(pid, &s->process.pid)) { + if (s->process.type == ERLANG_PID && !ei_compare_pids(pid, &s->process.pid)) { break; } } @@ -1000,7 +1000,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got pid!\n"); - ei_link(listener, pid, ei_self(listener->ec)); + ei_link(listener, ei_self(listener->ec), pid); session_element->process.type = ERLANG_PID; memcpy(&session_element->process.pid, pid, sizeof(erlang_pid));

1 0

[commit] r11492 - in freeswitch/trunk/libs/esl: . src
by FreeSWITCH SVN 26 Jan '09

26 Jan '09

Author: anthm Date: Mon Jan 26 12:10:19 2009 New Revision: 11492 Log: make err more obvious Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/libs/esl/src/esl.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Mon Jan 26 12:10:19 2009 @@ -619,7 +619,7 @@ } if (esl_connect(&handle, profile->host, profile->port, profile->pass)) { - esl_global_set_default_logger(3); + esl_global_set_default_logger(7); esl_log(ESL_LOG_ERROR, "Error Connecting [%s]\n", handle.err); return -1; } Modified: freeswitch/trunk/libs/esl/src/esl.c ============================================================================== --- freeswitch/trunk/libs/esl/src/esl.c (original) +++ freeswitch/trunk/libs/esl/src/esl.c Mon Jan 26 12:10:19 2009 @@ -648,7 +648,7 @@ if (esl_recv(handle)) { - snprintf(handle->err, sizeof(handle->err), "Connection Error"); + snprintf(handle->err, sizeof(handle->err), "Authentication Error"); goto fail; } @@ -656,7 +656,7 @@ hval = esl_event_get_header(handle->last_event, "reply-text"); if (strcasecmp(hval, "+OK accepted")) { - snprintf(handle->err, sizeof(handle->err), "Connection Error"); + snprintf(handle->err, sizeof(handle->err), "Authentication Error"); goto fail; }

1 0

[commit] r11491 - freeswitch/trunk/src
by FreeSWITCH SVN 26 Jan '09

26 Jan '09

Author: anthm Date: Mon Jan 26 12:05:00 2009 New Revision: 11491 Log: bang it all, MODAPP-205 Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Mon Jan 26 12:05:00 2009 @@ -395,7 +395,7 @@ while((rlen = switch_buffer_inuse(fh->pre_buffer))) { blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen); - if (asis) blen /= 2; + if (!asis) blen /= 2; if (fh->channels) blen /= fh->channels; if (fh->file_interface->file_write(fh, fh->pre_buffer_data, &blen) != SWITCH_STATUS_SUCCESS) { break;

1 0