<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15973] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15973">15973</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-15 13:45:47 -0600 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>change execute and executeAsync to return the last event instead of status since it will almost always be 0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibseslESLi">freeswitch/trunk/libs/esl/ESL.i</a></li>
<li><a href="#freeswitchtrunklibsesljavaesl_wrapcpp">freeswitch/trunk/libs/esl/java/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibsesljavaorgfreeswitcheslESLconnectionjava">freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java</a></li>
<li><a href="#freeswitchtrunklibsesljavaorgfreeswitchesleslJNIjava">freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java</a></li>
<li><a href="#freeswitchtrunklibseslluaesl_wrapcpp">freeswitch/trunk/libs/esl/lua/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslmanagedESLPINVOKEcs">freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs</a></li>
<li><a href="#freeswitchtrunklibseslmanagedESLconnectioncs">freeswitch/trunk/libs/esl/managed/ESLconnection.cs</a></li>
<li><a href="#freeswitchtrunklibseslmanagedesl_wrapcpp">freeswitch/trunk/libs/esl/managed/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslperlesl_wrapcpp">freeswitch/trunk/libs/esl/perl/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslphpESLphp">freeswitch/trunk/libs/esl/php/ESL.php</a></li>
<li><a href="#freeswitchtrunklibseslphpesl_wrapcpp">freeswitch/trunk/libs/esl/php/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslpythonesl_wrapcpp">freeswitch/trunk/libs/esl/python/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslrubyesl_wrapcpp">freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunklibseslsrcesl_oopcpp">freeswitch/trunk/libs/esl/src/esl_oop.cpp</a></li>
<li><a href="#freeswitchtrunklibseslsrcincludeesl_ooph">freeswitch/trunk/libs/esl/src/include/esl_oop.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibseslESLi"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/ESL.i (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/ESL.i 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/ESL.i 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -19,6 +19,8 @@
</span><span class="cx"> %newobject ESLconnection::filter;
</span><span class="cx"> %newobject ESLconnection::recvEvent;
</span><span class="cx"> %newobject ESLconnection::recvEventTimed;
</span><ins>+%newobject ESLconnection::execute;
+%newobject ESLconnection::executeAsync;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> %include "esl_oop.h"
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/java/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -887,13 +887,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1execute(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) {
- jint jresult = 0 ;
</del><ins>+SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1execute(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) {
+ jlong jresult = 0 ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> (void)jenv;
</span><span class="cx"> (void)jcls;
</span><span class="lines">@@ -914,8 +914,8 @@
</span><span class="cx"> arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0);
</span><span class="cx"> if (!arg4) return 0;
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
- jresult = (jint)result;
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ *(ESLevent **)&jresult = result;
</ins><span class="cx"> if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
</span><span class="cx"> if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
</span><span class="cx"> if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4);
</span><span class="lines">@@ -923,13 +923,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1executeAsync(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) {
- jint jresult = 0 ;
</del><ins>+SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1executeAsync(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4) {
+ jlong jresult = 0 ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> (void)jenv;
</span><span class="cx"> (void)jcls;
</span><span class="lines">@@ -950,8 +950,8 @@
</span><span class="cx"> arg4 = (char *)jenv->GetStringUTFChars(jarg4, 0);
</span><span class="cx"> if (!arg4) return 0;
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
- jresult = (jint)result;
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ *(ESLevent **)&jresult = result;
</ins><span class="cx"> if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
</span><span class="cx"> if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
</span><span class="cx"> if (arg4) jenv->ReleaseStringUTFChars(jarg4, (const char *)arg4);
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaorgfreeswitcheslESLconnectionjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -96,12 +96,14 @@
</span><span class="cx"> return eslJNI.ESLconnection_events(swigCPtr, this, etype, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int execute(String app, String arg, String uuid) {
- return eslJNI.ESLconnection_execute(swigCPtr, this, app, arg, uuid);
</del><ins>+ public ESLevent execute(String app, String arg, String uuid) {
+ long cPtr = eslJNI.ESLconnection_execute(swigCPtr, this, app, arg, uuid);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- public int executeAsync(String app, String arg, String uuid) {
- return eslJNI.ESLconnection_executeAsync(swigCPtr, this, app, arg, uuid);
</del><ins>+ public ESLevent executeAsync(String app, String arg, String uuid) {
+ long cPtr = eslJNI.ESLconnection_executeAsync(swigCPtr, this, app, arg, uuid);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public int setAsyncExecute(String val) {
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaorgfreeswitchesleslJNIjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> public final static native long ESLconnection_recvEventTimed(long jarg1, ESLconnection jarg1_, int jarg2);
</span><span class="cx"> public final static native long ESLconnection_filter(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);
</span><span class="cx"> public final static native int ESLconnection_events(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);
</span><del>- public final static native int ESLconnection_execute(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4);
- public final static native int ESLconnection_executeAsync(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4);
</del><ins>+ public final static native long ESLconnection_execute(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4);
+ public final static native long ESLconnection_executeAsync(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3, String jarg4);
</ins><span class="cx"> public final static native int ESLconnection_setAsyncExecute(long jarg1, ESLconnection jarg1_, String jarg2);
</span><span class="cx"> public final static native int ESLconnection_setEventLock(long jarg1, ESLconnection jarg1_, String jarg2);
</span><span class="cx"> public final static native int ESLconnection_disconnect(long jarg1, ESLconnection jarg1_);
</span></span></pre></div>
<a id="freeswitchtrunklibseslluaesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -2625,7 +2625,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> SWIG_check_num_args("execute",2,4)
</span><span class="cx"> if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("execute",1,"ESLconnection *");
</span><span class="lines">@@ -2644,9 +2644,9 @@
</span><span class="cx"> if(lua_gettop(L)>=4){
</span><span class="cx"> arg4 = (char *)lua_tostring(L, 4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
</ins><span class="cx"> SWIG_arg=0;
</span><del>- lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
</del><ins>+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
</ins><span class="cx"> return SWIG_arg;
</span><span class="cx">
</span><span class="cx"> if(0) SWIG_fail;
</span><span class="lines">@@ -2663,7 +2663,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> SWIG_check_num_args("executeAsync",2,4)
</span><span class="cx"> if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("executeAsync",1,"ESLconnection *");
</span><span class="lines">@@ -2682,9 +2682,9 @@
</span><span class="cx"> if(lua_gettop(L)>=4){
</span><span class="cx"> arg4 = (char *)lua_tostring(L, 4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
</ins><span class="cx"> SWIG_arg=0;
</span><del>- lua_pushnumber(L, (lua_Number) result); SWIG_arg++;
</del><ins>+ SWIG_NewPointerObj(L,result,SWIGTYPE_p_ESLevent,1); SWIG_arg++;
</ins><span class="cx"> return SWIG_arg;
</span><span class="cx">
</span><span class="cx"> if(0) SWIG_fail;
</span></span></pre></div>
<a id="freeswitchtrunklibseslmanagedESLPINVOKEcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -290,10 +290,10 @@
</span><span class="cx"> public static extern int ESLconnection_events(HandleRef jarg1, string jarg2, string jarg3);
</span><span class="cx">
</span><span class="cx"> [DllImport("ESL", EntryPoint="CSharp_ESLconnection_execute")]
</span><del>- public static extern int ESLconnection_execute(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
</del><ins>+ public static extern IntPtr ESLconnection_execute(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
</ins><span class="cx">
</span><span class="cx"> [DllImport("ESL", EntryPoint="CSharp_ESLconnection_executeAsync")]
</span><del>- public static extern int ESLconnection_executeAsync(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
</del><ins>+ public static extern IntPtr ESLconnection_executeAsync(HandleRef jarg1, string jarg2, string jarg3, string jarg4);
</ins><span class="cx">
</span><span class="cx"> [DllImport("ESL", EntryPoint="CSharp_ESLconnection_setAsyncExecute")]
</span><span class="cx"> public static extern int ESLconnection_setAsyncExecute(HandleRef jarg1, string jarg2);
</span></span></pre></div>
<a id="freeswitchtrunklibseslmanagedESLconnectioncs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/managed/ESLconnection.cs (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/ESLconnection.cs 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/managed/ESLconnection.cs 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -111,13 +111,15 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int execute(string app, string arg, string uuid) {
- int ret = ESLPINVOKE.ESLconnection_execute(swigCPtr, app, arg, uuid);
</del><ins>+ public ESLevent execute(string app, string arg, string uuid) {
+ IntPtr cPtr = ESLPINVOKE.ESLconnection_execute(swigCPtr, app, arg, uuid);
+ ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int executeAsync(string app, string arg, string uuid) {
- int ret = ESLPINVOKE.ESLconnection_executeAsync(swigCPtr, app, arg, uuid);
</del><ins>+ public ESLevent executeAsync(string app, string arg, string uuid) {
+ IntPtr cPtr = ESLPINVOKE.ESLconnection_executeAsync(swigCPtr, app, arg, uuid);
+ ESLevent ret = (cPtr == IntPtr.Zero) ? null : new ESLevent(cPtr, true);
</ins><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibseslmanagedesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/managed/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/managed/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -747,38 +747,38 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_execute(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
- int jresult ;
</del><ins>+SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_execute(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+ void * jresult ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> arg1 = (ESLconnection *)jarg1;
</span><span class="cx"> arg2 = (char *)jarg2;
</span><span class="cx"> arg3 = (char *)jarg3;
</span><span class="cx"> arg4 = (char *)jarg4;
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
- jresult = result;
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ jresult = (void *)result;
</ins><span class="cx"> return jresult;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_executeAsync(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
- int jresult ;
</del><ins>+SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_executeAsync(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
+ void * jresult ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> arg1 = (ESLconnection *)jarg1;
</span><span class="cx"> arg2 = (char *)jarg2;
</span><span class="cx"> arg3 = (char *)jarg3;
</span><span class="cx"> arg4 = (char *)jarg4;
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
- jresult = result;
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ jresult = (void *)result;
</ins><span class="cx"> return jresult;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibseslperlesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/perl/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -3221,7 +3221,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -3263,8 +3263,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
- ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
</ins><span class="cx">
</span><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span><span class="lines">@@ -3286,7 +3286,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -3328,8 +3328,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
- ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
</ins><span class="cx">
</span><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span></span></pre></div>
<a id="freeswitchtrunklibseslphpESLphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/php/ESL.php (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/php/ESL.php 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/php/ESL.php 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> case 2: $r=ESLconnection_execute($this->_cPtr,$app,$arg); break;
</span><span class="cx"> default: $r=ESLconnection_execute($this->_cPtr,$app,$arg,$uuid);
</span><span class="cx"> }
</span><del>- return $r;
</del><ins>+ return is_resource($r) ? new ESLevent($r) : $r;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function executeAsync($app,$arg=null,$uuid=null) {
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> case 2: $r=ESLconnection_executeAsync($this->_cPtr,$app,$arg); break;
</span><span class="cx"> default: $r=ESLconnection_executeAsync($this->_cPtr,$app,$arg,$uuid);
</span><span class="cx"> }
</span><del>- return $r;
</del><ins>+ return is_resource($r) ? new ESLevent($r) : $r;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function setAsyncExecute($val) {
</span></span></pre></div>
<a id="freeswitchtrunklibseslphpesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -1091,7 +1091,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1159,7 +1159,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</ins><span class="cx"> convert_to_long_ex(args[1]);
</span><span class="cx"> arg2 = (int) Z_LVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1213,13 +1213,13 @@
</span><span class="cx"> WRONG_PARAM_COUNT;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[0]);
</span><span class="cx"> arg1 = (char *) Z_STRVAL_PP(args[0]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> if(arg_count > 1) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if(arg_count > 1) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</ins><span class="cx"> convert_to_long_ex(args[1]);
</span><span class="cx"> arg2 = (int) Z_LVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1384,7 +1384,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx"> if(arg_count > 1) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1460,7 +1460,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1557,7 +1557,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1591,13 +1591,13 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1630,7 +1630,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1718,19 +1718,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[0]);
</span><span class="cx"> arg1 = (char *) Z_STRVAL_PP(args[0]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1756,7 +1756,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</ins><span class="cx"> convert_to_long_ex(args[0]);
</span><span class="cx"> arg1 = (int) Z_LVAL_PP(args[0]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1917,7 +1917,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1950,7 +1950,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1986,13 +1986,13 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> if(arg_count > 2) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2029,13 +2029,13 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> if(arg_count > 2) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2127,7 +2127,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</ins><span class="cx"> convert_to_long_ex(args[1]);
</span><span class="cx"> arg2 = (int) Z_LVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2161,13 +2161,13 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2201,13 +2201,13 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2227,7 +2227,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> zval **args[4];
</span><span class="cx"> int arg_count;
</span><span class="cx">
</span><span class="lines">@@ -2244,28 +2244,28 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> if(arg_count > 2) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> if(arg_count > 3) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[3]);
</span><span class="cx"> arg4 = (char *) Z_STRVAL_PP(args[3]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
</ins><span class="cx"> {
</span><del>- ZVAL_LONG(return_value,result);
</del><ins>+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> fail:
</span><span class="lines">@@ -2278,7 +2278,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> zval **args[4];
</span><span class="cx"> int arg_count;
</span><span class="cx">
</span><span class="lines">@@ -2295,28 +2295,28 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> if(arg_count > 2) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[2]);
</span><span class="cx"> arg3 = (char *) Z_STRVAL_PP(args[2]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> if(arg_count > 3) {
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[3]);
</span><span class="cx"> arg4 = (char *) Z_STRVAL_PP(args[3]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="cx">
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
</ins><span class="cx"> {
</span><del>- ZVAL_LONG(return_value,result);
</del><ins>+ SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_ESLevent, 0);
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> fail:
</span><span class="lines">@@ -2342,7 +2342,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2375,7 +2375,7 @@
</span><span class="cx"> }
</span><span class="cx"> if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,26,CONVERT_STRING_IN@*/
</ins><span class="cx"> convert_to_string_ex(args[1]);
</span><span class="cx"> arg2 = (char *) Z_STRVAL_PP(args[1]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -2426,7 +2426,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/php4/utils.i,7,CONVERT_INT_IN@*/
</ins><span class="cx"> convert_to_long_ex(args[0]);
</span><span class="cx"> arg1 = (int) Z_LVAL_PP(args[0]);
</span><span class="cx"> /*@SWIG@*/;
</span></span></pre></div>
<a id="freeswitchtrunklibseslpythonesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/python/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -4071,7 +4071,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -4113,8 +4113,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
- resultobj = SWIG_From_int(static_cast< int >(result));
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span><span class="cx"> if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
</span><span class="lines">@@ -4133,7 +4133,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -4175,8 +4175,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
- resultobj = SWIG_From_int(static_cast< int >(result));
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span><span class="cx"> if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
</span></span></pre></div>
<a id="freeswitchtrunklibseslrubyesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -1902,7 +1902,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-/*@SWIG:/usr/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
</del><ins>+/*@SWIG:/usr/local/share/swig/1.3.35/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
</ins><span class="cx"> SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
</span><span class="cx"> {
</span><span class="cx"> VALUE obj = args[0];
</span><span class="lines">@@ -3204,7 +3204,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -3245,8 +3245,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
- vresult = SWIG_From_int(static_cast< int >(result));
</del><ins>+ result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span><span class="cx"> if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
</span><span class="lines">@@ -3265,7 +3265,7 @@
</span><span class="cx"> char *arg2 = (char *) 0 ;
</span><span class="cx"> char *arg3 = (char *) NULL ;
</span><span class="cx"> char *arg4 = (char *) NULL ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> void *argp1 = 0 ;
</span><span class="cx"> int res1 = 0 ;
</span><span class="cx"> int res2 ;
</span><span class="lines">@@ -3306,8 +3306,8 @@
</span><span class="cx"> }
</span><span class="cx"> arg4 = reinterpret_cast< char * >(buf4);
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
- vresult = SWIG_From_int(static_cast< int >(result));
</del><ins>+ result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
</span><span class="cx"> if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
</span><span class="cx"> if (alloc4 == SWIG_NEWOBJ) delete[] buf4;
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcesl_oopcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl_oop.cpp 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -148,13 +148,19 @@
</span><span class="cx"> return handle.event_lock;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int ESLconnection::execute(const char *app, const char *arg, const char *uuid)
</del><ins>+ESLevent *ESLconnection::execute(const char *app, const char *arg, const char *uuid)
</ins><span class="cx"> {
</span><del>- return esl_execute(&handle, app, arg, uuid);
</del><ins>+ if (esl_execute(&handle, app, arg, uuid) == ESL_SUCCESS) {
+ esl_event_t *event;
+ esl_event_dup(&event, handle.last_sr_event);
+ return new ESLevent(event, 1);
+ }
+
+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-int ESLconnection::executeAsync(const char *app, const char *arg, const char *uuid)
</del><ins>+ESLevent *ESLconnection::executeAsync(const char *app, const char *arg, const char *uuid)
</ins><span class="cx"> {
</span><span class="cx"> int async = handle.async_execute;
</span><span class="cx"> int r;
</span><span class="lines">@@ -163,7 +169,13 @@
</span><span class="cx"> r = esl_execute(&handle, app, arg, uuid);
</span><span class="cx"> handle.async_execute = async;
</span><span class="cx">
</span><del>- return r;
</del><ins>+ if (r == ESL_SUCCESS) {
+ esl_event_t *event;
+ esl_event_dup(&event, handle.last_sr_event);
+ return new ESLevent(event, 1);
+ }
+
+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int ESLconnection::sendEvent(ESLevent *send_me)
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcincludeesl_ooph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h (15972 => 15973)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/include/esl_oop.h 2009-12-15 19:26:58 UTC (rev 15972)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h 2009-12-15 19:45:47 UTC (rev 15973)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> ESLevent *recvEventTimed(int ms);
</span><span class="cx"> ESLevent *filter(const char *header, const char *value);
</span><span class="cx"> int events(const char *etype, const char *value);
</span><del>- int execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
- int executeAsync(const char *app, const char *arg = NULL, const char *uuid = NULL);
</del><ins>+ ESLevent *execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
+ ESLevent *executeAsync(const char *app, const char *arg = NULL, const char *uuid = NULL);
</ins><span class="cx"> int setAsyncExecute(const char *val);
</span><span class="cx"> int setEventLock(const char *val);
</span><span class="cx"> int disconnect(void);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>