January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11510 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 12:04:52 2009 New Revision: 11510 Log: skypiax: if it do not find the X server or the Skype client at startup, exit with an error Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Tue Jan 27 12:04:52 2009 @@ -28,7 +28,7 @@ int option_debug = 100; switch_endpoint_interface_t *skypiax_endpoint_interface; switch_memory_pool_t *skypiax_module_pool = NULL; -int running = 1; +int running = 0; SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, globals.context); @@ -880,10 +880,17 @@ skypiax_skypeaudio_init(&globals.SKYPIAX_INTERFACES[interface_id]); - while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0) { + i=0; + while (globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected == 0 && running && i < 6000) { // 60sec switch_sleep(1000); + i++; } - NOTICA("STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + if(globals.SKYPIAX_INTERFACES[interface_id].SkypiaxHandles.api_connected){ + NOTICA("STARTED interface_id=%d\n", SKYPIAX_P_LOG, interface_id); + } else { + ERRORA("interface_id=%d has not been started\n", SKYPIAX_P_LOG, interface_id); + break; + } } else { ERRORA("interface id %d is higher than SKYPIAX_MAX_INTERFACES (%d)\n", @@ -926,6 +933,8 @@ memset(&globals, '\0', sizeof(globals)); + running = 1; + load_config(); *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -936,8 +945,11 @@ skypiax_endpoint_interface->state_handler = &skypiax_state_handlers; DEBUGA_SKYPE("EXITING FUNC!\n", SKYPIAX_P_LOG); + if(running) /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; + else + return SWITCH_STATUS_FALSE; } SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown) Modified: freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/skypiax_protocol.c Tue Jan 27 12:04:52 2009 @@ -933,6 +933,7 @@ if (!disp) { ERRORA("Cannot open X Display '%s', exiting skype thread\n", SKYPIAX_P_LOG, tech_pvt->X11_display); + running=0; return NULL; } else { DEBUGA_SKYPE("X Display '%s' opened\n", SKYPIAX_P_LOG, tech_pvt->X11_display); @@ -963,6 +964,7 @@ ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG); DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; return NULL; } @@ -972,6 +974,7 @@ ("Sending message failed - probably Skype crashed. Please run/restart Skype manually and launch Skypiax again\n", SKYPIAX_P_LOG); DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; return NULL; } @@ -1019,9 +1022,11 @@ ERRORA ("Skype is not running, maybe crashed. Please run/restart Skype and relaunch Skypiax\n", SKYPIAX_P_LOG); + running=0; return NULL; } DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); + running=0; return NULL; }

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] r11504 - in freeswitch/branches/gmaruzz: . build conf debian docs dtd freeswitch.xcodeproj htdocs libs patches scripts src support-d w32
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 06:45:27 2009 New Revision: 11504 Log: preparing for standalone module Removed: freeswitch/branches/gmaruzz/Freeswitch.2005.unsupported.sln freeswitch/branches/gmaruzz/Freeswitch.2008.express.sln freeswitch/branches/gmaruzz/Freeswitch.2008.sln freeswitch/branches/gmaruzz/INSTALL freeswitch/branches/gmaruzz/Makefile.am freeswitch/branches/gmaruzz/acinclude.m4 freeswitch/branches/gmaruzz/bootstrap.sh freeswitch/branches/gmaruzz/build/ freeswitch/branches/gmaruzz/conf/ freeswitch/branches/gmaruzz/configure.in freeswitch/branches/gmaruzz/debian/ freeswitch/branches/gmaruzz/docs/ freeswitch/branches/gmaruzz/dtd/ freeswitch/branches/gmaruzz/freeswitch.spec freeswitch/branches/gmaruzz/freeswitch.xcodeproj/ freeswitch/branches/gmaruzz/htdocs/ freeswitch/branches/gmaruzz/libs/ freeswitch/branches/gmaruzz/modules.conf freeswitch/branches/gmaruzz/patches/ freeswitch/branches/gmaruzz/scripts/ freeswitch/branches/gmaruzz/src/ freeswitch/branches/gmaruzz/support-d/ freeswitch/branches/gmaruzz/w32/

1 0

[commit] r11503 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 27 Jan '09

27 Jan '09

Author: gmaruzz Date: Tue Jan 27 06:32:01 2009 New Revision: 11503 Log: skypiax: preparing for standalone module Added: freeswitch/branches/gmaruzz/mod_skypiax/ - copied from r11502, /freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/

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