<!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][16921] </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=16921">16921</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-03-05 17:10:41 -0600 (Fri, 05 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix esl sendevent issue and change the sendEvent method to return the reply text like sendRecv etc</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="#freeswitchtrunklibseslsrceslc">freeswitch/trunk/libs/esl/src/esl.c</a></li>
<li><a href="#freeswitchtrunklibseslsrcesl_oopcpp">freeswitch/trunk/libs/esl/src/esl_oop.cpp</a></li>
<li><a href="#freeswitchtrunklibseslsrcincludeeslh">freeswitch/trunk/libs/esl/src/include/esl.h</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 (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/ESL.i 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/ESL.i 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> %newobject ::getInfo();
</span><span class="cx"> %newobject ESLconnection::filter();
</span><span class="cx"> %newobject ::recvEvent();
</span><ins>+%newobject ::sendEvent();
</ins><span class="cx"> %newobject ESLconnection::recvEventTimed();
</span><span class="cx"> #else
</span><span class="cx"> %newobject ESLconnection::sendRecv;
</span><span class="lines">@@ -17,6 +18,7 @@
</span><span class="cx"> %newobject ESLconnection::bgapi;
</span><span class="cx"> %newobject ESLconnection::getInfo;
</span><span class="cx"> %newobject ESLconnection::filter;
</span><ins>+%newobject ESLconnection::sendEvent;
</ins><span class="cx"> %newobject ESLconnection::recvEvent;
</span><span class="cx"> %newobject ESLconnection::recvEventTimed;
</span><span class="cx"> %newobject ESLconnection::execute;
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/esl_wrap.cpp (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/java/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -819,11 +819,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT jint JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1sendEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
- jint jresult = 0 ;
</del><ins>+SWIGEXPORT jlong JNICALL Java_org_freeswitch_esl_eslJNI_ESLconnection_1sendEvent(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_) {
+ jlong jresult = 0 ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</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">@@ -831,8 +831,8 @@
</span><span class="cx"> (void)jarg2_;
</span><span class="cx"> arg1 = *(ESLconnection **)&jarg1;
</span><span class="cx"> arg2 = *(ESLevent **)&jarg2;
</span><del>- result = (int)(arg1)->sendEvent(arg2);
- jresult = (jint)result;
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
+ *(ESLevent **)&jresult = result;
</ins><span class="cx"> return jresult;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaorgfreeswitcheslESLconnectionjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/ESLconnection.java 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -77,8 +77,9 @@
</span><span class="cx"> return (cPtr == 0) ? null : new ESLevent(cPtr, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int sendEvent(ESLevent send_me) {
- return eslJNI.ESLconnection_sendEvent(swigCPtr, this, ESLevent.getCPtr(send_me), send_me);
</del><ins>+ public ESLevent sendEvent(ESLevent send_me) {
+ long cPtr = eslJNI.ESLconnection_sendEvent(swigCPtr, this, ESLevent.getCPtr(send_me), send_me);
+ return (cPtr == 0) ? null : new ESLevent(cPtr, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public ESLevent recvEvent() {
</span></span></pre></div>
<a id="freeswitchtrunklibsesljavaorgfreeswitchesleslJNIjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/java/org/freeswitch/esl/eslJNI.java 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> public final static native long ESLconnection_sendRecv(long jarg1, ESLconnection jarg1_, String jarg2);
</span><span class="cx"> public final static native long ESLconnection_api(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);
</span><span class="cx"> public final static native long ESLconnection_bgapi(long jarg1, ESLconnection jarg1_, String jarg2, String jarg3);
</span><del>- public final static native int ESLconnection_sendEvent(long jarg1, ESLconnection jarg1_, long jarg2, ESLevent jarg2_);
</del><ins>+ public final static native long ESLconnection_sendEvent(long jarg1, ESLconnection jarg1_, long jarg2, ESLevent jarg2_);
</ins><span class="cx"> public final static native long ESLconnection_recvEvent(long jarg1, ESLconnection jarg1_);
</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></pre></div>
<a id="freeswitchtrunklibseslluaesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/lua/esl_wrap.cpp (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/lua/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -2530,7 +2530,7 @@
</span><span class="cx"> int SWIG_arg = -1;
</span><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx">
</span><span class="cx"> SWIG_check_num_args("sendEvent",2,2)
</span><span class="cx"> if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("sendEvent",1,"ESLconnection *");
</span><span class="lines">@@ -2545,9 +2545,9 @@
</span><span class="cx"> SWIG_fail_ptr("ESLconnection_sendEvent",2,SWIGTYPE_p_ESLevent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result = (int)(arg1)->sendEvent(arg2);
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
</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 (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/managed/ESLPINVOKE.cs 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> public static extern IntPtr ESLconnection_Bgapi(HandleRef jarg1, string jarg2, string jarg3);
</span><span class="cx">
</span><span class="cx"> [DllImport("ESL", EntryPoint="CSharp_ESLconnection_SendEvent")]
</span><del>- public static extern int ESLconnection_SendEvent(HandleRef jarg1, HandleRef jarg2);
</del><ins>+ public static extern IntPtr ESLconnection_SendEvent(HandleRef jarg1, HandleRef jarg2);
</ins><span class="cx">
</span><span class="cx"> [DllImport("ESL", EntryPoint="CSharp_ESLconnection_RecvEvent")]
</span><span class="cx"> public static extern IntPtr ESLconnection_RecvEvent(HandleRef jarg1);
</span></span></pre></div>
<a id="freeswitchtrunklibseslmanagedESLconnectioncs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/managed/ESLconnection.cs (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/ESLconnection.cs 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/managed/ESLconnection.cs 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -86,8 +86,9 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public int SendEvent(ESLevent send_me) {
- int ret = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me));
</del><ins>+ public ESLevent SendEvent(ESLevent send_me) {
+ IntPtr cPtr = ESLPINVOKE.ESLconnection_SendEvent(swigCPtr, ESLevent.getCPtr(send_me));
+ 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 (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/managed/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/managed/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -693,16 +693,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_SendEvent(void * jarg1, void * jarg2) {
- int jresult ;
</del><ins>+SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_SendEvent(void * jarg1, void * jarg2) {
+ void * jresult ;
</ins><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</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 = (ESLevent *)jarg2;
</span><del>- result = (int)(arg1)->sendEvent(arg2);
- jresult = result;
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
+ 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 (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/perl/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -3123,7 +3123,7 @@
</span><span class="cx"> {
</span><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</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"> void *argp2 = 0 ;
</span><span class="lines">@@ -3144,8 +3144,8 @@
</span><span class="cx"> SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ESLconnection_sendEvent" "', argument " "2"" of type '" "ESLevent *""'");
</span><span class="cx"> }
</span><span class="cx"> arg2 = reinterpret_cast< ESLevent * >(argp2);
</span><del>- result = (int)(arg1)->sendEvent(arg2);
- ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
+ ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_OWNER | SWIG_SHADOW); argvi++ ;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> XSRETURN(argvi);
</span></span></pre></div>
<a id="freeswitchtrunklibseslphpESLphp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/php/ESL.php (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/php/ESL.php 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/php/ESL.php 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -161,7 +161,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sendEvent($send_me) {
</span><del>- return ESLconnection_sendEvent($this->_cPtr,$send_me);
</del><ins>+ $r=ESLconnection_sendEvent($this->_cPtr,$send_me);
+ return is_resource($r) ? new ESLevent($r) : $r;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function recvEvent() {
</span></span></pre></div>
<a id="freeswitchtrunklibseslphpesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/php/esl_wrap.cpp (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/php/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</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">@@ -1719,25 +1719,25 @@
</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="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[3]);
</span><span class="cx"> arg4 = (char *) Z_STRVAL_PP(args[3]);
</span><span class="cx"> /*@SWIG@*/;
</span><span class="lines">@@ -1765,19 +1765,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">@@ -1803,7 +1803,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">@@ -1980,7 +1980,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">@@ -2013,7 +2013,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">@@ -2049,13 +2049,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">@@ -2092,13 +2092,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">@@ -2117,7 +2117,7 @@
</span><span class="cx"> ZEND_NAMED_FUNCTION(_wrap_ESLconnection_sendEvent) {
</span><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</span><del>- int result;
</del><ins>+ ESLevent *result = 0 ;
</ins><span class="cx"> zval **args[2];
</span><span class="cx">
</span><span class="cx"> SWIG_ResetError();
</span><span class="lines">@@ -2136,9 +2136,9 @@
</span><span class="cx"> SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of ESLconnection_sendEvent. Expected SWIGTYPE_p_ESLevent");
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- result = (int)(arg1)->sendEvent(arg2);
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
</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">@@ -2190,7 +2190,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">@@ -2224,13 +2224,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">@@ -2264,13 +2264,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">@@ -2307,20 +2307,20 @@
</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="lines">@@ -2358,20 +2358,20 @@
</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="lines">@@ -2405,7 +2405,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">@@ -2438,7 +2438,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">@@ -2489,7 +2489,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 (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/python/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -4205,7 +4205,7 @@
</span><span class="cx"> PyObject *resultobj = 0;
</span><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</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"> void *argp2 = 0 ;
</span><span class="lines">@@ -4227,10 +4227,10 @@
</span><span class="cx"> arg2 = reinterpret_cast< ESLevent * >(argp2);
</span><span class="cx"> {
</span><span class="cx"> SWIG_PYTHON_THREAD_BEGIN_ALLOW;
</span><del>- result = (int)(arg1)->sendEvent(arg2);
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
</ins><span class="cx"> SWIG_PYTHON_THREAD_END_ALLOW;
</span><span class="cx"> }
</span><del>- resultobj = SWIG_From_int(static_cast< int >(result));
</del><ins>+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> SWIG_PYTHON_THREAD_END_BLOCK;
</span><span class="cx"> return resultobj;
</span><span class="cx"> fail:
</span></span></pre></div>
<a id="freeswitchtrunklibseslrubyesl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/ruby/esl_wrap.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</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">@@ -3102,7 +3102,7 @@
</span><span class="cx"> _wrap_ESLconnection_sendEvent(int argc, VALUE *argv, VALUE self) {
</span><span class="cx"> ESLconnection *arg1 = (ESLconnection *) 0 ;
</span><span class="cx"> ESLevent *arg2 = (ESLevent *) 0 ;
</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"> void *argp2 = 0 ;
</span><span class="lines">@@ -3122,8 +3122,8 @@
</span><span class="cx"> SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "ESLevent *","sendEvent", 2, argv[0] ));
</span><span class="cx"> }
</span><span class="cx"> arg2 = reinterpret_cast< ESLevent * >(argp2);
</span><del>- result = (int)(arg1)->sendEvent(arg2);
- vresult = SWIG_From_int(static_cast< int >(result));
</del><ins>+ result = (ESLevent *)(arg1)->sendEvent(arg2);
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ESLevent, SWIG_POINTER_OWN | 0 );
</ins><span class="cx"> return vresult;
</span><span class="cx"> fail:
</span><span class="cx"> return Qnil;
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrceslc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl.c (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl.c 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/src/esl.c 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -453,15 +453,13 @@
</span><span class="cx">
</span><span class="cx"> snprintf(event_buf, sizeof(event_buf), "sendevent %s\n", esl_event_name(event->event_id));
</span><span class="cx">
</span><del>- if (send(handle->sock, event_buf, strlen(event_buf), 0)) goto fail;
- if (send(handle->sock, txt, strlen(txt), 0)) goto fail;
- if (send(handle->sock, "\n\n", 2, 0)) goto fail;
</del><ins>+ if (send(handle->sock, event_buf, strlen(event_buf), 0) <= 0) goto fail;
+ if (send(handle->sock, txt, strlen(txt), 0) <= 0) goto fail;
</ins><span class="cx">
</span><span class="cx"> free(txt);
</span><span class="cx">
</span><del>- return ESL_SUCCESS;
</del><ins>+ return esl_recv(handle);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> fail:
</span><span class="cx">
</span><span class="cx"> handle->connected = 0;
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcesl_oopcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/esl_oop.cpp (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/esl_oop.cpp 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/src/esl_oop.cpp 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -186,9 +186,18 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int ESLconnection::sendEvent(ESLevent *send_me)
</del><ins>+ESLevent *ESLconnection::sendEvent(ESLevent *send_me)
</ins><span class="cx"> {
</span><del>- return esl_sendevent(&handle, send_me->event);
</del><ins>+ if (esl_sendevent(&handle, send_me->event) == 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);
+ return new ESLevent(event, 1);
+ }
+ }
+
+ return new ESLevent("server_disconnected");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ESLevent *ESLconnection::recvEvent()
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcincludeeslh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/include/esl.h (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/include/esl.h 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/src/include/esl.h 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> #define esl_safe_free(_x) if (_x) free(_x); _x = NULL
</span><span class="cx"> #define esl_strlen_zero(s) (!s || *(s) == '\0')
</span><span class="cx"> #define esl_strlen_zero_buf(s) (*(s) == '\0')
</span><ins>+#define end_of(_s) *(*_s == '\0' ? _s : _s + strlen(_s) - 1)
</ins><span class="cx">
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> #include <winsock2.h>
</span></span></pre></div>
<a id="freeswitchtrunklibseslsrcincludeesl_ooph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/esl/src/include/esl_oop.h (16920 => 16921)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/esl/src/include/esl_oop.h 2010-03-05 22:05:27 UTC (rev 16920)
+++ freeswitch/trunk/libs/esl/src/include/esl_oop.h 2010-03-05 23:10:41 UTC (rev 16921)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> ESLevent *sendRecv(const char *cmd);
</span><span class="cx"> ESLevent *api(const char *cmd, const char *arg = NULL);
</span><span class="cx"> ESLevent *bgapi(const char *cmd, const char *arg = NULL);
</span><del>- int sendEvent(ESLevent *send_me);
</del><ins>+ ESLevent *sendEvent(ESLevent *send_me);
</ins><span class="cx"> ESLevent *recvEvent();
</span><span class="cx"> ESLevent *recvEventTimed(int ms);
</span><span class="cx"> ESLevent *filter(const char *header, const char *value);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>