<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: e96acac3c803d00d5fe0802dfa1e17865290e50e (commit)
from: 646ad887d7d91388e68330374ab1cc7d1632352b (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Anthony Minessale
comments:
add optional job-uuid param to bgapi in oop mod
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/java/esl_wrap.cpp b/libs/esl/java/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index d508aa2..9a764dd 100644</span>
<span style="color: #A00000">--- a/libs/esl/java/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/java/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -790,11 +790,12 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1api(JNIEn</span>
}
<span style="color: #A00000">-SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1bgapi(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) {</span>
<span style="color: #00A000">+SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1bgapi(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) {</span>
jlong jresult = 0 ;
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
(void)jenv;
<span style="color: #800080; font-weight: bold">@@ -811,10 +812,16 @@ SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1bgapi(JNI</span>
arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
if (!arg3) return 0;
}
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ arg4 = 0;</span>
<span style="color: #00A000">+ if (jarg4) {</span>
<span style="color: #00A000">+ arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0);</span>
<span style="color: #00A000">+ if (!arg4) return 0;</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
*(ESLevent **)&jresult = result;
if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
<span style="color: #00A000">+ if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4);</span>
return jresult;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/java/org/freeswitch/esl/ESLconnection.java b/libs/esl/java/org/freeswitch/esl/ESLconnection.java</span>
<span style="color: #000080; font-weight: bold">index 6dbc377..e20509b 100644</span>
<span style="color: #A00000">--- a/libs/esl/java/org/freeswitch/esl/ESLconnection.java</span>
<span style="color: #00A000">+++ b/libs/esl/java/org/freeswitch/esl/ESLconnection.java</span>
<span style="color: #800080; font-weight: bold">@@ -72,8 +72,8 @@ public class ESLconnection {</span>
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
<span style="color: #A00000">- public ESLevent bgapi(String cmd, String arg) {</span>
<span style="color: #A00000">- long cPtr = eslJNI.ESLconnection_bgapi(swigCPtr, this, cmd, arg);</span>
<span style="color: #00A000">+ public ESLevent bgapi(String cmd, String arg, String job_uuid) {</span>
<span style="color: #00A000">+ long cPtr = eslJNI.ESLconnection_bgapi(swigCPtr, this, cmd, arg, job_uuid);</span>
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/java/org/freeswitch/esl/eslJNI.java b/libs/esl/java/org/freeswitch/esl/eslJNI.java</span>
<span style="color: #000080; font-weight: bold">index c08ee2f..e6e576f 100644</span>
<span style="color: #A00000">--- a/libs/esl/java/org/freeswitch/esl/eslJNI.java</span>
<span style="color: #00A000">+++ b/libs/esl/java/org/freeswitch/esl/eslJNI.java</span>
<span style="color: #800080; font-weight: bold">@@ -39,7 +39,7 @@ class eslJNI {</span>
public final static native int ESLconnection_send(long jarg1, ESLconnection jarg1_, String jarg2);
public final static native long ESLconnection_sendRecv(long jarg1, ESLconnection jarg1_, String jarg2);
public final static native long ESLconnection_api(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);
<span style="color: #A00000">- public final static native long ESLconnection_bgapi(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);</span>
<span style="color: #00A000">+ public final static native long ESLconnection_bgapi(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4);</span>
public final static native long ESLconnection_sendEvent(long jarg1, ESLconnection jarg1_, long jarg2, ESLevent jarg2_);
public final static native long ESLconnection_recvEvent(long jarg1, ESLconnection jarg1_);
public final static native long ESLconnection_recvEventTimed(long jarg1, ESLconnection jarg1_, int jarg2);
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/lua/esl_wrap.cpp b/libs/esl/lua/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index bcdb11d..25fceb7 100644</span>
<span style="color: #A00000">--- a/libs/esl/lua/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/lua/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -2498,12 +2498,14 @@ static int _wrap_ESLconnection_bgapi(lua_State* L) {</span>
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
<span style="color: #A00000">- SWIG_check_num_args("bgapi",2,3)</span>
<span style="color: #00A000">+ SWIG_check_num_args("bgapi",2,4)</span>
if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("bgapi",1,"ESLconnection *");
if(!lua_isstring(L,2)) SWIG_fail_arg("bgapi",2,"char const *");
if(lua_gettop(L)>=3 && !lua_isstring(L,3)) SWIG_fail_arg("bgapi",3,"char const *");
<span style="color: #00A000">+ if(lua_gettop(L)>=4 && !lua_isstring(L,4)) SWIG_fail_arg("bgapi",4,"char const *");</span>
if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_ESLconnection,0))){
SWIG_fail_ptr("ESLconnection_bgapi",1,SWIGTYPE_p_ESLconnection);
<span style="color: #800080; font-weight: bold">@@ -2513,7 +2515,10 @@ static int _wrap_ESLconnection_bgapi(lua_State* L) {</span>
if(lua_gettop(L)>=3){
arg3 = (char *)lua_tostring(L, 3);
}
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ if(lua_gettop(L)>=4){</span>
<span style="color: #00A000">+ arg4 = (char *)lua_tostring(L, 4);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/managed/ESLPINVOKE.cs b/libs/esl/managed/ESLPINVOKE.cs</span>
<span style="color: #000080; font-weight: bold">index d7dfb6f..1e48789 100644</span>
<span style="color: #A00000">--- a/libs/esl/managed/ESLPINVOKE.cs</span>
<span style="color: #00A000">+++ b/libs/esl/managed/ESLPINVOKE.cs</span>
<span style="color: #800080; font-weight: bold">@@ -275,7 +275,7 @@ class ESLPINVOKE {</span>
public static extern IntPtr ESLconnection_Api(HandleRef jarg1, string jarg2, string jarg3);
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_Bgapi")]
<span style="color: #A00000">- public static extern IntPtr ESLconnection_Bgapi(HandleRef jarg1, string jarg2, string jarg3);</span>
<span style="color: #00A000">+ public static extern IntPtr ESLconnection_Bgapi(HandleRef jarg1, string jarg2, string jarg3, string jarg4);</span>
[DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")]
public static extern IntPtr ESLconnection_SendEvent(HandleRef jarg1, HandleRef jarg2);
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/managed/ESLconnection.cs b/libs/esl/managed/ESLconnection.cs</span>
<span style="color: #000080; font-weight: bold">index 10a7774..8843583 100644</span>
<span style="color: #A00000">--- a/libs/esl/managed/ESLconnection.cs</span>
<span style="color: #00A000">+++ b/libs/esl/managed/ESLconnection.cs</span>
<span style="color: #800080; font-weight: bold">@@ -80,8 +80,8 @@ public class ESLconnection : IDisposable {</span>
return ret;
}
<span style="color: #A00000">- public ESLevent Bgapi(string cmd, string arg) {</span>
<span style="color: #A00000">- IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg);</span>
<span style="color: #00A000">+ public ESLevent Bgapi(string cmd, string arg, string job_uuid) {</span>
<span style="color: #00A000">+ IntPtr cPtr = ESLPINVOKE.ESLconnection_Bgapi(swigCPtr, cmd, arg, job_uuid);</span>
ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
return ret;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/managed/esl_wrap.cpp b/libs/esl/managed/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index eb9559b..4d0e27d 100644</span>
<span style="color: #A00000">--- a/libs/esl/managed/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/managed/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -677,17 +677,19 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Api(void * jarg1, char * jarg</span>
}
<span style="color: #A00000">-SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Bgapi(void * jarg1, char * jarg2, char * jarg3) {</span>
<span style="color: #00A000">+SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Bgapi(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {</span>
void * jresult ;
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
arg1 = (ESLconnection *)jarg1;
arg2 = (char *)jarg2;
arg3 = (char *)jarg3;
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ arg4 = (char *)jarg4; </span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
jresult = (void *)result;
return jresult;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/perl/esl_wrap.cpp b/libs/esl/perl/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index e965458..ccce4bb 100644</span>
<span style="color: #A00000">--- a/libs/esl/perl/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/perl/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -3072,6 +3072,7 @@ XS(_wrap_ESLconnection_bgapi) {</span>
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
<span style="color: #800080; font-weight: bold">@@ -3081,11 +3082,14 @@ XS(_wrap_ESLconnection_bgapi) {</span>
int res3 ;
char *buf3 = 0 ;
int alloc3 = 0 ;
<span style="color: #00A000">+ int res4 ;</span>
<span style="color: #00A000">+ char *buf4 = 0 ;</span>
<span style="color: #00A000">+ int alloc4 = 0 ;</span>
int argvi = 0;
dXSARGS;
<span style="color: #A00000">- if ((items < 2) || (items > 3)) {</span>
<span style="color: #A00000">- SWIG_croak("Usage: ESLconnection_bgapi(self,cmd,arg);");</span>
<span style="color: #00A000">+ if ((items < 2) || (items > 4)) {</span>
<span style="color: #00A000">+ SWIG_croak("Usage: ESLconnection_bgapi(self,cmd,arg,job_uuid);");</span>
}
res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 );
if (!SWIG_IsOK(res1)) {
<span style="color: #800080; font-weight: bold">@@ -3104,16 +3108,25 @@ XS(_wrap_ESLconnection_bgapi) {</span>
}
arg3 = reinterpret_cast< char * >(buf3);
}
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ if (items > 3) {</span>
<span style="color: #00A000">+ res4 = SWIG_AsCharPtrAndSize(ST(3), &buf4, NULL, &alloc4);</span>
<span style="color: #00A000">+ if (!SWIG_IsOK(res4)) {</span>
<span style="color: #00A000">+ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_bgapi" "', argument " "4"" of type '" "char const *""'");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ arg4 = reinterpret_cast< char * >(buf4);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
XSRETURN(argvi);
fail:
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
SWIG_croak_null();
}
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/php/ESL.php b/libs/esl/php/ESL.php</span>
<span style="color: #000080; font-weight: bold">index 96d96e3..70ff62a 100644</span>
<span style="color: #A00000">--- a/libs/esl/php/ESL.php</span>
<span style="color: #00A000">+++ b/libs/esl/php/ESL.php</span>
<span style="color: #800080; font-weight: bold">@@ -152,10 +152,11 @@ class ESLconnection {</span>
return is_resource($r) ? new ESLevent($r) : $r;
}
<span style="color: #A00000">- function bgapi($cmd,$arg=null) {</span>
<span style="color: #00A000">+ function bgapi($cmd,$arg=null,$job_uuid=null) {</span>
switch (func_num_args()) {
case 1: $r=ESLconnection_bgapi($this->_cPtr,$cmd); break;
<span style="color: #A00000">- default: $r=ESLconnection_bgapi($this->_cPtr,$cmd,$arg);</span>
<span style="color: #00A000">+ case 2: $r=ESLconnection_bgapi($this->_cPtr,$cmd,$arg); break;</span>
<span style="color: #00A000">+ default: $r=ESLconnection_bgapi($this->_cPtr,$cmd,$arg,$job_uuid);</span>
}
return is_resource($r) ? new ESLevent($r) : $r;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/php/esl_wrap.cpp b/libs/esl/php/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index c2eea23..c38ea1f 100644</span>
<span style="color: #A00000">--- a/libs/esl/php/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/php/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -2075,13 +2075,14 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_bgapi) {</span>
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
<span style="color: #A00000">- zval **args[3];</span>
<span style="color: #00A000">+ zval **args[4];</span>
int arg_count;
SWIG_ResetError();
arg_count = ZEND_NUM_ARGS();
<span style="color: #A00000">- if(arg_count<2 || arg_count>3 ||</span>
<span style="color: #00A000">+ if(arg_count<2 || arg_count>4 ||</span>
zend_get_parameters_array_ex(arg_count,args)!=SUCCESS)
WRONG_PARAM_COUNT;
<span style="color: #800080; font-weight: bold">@@ -2104,7 +2105,14 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_bgapi) {</span>
/*@SWIG@*/;
}
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ if(arg_count > 3) {</span>
<span style="color: #00A000">+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/</span>
<span style="color: #00A000">+ convert_to_string_ex(args[3]);</span>
<span style="color: #00A000">+ arg4 = (char *) Z_STRVAL_PP(args[3]);</span>
<span style="color: #00A000">+ /*@SWIG@*/;</span>
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/python/esl_wrap.cpp b/libs/esl/python/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index a7040ef..3ef5875 100644</span>
<span style="color: #A00000">--- a/libs/esl/python/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/python/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -4151,6 +4151,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_bgapi(PyObject *SWIGUNUSEDPARM(self), P</span>
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
<span style="color: #800080; font-weight: bold">@@ -4160,12 +4161,16 @@ SWIGINTERN PyObject *_wrap_ESLconnection_bgapi(PyObject *SWIGUNUSEDPARM(self), P</span>
int res3 ;
char *buf3 = 0 ;
int alloc3 = 0 ;
<span style="color: #00A000">+ int res4 ;</span>
<span style="color: #00A000">+ char *buf4 = 0 ;</span>
<span style="color: #00A000">+ int alloc4 = 0 ;</span>
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
<span style="color: #00A000">+ PyObject * obj3 = 0 ;</span>
SWIG_PYTHON_THREAD_BEGIN_BLOCK;
<span style="color: #A00000">- if (!PyArg_ParseTuple(args,(char *)"OO|O:ESLconnection_bgapi",&obj0,&obj1,&obj2)) SWIG_fail;</span>
<span style="color: #00A000">+ if (!PyArg_ParseTuple(args,(char *)"OO|OO:ESLconnection_bgapi",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;</span>
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ESLconnection_bgapi" "', argument " "1"" of type '" "ESLconnection *""'");
<span style="color: #800080; font-weight: bold">@@ -4183,19 +4188,28 @@ SWIGINTERN PyObject *_wrap_ESLconnection_bgapi(PyObject *SWIGUNUSEDPARM(self), P</span>
}
arg3 = reinterpret_cast< char * >(buf3);
}
<span style="color: #00A000">+ if (obj3) {</span>
<span style="color: #00A000">+ res4 = SWIG_AsCharPtrAndSize(obj3, &buf4, NULL, &alloc4);</span>
<span style="color: #00A000">+ if (!SWIG_IsOK(res4)) {</span>
<span style="color: #00A000">+ SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ESLconnection_bgapi" "', argument " "4"" of type '" "char const *""'");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ arg4 = reinterpret_cast< char * >(buf4);</span>
<span style="color: #00A000">+ }</span>
{
SWIG_PYTHON_THREAD_BEGIN_ALLOW;
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
SWIG_PYTHON_THREAD_END_ALLOW;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
SWIG_PYTHON_THREAD_END_BLOCK;
return resultobj;
fail:
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
SWIG_PYTHON_THREAD_END_BLOCK;
return NULL;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/ruby/esl_wrap.cpp b/libs/esl/ruby/esl_wrap.cpp</span>
<span style="color: #000080; font-weight: bold">index 7892ed6..3769b5b 100644</span>
<span style="color: #A00000">--- a/libs/esl/ruby/esl_wrap.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/ruby/esl_wrap.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -3055,6 +3055,7 @@ _wrap_ESLconnection_bgapi(int argc, VALUE *argv, VALUE self) {</span>
ESLconnection *arg1 = (ESLconnection *) 0 ;
char *arg2 = (char *) 0 ;
char *arg3 = (char *) NULL ;
<span style="color: #00A000">+ char *arg4 = (char *) NULL ;</span>
ESLevent *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
<span style="color: #800080; font-weight: bold">@@ -3064,9 +3065,12 @@ _wrap_ESLconnection_bgapi(int argc, VALUE *argv, VALUE self) {</span>
int res3 ;
char *buf3 = 0 ;
int alloc3 = 0 ;
<span style="color: #00A000">+ int res4 ;</span>
<span style="color: #00A000">+ char *buf4 = 0 ;</span>
<span style="color: #00A000">+ int alloc4 = 0 ;</span>
VALUE vresult = Qnil;
<span style="color: #A00000">- if ((argc < 1) || (argc > 2)) {</span>
<span style="color: #00A000">+ if ((argc < 1) || (argc > 3)) {</span>
rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
}
res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ESLconnection, 0 | 0 );
<span style="color: #800080; font-weight: bold">@@ -3086,14 +3090,23 @@ _wrap_ESLconnection_bgapi(int argc, VALUE *argv, VALUE self) {</span>
}
arg3 = reinterpret_cast< char * >(buf3);
}
<span style="color: #A00000">- result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);</span>
<span style="color: #00A000">+ if (argc > 2) {</span>
<span style="color: #00A000">+ res4 = SWIG_AsCharPtrAndSize(argv[2], &buf4, NULL, &alloc4);</span>
<span style="color: #00A000">+ if (!SWIG_IsOK(res4)) {</span>
<span style="color: #00A000">+ SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "char const *","bgapi", 4, argv[2] ));</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ arg4 = reinterpret_cast< char * >(buf4);</span>
<span style="color: #00A000">+ }</span>
<span style="color: #00A000">+ result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);</span>
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
return vresult;
fail:
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
<span style="color: #00A000">+ if (alloc4 == SWIG_NEWOBJ) delete[] buf4;</span>
return Qnil;
}
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/src/esl_oop.cpp b/libs/esl/src/esl_oop.cpp</span>
<span style="color: #000080; font-weight: bold">index 0ea88e1..8ea3dfa 100644</span>
<span style="color: #A00000">--- a/libs/esl/src/esl_oop.cpp</span>
<span style="color: #00A000">+++ b/libs/esl/src/esl_oop.cpp</span>
<span style="color: #800080; font-weight: bold">@@ -105,7 +105,7 @@ ESLevent *ESLconnection::api(const char *cmd, const char *arg)</span>
return event;
}
<span style="color: #A00000">-ESLevent *ESLconnection::bgapi(const char *cmd, const char *arg)</span>
<span style="color: #00A000">+ESLevent *ESLconnection::bgapi(const char *cmd, const char *arg, const char *job_uuid)</span>
{
size_t len;
char *cmd_buf;
<span style="color: #800080; font-weight: bold">@@ -115,12 +115,17 @@ ESLevent *ESLconnection::bgapi(const char *cmd, const char *arg)</span>
return NULL;
}
<span style="color: #A00000">- len = strlen(cmd) + (arg ? strlen(arg) : 0) + 10;</span>
<span style="color: #00A000">+ len = strlen(cmd) + (arg ? strlen(arg) : 0) + (job_uuid ? strlen(job_uuid) + 12 : 0) + 10;</span>
cmd_buf = (char *) malloc(len + 1);
assert(cmd_buf);
<span style="color: #00A000">+ </span>
<span style="color: #00A000">+ if (job_uuid) {</span>
<span style="color: #00A000">+ snprintf(cmd_buf, len, "bgapi %s%s%s\nJob-UUID: %s", cmd, arg ? " " : "", arg ? arg : "", job_uuid);</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ snprintf(cmd_buf, len, "bgapi %s%s%s", cmd, arg ? " " : "", arg ? arg : "");</span>
<span style="color: #00A000">+ }</span>
<span style="color: #A00000">- snprintf(cmd_buf, len, "bgapi %s %s", cmd, arg ? arg : "");</span>
*(cmd_buf + (len)) = '\0';
event = sendRecv(cmd_buf);
<span style="color: #000080; font-weight: bold">diff --git a/libs/esl/src/include/esl_oop.h b/libs/esl/src/include/esl_oop.h</span>
<span style="color: #000080; font-weight: bold">index 8562a9d..3947d0c 100644</span>
<span style="color: #A00000">--- a/libs/esl/src/include/esl_oop.h</span>
<span style="color: #00A000">+++ b/libs/esl/src/include/esl_oop.h</span>
<span style="color: #800080; font-weight: bold">@@ -82,7 +82,7 @@ class ESLconnection {</span>
int send(const char *cmd);
ESLevent *sendRecv(const char *cmd);
ESLevent *api(const char *cmd, const char *arg = NULL);
<span style="color: #A00000">- ESLevent *bgapi(const char *cmd, const char *arg = NULL);</span>
<span style="color: #00A000">+ ESLevent *bgapi(const char *cmd, const char *arg = NULL, const char *job_uuid = NULL);</span>
ESLevent *sendEvent(ESLevent *send_me);
ESLevent *recvEvent();
ESLevent *recvEventTimed(int ms);
</pre></div>
========================================================================<pre>
Summary of changes:
libs/esl/java/esl_wrap.cpp | 11 +++++++++--
.../esl/java/org/freeswitch/esl/ESLconnection.java | 4 ++--
libs/esl/java/org/freeswitch/esl/eslJNI.java | 2 +-
libs/esl/lua/esl_wrap.cpp | 9 +++++++--
libs/esl/managed/ESLPINVOKE.cs | 2 +-
libs/esl/managed/ESLconnection.cs | 4 ++--
libs/esl/managed/esl_wrap.cpp | 6 ++++--
libs/esl/perl/esl_wrap.cpp | 19 ++++++++++++++++---
libs/esl/php/ESL.php | 5 +++--
libs/esl/php/esl_wrap.cpp | 14 +++++++++++---
libs/esl/python/esl_wrap.cpp | 18 ++++++++++++++++--
libs/esl/ruby/esl_wrap.cpp | 17 +++++++++++++++--
libs/esl/src/esl_oop.cpp | 11 ++++++++---
libs/esl/src/include/esl_oop.h | 2 +-
14 files changed, 96 insertions(+), 28 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>