ESL-19

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14476 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/esl/src/esl_oop.cpp b/libs/esl/src/esl_oop.cpp
index 0aef159838ebbba85589fcce21ba5e54086db42c..f33f5d4d7e7582b6985e5267aef898d7ea9504bb 100644 (file)
--- a/libs/esl/src/esl_oop.cpp
+++ b/libs/esl/src/esl_oop.cpp
@@ -76,6 +76,7 @@ ESLevent *ESLconnection::api(const char *cmd, const char *arg)
 {
        size_t len;
        char *cmd_buf;
+       ESLevent *event;
        
        if (!cmd) {
                return NULL;
@@ -90,21 +91,17 @@ ESLevent *ESLconnection::api(const char *cmd, const char *arg)
        *(cmd_buf + (len)) = '\0';
 
 
-       if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
-               esl_event_t *event;
-               esl_event_dup(&event, handle.last_sr_event);
-               return new ESLevent(event, 1);
-       }
-       
+       event = sendRecv(cmd_buf);
        free(cmd_buf);
 
-       return NULL;
+       return event;
 }
 
 ESLevent *ESLconnection::bgapi(const char *cmd, const char *arg)
 {
        size_t len;
        char *cmd_buf;
+       ESLevent *event;
        
        if (!cmd) {
                return NULL;
@@ -118,15 +115,10 @@ ESLevent *ESLconnection::bgapi(const char *cmd, const char *arg)
        snprintf(cmd_buf, len, "bgapi %s %s", cmd, arg ? arg : "");
        *(cmd_buf + (len)) = '\0';
 
-       if (esl_send_recv(&handle, cmd_buf) == ESL_SUCCESS) {
-               esl_event_t *event;
-               esl_event_dup(&event, handle.last_sr_event);
-               return new ESLevent(event, 1);
-       }
-
+       event = sendRecv(cmd_buf);
        free(cmd_buf);
        
-       return NULL;
+       return event;
 }
 
 ESLevent *ESLconnection::getInfo()