kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 01:26:58 +00:00
Code Issues Projects Releases Wiki Activity

swigall

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14159 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West
2009-07-08 16:35:22 +00:00
parent b75a25ee5f
commit b76bb2d5a3
22 changed files with 160 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/esl/src/esl_oop.cpp
View File

@@ -1,7 +1,7 @@
#include <esl.h>
#include <esl_oop.h>
#define connection_construct_common() memset(&handle, 0, sizeof(handle)); last_event_obj = NULL
#define connection_construct_common() memset(&handle, 0, sizeof(handle))
#define event_construct_common() event = NULL; serialized_string = NULL; mine = 0; hp = NULL
void eslSetLogLevel(int level)
@@ -182,39 +182,27 @@ int ESLconnection::sendEvent(ESLevent *send_me)
ESLevent *ESLconnection::recvEvent()
{
if (last_event_obj) {
delete last_event_obj;
}
if (esl_recv_event(&handle, 1, NULL) == ESL_SUCCESS) {
esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
if (e) {
esl_event_t *event;
esl_event_dup(&event, e);
last_event_obj = new ESLevent(event, 1);
return last_event_obj;
return new ESLevent(event, 1);
}
}
last_event_obj = new ESLevent("server_disconnected");
return last_event_obj;
return new ESLevent("server_disconnected");
}
ESLevent *ESLconnection::recvEventTimed(int ms)
{
if (last_event_obj) {
delete last_event_obj;
last_event_obj = NULL;
}
if (esl_recv_event_timed(&handle, ms, 1, NULL) == ESL_SUCCESS) {
esl_event_t *e = handle.last_ievent ? handle.last_ievent : handle.last_event;
if (e) {
esl_event_t *event;
esl_event_dup(&event, e);
last_event_obj = new ESLevent(event, 1);
return last_event_obj;
return new ESLevent(event, 1);
}
}

1
libs/esl/src/include/esl_oop.h
View File

@@ -71,7 +71,6 @@ class ESLevent {
class ESLconnection {
private:
esl_handle_t handle;
ESLevent *last_event_obj;
public:
ESLconnection(const char *host, const char *port, const char *password);
ESLconnection(int socket);