<!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][15006] </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=15006">15006</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-28 14:46:38 -0500 (Mon, 28 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-450">FSCORE-450</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_cpph">freeswitch/trunk/src/include/switch_cpp.h</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigCoreSessionjava">freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigfreeswitchJNIjava">freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_javaswitch_swig_wrapcpp">freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_luamod_lua_wrapcpp">freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_perlfreeswitchpm">freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_perlmod_perl_wrapcpp">freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_pythonfreeswitchpy">freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_pythonmod_python_wrapcpp">freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp</a></li>
<li><a href="#freeswitchtrunksrcswitch_cppcpp">freeswitch/trunk/src/switch_cpp.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_cpph"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_cpp.h (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_cpp.h 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/include/switch_cpp.h 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -20,19 +20,8 @@
</span><span class="cx"> tts_name = NULL; \
</span><span class="cx"> voice_name = NULL; \
</span><span class="cx"> xml_cdr_text = NULL; \
</span><del>- memset(&caller_profile, 0, sizeof(caller_profile)); \
</del><span class="cx"> memset(&args, 0, sizeof(args)); \
</span><span class="cx"> ap = NULL; \
</span><del>- caller_profile.source = "mod_unknown"; \
- caller_profile.dialplan = ""; \
- caller_profile.context = ""; \
- caller_profile.caller_id_name = ""; \
- caller_profile.caller_id_number = ""; \
- caller_profile.network_addr = ""; \
- caller_profile.ani = ""; \
- caller_profile.aniii = ""; \
- caller_profile.rdnis = ""; \
- caller_profile.username = ""; \
</del><span class="cx"> flags = 0; \
</span><span class="cx"> on_hangup = NULL; \
</span><span class="cx"> memset(&cb_state, 0, sizeof(cb_state)); \
</span><span class="lines">@@ -199,7 +188,6 @@
</span><span class="cx"> switch_input_args_t args; // holds ptr to cb function and input_callback_state struct
</span><span class="cx"> // which has a language specific callback function
</span><span class="cx"> switch_input_args_t *ap; // ptr to args .. (is this really needed?)
</span><del>- switch_caller_profile_t caller_profile; // avoid passing so many args to originate,
</del><span class="cx"> // instead set them here first
</span><span class="cx"> char *xml_cdr_text;
</span><span class="cx"> void store_file_handle(switch_file_handle_t *fh);
</span><span class="lines">@@ -247,12 +235,10 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(int) recordFile(char *file_name, int time_limit = 0, int silence_threshold = 0, int silence_hits = 0);
</span><span class="cx">
</span><del>-
</del><span class="cx"> /** \brief Set attributes of caller data for purposes of outgoing calls
</span><span class="cx"> * \param var - the variable name, eg, "caller_id_name"
</span><span class="cx"> * \param val - the data to set, eg, "bob"
</span><span class="cx"> */
</span><del>- SWITCH_DECLARE(void) setCallerData(char *var, char *val);
</del><span class="cx">
</span><span class="cx"> /** \brief Originate a call to a destination
</span><span class="cx"> *
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigCoreSessionjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -193,10 +193,6 @@
</span><span class="cx"> return freeswitchJNI.CoreSession_recordFile__SWIG_3(swigCPtr, this, file_name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public void setCallerData(String var, String val) {
- freeswitchJNI.CoreSession_setCallerData(swigCPtr, this, var, val);
- }
-
</del><span class="cx"> public int originate(CoreSession a_leg_session, String dest, int timeout, SWIGTYPE_p_switch_state_handler_table_t handlers) {
</span><span class="cx"> return freeswitchJNI.CoreSession_originate__SWIG_0(swigCPtr, this, CoreSession.getCPtr(a_leg_session), a_leg_session, dest, timeout, SWIGTYPE_p_switch_state_handler_table_t.getCPtr(handlers));
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javasrcorgfreeswitchswigfreeswitchJNIjava"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> public final static native int CoreSession_recordFile__SWIG_1(long jarg1, CoreSession jarg1_, String jarg2, int jarg3, int jarg4);
</span><span class="cx"> public final static native int CoreSession_recordFile__SWIG_2(long jarg1, CoreSession jarg1_, String jarg2, int jarg3);
</span><span class="cx"> public final static native int CoreSession_recordFile__SWIG_3(long jarg1, CoreSession jarg1_, String jarg2);
</span><del>- public final static native void CoreSession_setCallerData(long jarg1, CoreSession jarg1_, String jarg2, String jarg3);
</del><span class="cx"> public final static native int CoreSession_originate__SWIG_0(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_, String jarg3, int jarg4, long jarg5);
</span><span class="cx"> public final static native int CoreSession_originate__SWIG_1(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_, String jarg3, int jarg4);
</span><span class="cx"> public final static native int CoreSession_originate__SWIG_2(long jarg1, CoreSession jarg1_, long jarg2, CoreSession jarg2_, String jarg3);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_javaswitch_swig_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -2345,31 +2345,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT void JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1setCallerData(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3) {
- CoreSession *arg1 = (CoreSession *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
-
- (void)jenv;
- (void)jcls;
- (void)jarg1_;
- arg1 = *(CoreSession **)&jarg1;
- arg2 = 0;
- if (jarg2) {
- arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0);
- if (!arg2) return ;
- }
- arg3 = 0;
- if (jarg3) {
- arg3 = (char *)jenv->GetStringUTFChars(jarg3, 0);
- if (!arg3) return ;
- }
- (arg1)->setCallerData(arg2,arg3);
- if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
- if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3);
-}
-
-
</del><span class="cx"> SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1originate_1_1SWIG_10(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jlong jarg2, jobject jarg2_, jstring jarg3, jint jarg4, jlong jarg5) {
</span><span class="cx"> jint jresult = 0 ;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_luamod_lua_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -5459,36 +5459,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static int _wrap_CoreSession_setCallerData(lua_State* L) {
- int SWIG_arg = -1;
- CoreSession *arg1 = (CoreSession *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
-
- SWIG_check_num_args("setCallerData",3,3)
- if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("setCallerData",1,"CoreSession *");
- if(!lua_isstring(L,2)) SWIG_fail_arg("setCallerData",2,"char *");
- if(!lua_isstring(L,3)) SWIG_fail_arg("setCallerData",3,"char *");
-
- if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){
- SWIG_fail_ptr("CoreSession_setCallerData",1,SWIGTYPE_p_CoreSession);
- }
-
- arg2 = (char *)lua_tostring(L, 2);
- arg3 = (char *)lua_tostring(L, 3);
- (arg1)->setCallerData(arg2,arg3);
- SWIG_arg=0;
-
- return SWIG_arg;
-
- if(0) SWIG_fail;
-
-fail:
- lua_error(L);
- return SWIG_arg;
-}
-
-
</del><span class="cx"> static int _wrap_CoreSession_originate__SWIG_0(lua_State* L) {
</span><span class="cx"> int SWIG_arg = -1;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="lines">@@ -7372,7 +7342,6 @@
</span><span class="cx"> {"hangupCause", _wrap_CoreSession_hangupCause},
</span><span class="cx"> {"getState", _wrap_CoreSession_getState},
</span><span class="cx"> {"recordFile", _wrap_CoreSession_recordFile},
</span><del>- {"setCallerData", _wrap_CoreSession_setCallerData},
</del><span class="cx"> {"originate", _wrap_CoreSession_originate},
</span><span class="cx"> {"destroy", _wrap_CoreSession_destroy},
</span><span class="cx"> {"setDTMFCallback", _wrap_CoreSession_setDTMFCallback},
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -28848,18 +28848,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGEXPORT void SWIGSTDCALL CSharp_CoreSession_SetCallerData(void * jarg1, char * jarg2, char * jarg3) {
- CoreSession *arg1 = (CoreSession *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
-
- arg1 = (CoreSession *)jarg1;
- arg2 = (char *)jarg2;
- arg3 = (char *)jarg3;
- (arg1)->setCallerData(arg2,arg3);
-}
-
-
</del><span class="cx"> SWIGEXPORT int SWIGSTDCALL CSharp_CoreSession_originate(void * jarg1, void * jarg2, char * jarg3, int jarg4, void * jarg5) {
</span><span class="cx"> int jresult ;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -260,10 +260,6 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- public void SetCallerData(string var, string val) {
- freeswitchPINVOKE.CoreSession_SetCallerData(swigCPtr, var, val);
- }
-
</del><span class="cx"> protected int originate(CoreSession a_leg_session, string dest, int timeout, switch_state_handler_table handlers) {
</span><span class="cx"> int ret = freeswitchPINVOKE.CoreSession_originate(swigCPtr, CoreSession.getCPtr(a_leg_session), dest, timeout, switch_state_handler_table.getCPtr(handlers));
</span><span class="cx"> return ret;
</span><span class="lines">@@ -11420,9 +11416,6 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_RecordFile")]
</span><span class="cx"> public static extern int CoreSession_RecordFile(HandleRef jarg1, string jarg2, int jarg3, int jarg4, int jarg5);
</span><span class="cx">
</span><del>- [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_SetCallerData")]
- public static extern void CoreSession_SetCallerData(HandleRef jarg1, string jarg2, string jarg3);
-
</del><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_CoreSession_originate")]
</span><span class="cx"> public static extern int CoreSession_originate(HandleRef jarg1, HandleRef jarg2, string jarg3, int jarg4, HandleRef jarg5);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_perlfreeswitchpm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -414,7 +414,6 @@
</span><span class="cx"> *hangupCause = *freeswitchc::CoreSession_hangupCause;
</span><span class="cx"> *getState = *freeswitchc::CoreSession_getState;
</span><span class="cx"> *recordFile = *freeswitchc::CoreSession_recordFile;
</span><del>-*setCallerData = *freeswitchc::CoreSession_setCallerData;
</del><span class="cx"> *originate = *freeswitchc::CoreSession_originate;
</span><span class="cx"> *destroy = *freeswitchc::CoreSession_destroy;
</span><span class="cx"> *setDTMFCallback = *freeswitchc::CoreSession_setDTMFCallback;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_perlmod_perl_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -7080,55 +7080,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-XS(_wrap_CoreSession_setCallerData) {
- {
- CoreSession *arg1 = (CoreSession *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- int res2 ;
- char *buf2 = 0 ;
- int alloc2 = 0 ;
- int res3 ;
- char *buf3 = 0 ;
- int alloc3 = 0 ;
- int argvi = 0;
- dXSARGS;
-
- if ((items < 3) || (items > 3)) {
- SWIG_croak("Usage: CoreSession_setCallerData(self,var,val);");
- }
- res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_setCallerData" "', argument " "1"" of type '" "CoreSession *""'");
- }
- arg1 = reinterpret_cast< CoreSession * >(argp1);
- res2 = SWIG_AsCharPtrAndSize(ST(1), &buf2, NULL, &alloc2);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_setCallerData" "', argument " "2"" of type '" "char *""'");
- }
- arg2 = reinterpret_cast< char * >(buf2);
- res3 = SWIG_AsCharPtrAndSize(ST(2), &buf3, NULL, &alloc3);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setCallerData" "', argument " "3"" of type '" "char *""'");
- }
- arg3 = reinterpret_cast< char * >(buf3);
- (arg1)->setCallerData(arg2,arg3);
-
-
- if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
- if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
- XSRETURN(argvi);
- fail:
-
- if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
- if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
- SWIG_croak_null();
- }
-}
-
-
</del><span class="cx"> XS(_wrap_CoreSession_originate__SWIG_0) {
</span><span class="cx"> {
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="lines">@@ -11738,7 +11689,6 @@
</span><span class="cx"> {"freeswitchc::CoreSession_hangupCause", _wrap_CoreSession_hangupCause},
</span><span class="cx"> {"freeswitchc::CoreSession_getState", _wrap_CoreSession_getState},
</span><span class="cx"> {"freeswitchc::CoreSession_recordFile", _wrap_CoreSession_recordFile},
</span><del>-{"freeswitchc::CoreSession_setCallerData", _wrap_CoreSession_setCallerData},
</del><span class="cx"> {"freeswitchc::CoreSession_originate", _wrap_CoreSession_originate},
</span><span class="cx"> {"freeswitchc::CoreSession_destroy", _wrap_CoreSession_destroy},
</span><span class="cx"> {"freeswitchc::CoreSession_setDTMFCallback", _wrap_CoreSession_setDTMFCallback},
</span><span class="lines">@@ -12095,17 +12045,17 @@
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu");
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API");
</span><span class="cx"> SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t");
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP)));
</span><span class="cx"> SvREADONLY_on(sv);
</span><span class="cx"> } while(0) /*@SWIG@*/;
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE)));
</span><span class="cx"> SvREADONLY_on(sv);
</span><span class="cx"> } while(0) /*@SWIG@*/;
</span><del>- /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</del><ins>+ /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do {
</ins><span class="cx"> SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI);
</span><span class="cx"> sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK)));
</span><span class="cx"> SvREADONLY_on(sv);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_pythonfreeswitchpy"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -272,7 +272,6 @@
</span><span class="cx"> def hangupCause(*args): return _freeswitch.CoreSession_hangupCause(*args)
</span><span class="cx"> def getState(*args): return _freeswitch.CoreSession_getState(*args)
</span><span class="cx"> def recordFile(*args): return _freeswitch.CoreSession_recordFile(*args)
</span><del>- def setCallerData(*args): return _freeswitch.CoreSession_setCallerData(*args)
</del><span class="cx"> def originate(*args): return _freeswitch.CoreSession_originate(*args)
</span><span class="cx"> def destroy(*args): return _freeswitch.CoreSession_destroy(*args)
</span><span class="cx"> def setDTMFCallback(*args): return _freeswitch.CoreSession_setDTMFCallback(*args)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_pythonmod_python_wrapcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -7175,51 +7175,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWIGINTERN PyObject *_wrap_CoreSession_setCallerData(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- CoreSession *arg1 = (CoreSession *) 0 ;
- char *arg2 = (char *) 0 ;
- char *arg3 = (char *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- int res2 ;
- char *buf2 = 0 ;
- int alloc2 = 0 ;
- int res3 ;
- char *buf3 = 0 ;
- int alloc3 = 0 ;
- PyObject * obj0 = 0 ;
- PyObject * obj1 = 0 ;
- PyObject * obj2 = 0 ;
-
- if (!PyArg_ParseTuple(args,(char *)"OOO:CoreSession_setCallerData",&obj0,&obj1,&obj2)) SWIG_fail;
- res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CoreSession, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_setCallerData" "', argument " "1"" of type '" "CoreSession *""'");
- }
- arg1 = reinterpret_cast< CoreSession * >(argp1);
- res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CoreSession_setCallerData" "', argument " "2"" of type '" "char *""'");
- }
- arg2 = reinterpret_cast< char * >(buf2);
- res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CoreSession_setCallerData" "', argument " "3"" of type '" "char *""'");
- }
- arg3 = reinterpret_cast< char * >(buf3);
- (arg1)->setCallerData(arg2,arg3);
- resultobj = SWIG_Py_Void();
- if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
- if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
- return resultobj;
-fail:
- if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
- if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
- return NULL;
-}
-
-
</del><span class="cx"> SWIGINTERN PyObject *_wrap_CoreSession_originate__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
</span><span class="cx"> PyObject *resultobj = 0;
</span><span class="cx"> CoreSession *arg1 = (CoreSession *) 0 ;
</span><span class="lines">@@ -10474,7 +10429,6 @@
</span><span class="cx"> { (char *)"CoreSession_hangupCause", _wrap_CoreSession_hangupCause, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_getState", _wrap_CoreSession_getState, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_recordFile", _wrap_CoreSession_recordFile, METH_VARARGS, NULL},
</span><del>- { (char *)"CoreSession_setCallerData", _wrap_CoreSession_setCallerData, METH_VARARGS, NULL},
</del><span class="cx"> { (char *)"CoreSession_originate", _wrap_CoreSession_originate, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_destroy", _wrap_CoreSession_destroy, METH_VARARGS, NULL},
</span><span class="cx"> { (char *)"CoreSession_setDTMFCallback", _wrap_CoreSession_setDTMFCallback, METH_VARARGS, NULL},
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_cppcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_cpp.cpp (15005 => 15006)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_cpp.cpp 2009-09-28 17:16:31 UTC (rev 15005)
+++ freeswitch/trunk/src/switch_cpp.cpp 2009-09-28 19:46:38 UTC (rev 15006)
</span><span class="lines">@@ -981,8 +981,8 @@
</span><span class="cx"> handlers,
</span><span class="cx"> NULL,
</span><span class="cx"> NULL,
</span><del>- &caller_profile,
</del><span class="cx"> NULL,
</span><ins>+ NULL,
</ins><span class="cx"> SOF_NONE) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error Creating Outgoing Channel! [%s]\n", dest);
</span><span class="cx"> goto failed;
</span><span class="lines">@@ -1078,41 +1078,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_DECLARE(void) CoreSession::setCallerData(char *var, char *val) {
-
- this_check_void();
- sanity_check_noreturn;
-
- if (strcmp(var, "dialplan") == 0) {
- caller_profile.dialplan = val;
- }
- if (strcmp(var, "context") == 0) {
- caller_profile.context = val;
- }
- if (strcmp(var, "caller_id_name") == 0) {
- caller_profile.caller_id_name = val;
- }
- if (strcmp(var, "caller_id_number") == 0) {
- caller_profile.caller_id_number = val;
- }
- if (strcmp(var, "network_addr") == 0) {
- caller_profile.network_addr = val;
- }
- if (strcmp(var, "ani") == 0) {
- caller_profile.ani = val;
- }
- if (strcmp(var, "aniii") == 0) {
- caller_profile.aniii = val;
- }
- if (strcmp(var, "rdnis") == 0) {
- caller_profile.rdnis = val;
- }
- if (strcmp(var, "username") == 0) {
- caller_profile.username = val;
- }
-
-}
-
</del><span class="cx"> SWITCH_DECLARE(void) CoreSession::setHangupHook(void *hangup_func) {
</span><span class="cx">
</span><span class="cx"> this_check_void();
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>