retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

swigall 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/esl/ESL.i
View File

@ -3,5 +3,12 @@
#include "esl_oop.h"
%}
%newobject ESLconnection::sendRecv;
%newobject ESLconnection::api;
%newobject ESLconnection::bgapi;
%newobject ESLconnection::getInfo;
%newobject ESLconnection::filter;
%newobject ESLconnection::recvEvent;
%newobject ESLconnection::recvEventTimed;
%include "esl_oop.h"

14
libs/esl/java/org/freeswitch/esl/ESLconnection.java
View File

@ -51,7 +51,7 @@ public class ESLconnection {
public ESLevent getInfo() {
long cPtr = eslJNI.ESLconnection_getInfo(swigCPtr, this);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int send(String cmd) {
@ -60,17 +60,17 @@ public class ESLconnection {
public ESLevent sendRecv(String cmd) {
long cPtr = eslJNI.ESLconnection_sendRecv(swigCPtr, this, cmd);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent api(String cmd, String arg) {
long cPtr = eslJNI.ESLconnection_api(swigCPtr, this, cmd, arg);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent bgapi(String cmd, String arg) {
long cPtr = eslJNI.ESLconnection_bgapi(swigCPtr, this, cmd, arg);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int sendEvent(ESLevent send_me) {
@ -79,17 +79,17 @@ public class ESLconnection {
public ESLevent recvEvent() {
long cPtr = eslJNI.ESLconnection_recvEvent(swigCPtr, this);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent recvEventTimed(int ms) {
long cPtr = eslJNI.ESLconnection_recvEventTimed(swigCPtr, this, ms);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public ESLevent filter(String header, String value) {
long cPtr = eslJNI.ESLconnection_filter(swigCPtr, this, header, value);
return (cPtr == 0) ? null : new ESLevent(cPtr, false);
return (cPtr == 0) ? null : new ESLevent(cPtr, true);
}
public int events(String etype, String value) {

14
libs/esl/lua/esl_wrap.cpp
View File

@ -2339,7 +2339,7 @@ static int _wrap_ESLconnection_getInfo(lua_State* L) {
result = (ESLevent *)(arg1)->getInfo();
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2395,7 +2395,7 @@ static int _wrap_ESLconnection_sendRecv(lua_State* L) {
arg2 = (char *)lua_tostring(L, 2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2428,7 +2428,7 @@ static int _wrap_ESLconnection_api(lua_State* L) {
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2461,7 +2461,7 @@ static int _wrap_ESLconnection_bgapi(lua_State* L) {
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2518,7 +2518,7 @@ static int _wrap_ESLconnection_recvEvent(lua_State* L) {
result = (ESLevent *)(arg1)->recvEvent();
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2546,7 +2546,7 @@ static int _wrap_ESLconnection_recvEventTimed(lua_State* L) {
arg2 = (int)lua_tonumber(L, 2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -2577,7 +2577,7 @@ static int _wrap_ESLconnection_filter(lua_State* L) {
arg3 = (char *)lua_tostring(L, 3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;

14
libs/esl/perl/esl_wrap.cpp
View File

@ -2819,7 +2819,7 @@ XS(_wrap_ESLconnection_getInfo) {
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
fail:
@ -2895,7 +2895,7 @@ XS(_wrap_ESLconnection_sendRecv) {
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
XSRETURN(argvi);
@ -2945,7 +2945,7 @@ XS(_wrap_ESLconnection_api) {
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
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;
@ -2997,7 +2997,7 @@ XS(_wrap_ESLconnection_bgapi) {
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
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;
@ -3067,7 +3067,7 @@ XS(_wrap_ESLconnection_recvEvent) {
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
fail:
@ -3103,7 +3103,7 @@ XS(_wrap_ESLconnection_recvEventTimed) {
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
@ -3151,7 +3151,7 @@ XS(_wrap_ESLconnection_filter) {
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | SWIG_SHADOW); argvi++ ;
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;

33
libs/esl/php/ESL.php
View File

@ -129,53 +129,48 @@ class ESLconnection {
return ESLconnection_connected($this->_cPtr);
}
function getInfo() {
$r=ESLconnection_getInfo($this->_cPtr);
return is_resource($r) ? new ESLevent($r) : $r;
function __construct() {
$this->_cPtr=ESLconnection_getInfo($this->_cPtr);
}
function send($cmd) {
return ESLconnection_send($this->_cPtr,$cmd);
}
function sendRecv($cmd) {
$r=ESLconnection_sendRecv($this->_cPtr,$cmd);
return is_resource($r) ? new ESLevent($r) : $r;
function __construct($cmd) {
$this->_cPtr=ESLconnection_sendRecv($this->_cPtr,$cmd);
}
function api($cmd,$arg=null) {
function __construct($cmd,$arg=null) {
switch (func_num_args()) {
case 1: $r=ESLconnection_api($this->_cPtr,$cmd); break;
default: $r=ESLconnection_api($this->_cPtr,$cmd,$arg);
}
return is_resource($r) ? new ESLevent($r) : $r;
$this->_cPtr=$r;
}
function bgapi($cmd,$arg=null) {
function __construct($cmd,$arg=null) {
switch (func_num_args()) {
case 1: $r=ESLconnection_bgapi($this->_cPtr,$cmd); break;
default: $r=ESLconnection_bgapi($this->_cPtr,$cmd,$arg);
}
return is_resource($r) ? new ESLevent($r) : $r;
$this->_cPtr=$r;
}
function sendEvent($send_me) {
return ESLconnection_sendEvent($this->_cPtr,$send_me);
}
function recvEvent() {
$r=ESLconnection_recvEvent($this->_cPtr);
return is_resource($r) ? new ESLevent($r) : $r;
function __construct() {
$this->_cPtr=ESLconnection_recvEvent($this->_cPtr);
}
function recvEventTimed($ms) {
$r=ESLconnection_recvEventTimed($this->_cPtr,$ms);
return is_resource($r) ? new ESLevent($r) : $r;
function __construct($ms) {
$this->_cPtr=ESLconnection_recvEventTimed($this->_cPtr,$ms);
}
function filter($header,$value) {
$r=ESLconnection_filter($this->_cPtr,$header,$value);
return is_resource($r) ? new ESLevent($r) : $r;
function __construct($header,$value) {
$this->_cPtr=ESLconnection_filter($this->_cPtr,$header,$value);
}
function events($etype,$value) {

84
libs/esl/php/esl_wrap.cpp
View File

@ -1091,7 +1091,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_serialized_string_set) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1159,7 +1159,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_mine_set) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
@ -1213,13 +1213,13 @@ ZEND_NAMED_FUNCTION(_wrap_new_ESLevent__SWIG_0) {
WRONG_PARAM_COUNT;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[0]);
arg1 = (char *) Z_STRVAL_PP(args[0]);
/*@SWIG@*/;
if(arg_count > 1) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1254,7 +1254,7 @@ ZEND_NAMED_FUNCTION(_wrap_new_ESLevent__SWIG_1) {
}
}
if(arg_count > 1) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
@ -1384,7 +1384,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_serialize) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
if(arg_count > 1) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1460,7 +1460,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_getHeader) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1557,7 +1557,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_addBody) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1591,13 +1591,13 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_addHeader) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@ -1630,7 +1630,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLevent_delHeader) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1718,19 +1718,19 @@ ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection__SWIG_0) {
}
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[0]);
arg1 = (char *) Z_STRVAL_PP(args[0]);
/*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@ -1756,7 +1756,7 @@ ZEND_NAMED_FUNCTION(_wrap_new_ESLconnection__SWIG_1) {
}
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[0]);
arg1 = (int) Z_LVAL_PP(args[0]);
/*@SWIG@*/;
@ -1891,7 +1891,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_getInfo) {
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
result = (ESLevent *)(arg1)->getInfo();
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -1917,7 +1917,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_send) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -1950,14 +1950,14 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_sendRecv) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -1986,13 +1986,13 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_api) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@ -2000,7 +2000,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_api) {
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -2029,13 +2029,13 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_bgapi) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@ -2043,7 +2043,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_bgapi) {
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -2101,7 +2101,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_recvEvent) {
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
result = (ESLevent *)(arg1)->recvEvent();
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -2127,14 +2127,14 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_recvEventTimed) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[1]);
arg2 = (int) Z_LVAL_PP(args[1]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -2161,20 +2161,20 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_filter) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
{
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 1);
}
return;
fail:
@ -2201,13 +2201,13 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_events) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
@ -2244,20 +2244,20 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_execute) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
}
if(arg_count > 3) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[3]);
arg4 = (char *) Z_STRVAL_PP(args[3]);
/*@SWIG@*/;
@ -2295,20 +2295,20 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_executeAsync) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
if(arg_count > 2) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[2]);
arg3 = (char *) Z_STRVAL_PP(args[2]);
/*@SWIG@*/;
}
if(arg_count > 3) {
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[3]);
arg4 = (char *) Z_STRVAL_PP(args[3]);
/*@SWIG@*/;
@ -2342,7 +2342,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setAsyncExecute) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -2375,7 +2375,7 @@ ZEND_NAMED_FUNCTION(_wrap_ESLconnection_setEventLock) {
}
if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
convert_to_string_ex(args[1]);
arg2 = (char *) Z_STRVAL_PP(args[1]);
/*@SWIG@*/;
@ -2426,7 +2426,7 @@ ZEND_NAMED_FUNCTION(_wrap_eslSetLogLevel) {
}
/*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
/*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
convert_to_long_ex(args[0]);
arg1 = (int) Z_LVAL_PP(args[0]);
/*@SWIG@*/;

14
libs/esl/python/esl_wrap.cpp
View File

@ -3718,7 +3718,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_getInfo(PyObject *SWIGUNUSEDPARM(self),
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@ -3784,7 +3784,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_sendRecv(PyObject *SWIGUNUSEDPARM(self)
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
return resultobj;
fail:
@ -3830,7 +3830,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_api(PyObject *SWIGUNUSEDPARM(self), PyO
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return resultobj;
@ -3878,7 +3878,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_bgapi(PyObject *SWIGUNUSEDPARM(self), P
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return resultobj;
@ -3935,7 +3935,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_recvEvent(PyObject *SWIGUNUSEDPARM(self
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@ -3966,7 +3966,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_recvEventTimed(PyObject *SWIGUNUSEDPARM
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@ -4008,7 +4008,7 @@ SWIGINTERN PyObject *_wrap_ESLconnection_filter(PyObject *SWIGUNUSEDPARM(self),
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return resultobj;

16
libs/esl/ruby/esl_wrap.cpp
View File

@ -1902,7 +1902,7 @@ SWIG_ruby_failed(void)
}
/*@SWIG:/usr/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
/*@SWIG:/usr/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
{
VALUE obj = args[0];
@ -2845,7 +2845,7 @@ _wrap_ESLconnection_getInfo(int argc, VALUE *argv, VALUE self) {
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->getInfo();
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@ -2913,7 +2913,7 @@ _wrap_ESLconnection_sendRecv(int argc, VALUE *argv, VALUE self) {
}
arg2 = reinterpret_cast< char * >(buf2);
result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
return vresult;
fail:
@ -2959,7 +2959,7 @@ _wrap_ESLconnection_api(int argc, VALUE *argv, VALUE self) {
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return vresult;
@ -3007,7 +3007,7 @@ _wrap_ESLconnection_bgapi(int argc, VALUE *argv, VALUE self) {
arg3 = reinterpret_cast< char * >(buf3);
}
result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3);
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return vresult;
@ -3067,7 +3067,7 @@ _wrap_ESLconnection_recvEvent(int argc, VALUE *argv, VALUE self) {
}
arg1 = reinterpret_cast< ESLconnection * >(argp1);
result = (ESLevent *)(arg1)->recvEvent();
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@ -3099,7 +3099,7 @@ _wrap_ESLconnection_recvEventTimed(int argc, VALUE *argv, VALUE self) {
}
arg2 = static_cast< int >(val2);
result = (ESLevent *)(arg1)->recvEventTimed(arg2);
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
return vresult;
fail:
return Qnil;
@ -3141,7 +3141,7 @@ _wrap_ESLconnection_filter(int argc, VALUE *argv, VALUE self) {
}
arg3 = reinterpret_cast< char * >(buf3);
result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, 0 | 0 );
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;
return vresult;

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);

2
src/mod/languages/mod_java/mod_java.i
View File

@ -7,7 +7,7 @@
%}
%ignore SwitchToMempool;
%newobject EventConsumer::pop;
// I thought we were using swig because it's easier than the alternatives :-)

4
src/mod/languages/mod_java/src/org/freeswitch/swig/EventConsumer.java
View File

@ -93,12 +93,12 @@ public class EventConsumer {
public Event pop(int block) {
long cPtr = freeswitchJNI.EventConsumer_pop__SWIG_0(swigCPtr, this, block);
return (cPtr == 0) ? null : new Event(cPtr, false);
return (cPtr == 0) ? null : new Event(cPtr, true);
}
public Event pop() {
long cPtr = freeswitchJNI.EventConsumer_pop__SWIG_1(swigCPtr, this);
return (cPtr == 0) ? null : new Event(cPtr, false);
return (cPtr == 0) ? null : new Event(cPtr, true);
}
}

1
src/mod/languages/mod_lua/freeswitch.i
View File

@ -19,6 +19,7 @@
%ignore SwitchToMempool;
%newobject EventConsumer::pop;
/**
* tell swig to grok everything defined in these header files and

4
src/mod/languages/mod_lua/mod_lua_wrap.cpp
View File

@ -3860,7 +3860,7 @@ static int _wrap_EventConsumer_pop__SWIG_0(lua_State* L) {
arg2 = (int)lua_tonumber(L, 2);
result = (Event *)(arg1)->pop(arg2);
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;
@ -3885,7 +3885,7 @@ static int _wrap_EventConsumer_pop__SWIG_1(lua_State* L) {
result = (Event *)(arg1)->pop();
SWIG_arg=0;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,0); SWIG_arg++;
SWIG_NewPointerObj(L,result,SWIGTYPE_p_Event,1); SWIG_arg++;
return SWIG_arg;
if(0) SWIG_fail;

1
src/mod/languages/mod_managed/freeswitch.i
View File

@ -10,6 +10,7 @@
%typemap(csclassmodifiers) ManagedSession "public partial class"
%typemap(csclassmodifiers) Event "public partial class"
%typemap(csclassmodifiers) Stream "public partial class"
%newobject EventConsumer::pop;
// Allow bitwise compare on flag fields
%typemap(csclassmodifiers) session_flag_t "[System.Flags] public enum"

26
src/mod/languages/mod_managed/freeswitch_wrap.cxx
View File

@ -5312,6 +5312,18 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_resume(void * jarg1) {
}
SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_media_bug_inuse(void * jarg1, void * jarg2, void * jarg3) {
switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
switch_size_t *arg2 = (switch_size_t *) 0 ;
switch_size_t *arg3 = (switch_size_t *) 0 ;
arg1 = (switch_media_bug_t *)jarg1;
arg2 = (switch_size_t *)jarg2;
arg3 = (switch_size_t *)jarg3;
switch_core_media_bug_inuse(arg1,arg2,arg3);
}
SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_media_bug_get_user_data(void * jarg1) {
void * jresult ;
switch_media_bug_t *arg1 = (switch_media_bug_t *) 0 ;
@ -9391,6 +9403,20 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_validate_ip_token(void * j
}
SWIGEXPORT int SWIGSTDCALL CSharp_switch_number_cmp(char * jarg1, int jarg2) {
int jresult ;
char *arg1 = (char *) 0 ;
int arg2 ;
int result;
arg1 = (char *)jarg1;
arg2 = (int)jarg2;
result = (int)switch_number_cmp((char const *)arg1,arg2);
jresult = result;
return jresult;
}
SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_username_set(void * jarg1, char * jarg2) {
switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;
char *arg2 = (char *) 0 ;

17
src/mod/languages/mod_managed/managed/swig.cs
View File

@ -555,7 +555,7 @@ public class EventConsumer : IDisposable {
public Event pop(int block) {
IntPtr cPtr = freeswitchPINVOKE.EventConsumer_pop(swigCPtr, block);
Event ret = (cPtr == IntPtr.Zero) ? null : new Event(cPtr, false);
Event ret = (cPtr == IntPtr.Zero) ? null : new Event(cPtr, true);
return ret;
}
@ -888,6 +888,10 @@ public class freeswitch {
freeswitchPINVOKE.switch_core_media_bug_resume(SWIGTYPE_p_switch_core_session.getCPtr(session));
}
public static void switch_core_media_bug_inuse(SWIGTYPE_p_switch_media_bug bug, SWIGTYPE_p_switch_size_t readp, SWIGTYPE_p_switch_size_t writep) {
freeswitchPINVOKE.switch_core_media_bug_inuse(SWIGTYPE_p_switch_media_bug.getCPtr(bug), SWIGTYPE_p_switch_size_t.getCPtr(readp), SWIGTYPE_p_switch_size_t.getCPtr(writep));
}
public static SWIGTYPE_p_void switch_core_media_bug_get_user_data(SWIGTYPE_p_switch_media_bug bug) {
IntPtr cPtr = freeswitchPINVOKE.switch_core_media_bug_get_user_data(SWIGTYPE_p_switch_media_bug.getCPtr(bug));
SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false);
@ -2341,6 +2345,11 @@ public class freeswitch {
return ret;
}
public static int switch_number_cmp(string exp, int val) {
int ret = freeswitchPINVOKE.switch_number_cmp(exp, val);
return ret;
}
public static switch_caller_extension switch_caller_extension_new(SWIGTYPE_p_switch_core_session session, string extension_name, string extension_number) {
IntPtr cPtr = freeswitchPINVOKE.switch_caller_extension_new(SWIGTYPE_p_switch_core_session.getCPtr(session), extension_name, extension_number);
switch_caller_extension ret = (cPtr == IntPtr.Zero) ? null : new switch_caller_extension(cPtr, false);
@ -5817,6 +5826,9 @@ class freeswitchPINVOKE {
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_resume")]
public static extern void switch_core_media_bug_resume(HandleRef jarg1);
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_inuse")]
public static extern void switch_core_media_bug_inuse(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_get_user_data")]
public static extern IntPtr switch_core_media_bug_get_user_data(HandleRef jarg1);
@ -6702,6 +6714,9 @@ class freeswitchPINVOKE {
[DllImport("mod_managed", EntryPoint="CSharp_switch_network_list_validate_ip_token")]
public static extern int switch_network_list_validate_ip_token(HandleRef jarg1, uint jarg2, ref string jarg3);
[DllImport("mod_managed", EntryPoint="CSharp_switch_number_cmp")]
public static extern int switch_number_cmp(string jarg1, int jarg2);
[DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_username_set")]
public static extern void switch_caller_profile_username_set(HandleRef jarg1, string jarg2);

2
src/mod/languages/mod_managed/switch_platform.i
View File

@ -28,6 +28,8 @@ typedef unsigned long in_addr_t;
}
%}
%newobject EventConsumer::pop;
#define SWITCH_DECLARE(type) type
#define SWITCH_DECLARE_NONSTD(type) type
#define SWITCH_MOD_DECLARE(type) type

1
src/mod/languages/mod_perl/freeswitch.i
View File

@ -9,6 +9,7 @@
//%cstring_bounded_mutable(char *dtmf_buf, 128);
//%cstring_bounded_mutable(char *terminator, 8);
%newobject EventConsumer::pop;
/** insert the following includes into generated code so it compiles */
%{

4
src/mod/languages/mod_perl/mod_perl_wrap.cpp
View File

@ -4901,7 +4901,7 @@ XS(_wrap_EventConsumer_pop__SWIG_0) {
}
arg2 = static_cast< int >(val2);
result = (Event *)(arg1)->pop(arg2);
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
@ -4931,7 +4931,7 @@ XS(_wrap_EventConsumer_pop__SWIG_1) {
}
arg1 = reinterpret_cast< EventConsumer * >(argp1);
result = (Event *)(arg1)->pop();
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | SWIG_SHADOW); argvi++ ;
ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
XSRETURN(argvi);
fail:

1
src/mod/languages/mod_python/mod_python.i
View File

@ -9,6 +9,7 @@
%cstring_bounded_mutable(char *dtmf_buf, 128);
%cstring_bounded_mutable(char *terminator, 8);
%newobject EventConsumer::pop;
/** insert the following includes into generated code so it compiles */
%{

8
src/mod/languages/mod_python/mod_python_wrap.cpp
View File

@ -5469,10 +5469,8 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop__SWIG_0(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'");
}
arg2 = static_cast< int >(val2);
Py_BEGIN_ALLOW_THREADS;
result = (Event *)(arg1)->pop(arg2);
Py_END_ALLOW_THREADS;
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@ -5493,10 +5491,8 @@ SWIGINTERN PyObject *_wrap_EventConsumer_pop__SWIG_1(PyObject *SWIGUNUSEDPARM(se
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'");
}
arg1 = reinterpret_cast< EventConsumer * >(argp1);
Py_BEGIN_ALLOW_THREADS;
result = (Event *)(arg1)->pop();
Py_END_ALLOW_THREADS;
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 );
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;