From f2792c9ea5188082ddfec90ab1a9f6c4e548a57a Mon Sep 17 00:00:00 2001 From: Mike Jerris Date: Fri, 6 Jan 2017 17:13:39 -0600 Subject: [PATCH] swigall --- .../src/org/freeswitch/swig/CoreSession.java | 4 -- .../org/freeswitch/swig/freeswitchJNI.java | 1 - .../languages/mod_java/switch_swig_wrap.cpp | 22 ------- src/mod/languages/mod_lua/mod_lua_wrap.cpp | 28 --------- .../languages/mod_managed/freeswitch_wrap.cxx | 60 +++++++++++++++++++ src/mod/languages/mod_managed/managed/swig.cs | 35 ++++++++++- src/mod/languages/mod_perl/freeswitch.pm | 1 - src/mod/languages/mod_perl/mod_perl_wrap.cpp | 40 ------------- src/mod/languages/mod_python/freeswitch.py | 1 - .../languages/mod_python/mod_python_wrap.cpp | 35 ----------- 10 files changed, 94 insertions(+), 133 deletions(-) diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java index ac70d8cd8c..addf2b8385 100644 --- a/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java +++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/CoreSession.java @@ -126,10 +126,6 @@ public class CoreSession { return freeswitchJNI.CoreSession_answer(swigCPtr, this); } - public int print(String txt) { - return freeswitchJNI.CoreSession_print(swigCPtr, this, txt); - } - public int preAnswer() { return freeswitchJNI.CoreSession_preAnswer(swigCPtr, this); } diff --git a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java index 01149a2b61..1b94de81d6 100644 --- a/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java +++ b/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java @@ -113,7 +113,6 @@ public class freeswitchJNI { public final static native String CoreSession_voice_name_get(long jarg1, CoreSession jarg1_); public final static native int CoreSession_insertFile(long jarg1, CoreSession jarg1_, String jarg2, String jarg3, int jarg4); public final static native int CoreSession_answer(long jarg1, CoreSession jarg1_); - public final static native int CoreSession_print(long jarg1, CoreSession jarg1_, String jarg2); public final static native int CoreSession_preAnswer(long jarg1, CoreSession jarg1_); public final static native void CoreSession_hangup(long jarg1, CoreSession jarg1_, String jarg2); public final static native void CoreSession_hangupState(long jarg1, CoreSession jarg1_); diff --git a/src/mod/languages/mod_java/switch_swig_wrap.cpp b/src/mod/languages/mod_java/switch_swig_wrap.cpp index 81a8155856..28583861bc 100644 --- a/src/mod/languages/mod_java/switch_swig_wrap.cpp +++ b/src/mod/languages/mod_java/switch_swig_wrap.cpp @@ -2166,28 +2166,6 @@ SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1answ } -SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1print(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2) { - jint jresult = 0 ; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - int result; - - (void)jenv; - (void)jcls; - (void)jarg1_; - arg1 = *(CoreSession **)&jarg1; - arg2 = 0; - if (jarg2) { - arg2 = (char *)jenv->GetStringUTFChars(jarg2, 0); - if (!arg2) return 0; - } - result = (int)(arg1)->print(arg2); - jresult = (jint)result; - if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); - return jresult; -} - - SWIGEXPORT jint JNICALL Java_org_freeswitch_swig_freeswitchJNI_CoreSession_1preAnswer(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) { jint jresult = 0 ; CoreSession *arg1 = (CoreSession *) 0 ; diff --git a/src/mod/languages/mod_lua/mod_lua_wrap.cpp b/src/mod/languages/mod_lua/mod_lua_wrap.cpp index 5dd9efdf3d..6cd71f4fbc 100644 --- a/src/mod/languages/mod_lua/mod_lua_wrap.cpp +++ b/src/mod/languages/mod_lua/mod_lua_wrap.cpp @@ -4967,33 +4967,6 @@ fail: } -static int _wrap_CoreSession_print(lua_State* L) { - int SWIG_arg = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - int result; - - SWIG_check_num_args("CoreSession::print",2,2) - if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("CoreSession::print",1,"CoreSession *"); - if(!SWIG_lua_isnilstring(L,2)) SWIG_fail_arg("CoreSession::print",2,"char *"); - - if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_CoreSession,0))){ - SWIG_fail_ptr("CoreSession_print",1,SWIGTYPE_p_CoreSession); - } - - arg2 = (char *)lua_tostring(L, 2); - result = (int)(arg1)->print(arg2); - lua_pushnumber(L, (lua_Number) result); SWIG_arg++; - return SWIG_arg; - - if(0) SWIG_fail; - -fail: - lua_error(L); - return SWIG_arg; -} - - static int _wrap_CoreSession_preAnswer(lua_State* L) { int SWIG_arg = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -6685,7 +6658,6 @@ delete arg1; static swig_lua_method swig_CoreSession_methods[] = { {"insertFile", _wrap_CoreSession_insertFile}, {"answer", _wrap_CoreSession_answer}, - {"print", _wrap_CoreSession_print}, {"preAnswer", _wrap_CoreSession_preAnswer}, {"hangup", _wrap_CoreSession_hangup}, {"hangupState", _wrap_CoreSession_hangupState}, diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index 611c839a66..6efc94daac 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -19819,6 +19819,66 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_url_decode(char * jarg1) { } +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_url_encode_opt(void * jarg1, char * jarg2, int jarg3) { + char * jresult ; + switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; + char *arg2 = (char *) 0 ; + switch_bool_t arg3 ; + char *result = 0 ; + + arg1 = (switch_memory_pool_t *)jarg1; + arg2 = (char *)jarg2; + arg3 = (switch_bool_t)jarg3; + result = (char *)switch_core_url_encode_opt(arg1,(char const *)arg2,arg3); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_url_encode(void * jarg1, char * jarg2) { + char * jresult ; + switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ; + char *arg2 = (char *) 0 ; + char *result = 0 ; + + arg1 = (switch_memory_pool_t *)jarg1; + arg2 = (char *)jarg2; + result = (char *)switch_core_url_encode(arg1,(char const *)arg2); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_url_encode_opt(void * jarg1, char * jarg2, int jarg3) { + char * jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + switch_bool_t arg3 ; + char *result = 0 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (char *)jarg2; + arg3 = (switch_bool_t)jarg3; + result = (char *)switch_core_session_url_encode_opt(arg1,(char const *)arg2,arg3); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_session_url_encode(void * jarg1, char * jarg2) { + char * jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + char *arg2 = (char *) 0 ; + char *result = 0 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (char *)jarg2; + result = (char *)switch_core_session_url_encode(arg1,(char const *)arg2); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_simple_email(char * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7) { int jresult ; char *arg1 = (char *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 10bec9a8c8..dac155a1cc 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -4288,6 +4288,26 @@ else return ret; } + public static string switch_core_url_encode_opt(SWIGTYPE_p_apr_pool_t pool, string url, switch_bool_t double_encode) { + string ret = freeswitchPINVOKE.switch_core_url_encode_opt(SWIGTYPE_p_apr_pool_t.getCPtr(pool), url, (int)double_encode); + return ret; + } + + public static string switch_core_url_encode(SWIGTYPE_p_apr_pool_t pool, string url) { + string ret = freeswitchPINVOKE.switch_core_url_encode(SWIGTYPE_p_apr_pool_t.getCPtr(pool), url); + return ret; + } + + public static string switch_core_session_url_encode_opt(SWIGTYPE_p_switch_core_session session, string url, switch_bool_t double_encode) { + string ret = freeswitchPINVOKE.switch_core_session_url_encode_opt(SWIGTYPE_p_switch_core_session.getCPtr(session), url, (int)double_encode); + return ret; + } + + public static string switch_core_session_url_encode(SWIGTYPE_p_switch_core_session session, string url) { + string ret = freeswitchPINVOKE.switch_core_session_url_encode(SWIGTYPE_p_switch_core_session.getCPtr(session), url); + return ret; + } + public static switch_bool_t switch_simple_email(string to, string from, string headers, string body, string file, string convert_cmd, string convert_ext) { switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_simple_email(to, from, headers, body, file, convert_cmd, convert_ext); return ret; @@ -12829,6 +12849,18 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_url_decode")] public static extern string switch_url_decode(string jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_url_encode_opt")] + public static extern string switch_core_url_encode_opt(HandleRef jarg1, string jarg2, int jarg3); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_url_encode")] + public static extern string switch_core_url_encode(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_url_encode_opt")] + public static extern string switch_core_session_url_encode_opt(HandleRef jarg1, string jarg2, int jarg3); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_url_encode")] + public static extern string switch_core_session_url_encode(HandleRef jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_simple_email")] public static extern int switch_simple_email(string jarg1, string jarg2, string jarg3, string jarg4, string jarg5, string jarg6, string jarg7); @@ -29742,7 +29774,8 @@ public enum switch_channel_app_flag_t { CF_APP_T38 = (1 << 1), CF_APP_T38_REQ = (1 << 2), CF_APP_T38_FAIL = (1 << 3), - CF_APP_T38_NEGOTIATED = (1 << 4) + CF_APP_T38_NEGOTIATED = (1 << 4), + CF_APP_T38_POSSIBLE = (1 << 5) } } diff --git a/src/mod/languages/mod_perl/freeswitch.pm b/src/mod/languages/mod_perl/freeswitch.pm index 1496b31425..6111f48f71 100644 --- a/src/mod/languages/mod_perl/freeswitch.pm +++ b/src/mod/languages/mod_perl/freeswitch.pm @@ -418,7 +418,6 @@ sub DESTROY { *swig_voice_name_set = *freeswitchc::CoreSession_voice_name_set; *insertFile = *freeswitchc::CoreSession_insertFile; *answer = *freeswitchc::CoreSession_answer; -*print = *freeswitchc::CoreSession_print; *preAnswer = *freeswitchc::CoreSession_preAnswer; *hangup = *freeswitchc::CoreSession_hangup; *hangupState = *freeswitchc::CoreSession_hangupState; diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp index 1cfd61c91b..541c11b04e 100644 --- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp +++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp @@ -5941,45 +5941,6 @@ XS(_wrap_CoreSession_answer) { } -XS(_wrap_CoreSession_print) { - { - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - int argvi = 0; - int result; - dXSARGS; - - if ((items < 2) || (items > 2)) { - SWIG_croak("Usage: CoreSession_print(self,txt);"); - } - res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_CoreSession, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CoreSession_print" "', 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_print" "', argument " "2"" of type '" "char *""'"); - } - arg2 = reinterpret_cast< char * >(buf2); - result = (int)(arg1)->print(arg2); - ST(argvi) = SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ; - - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - XSRETURN(argvi); - fail: - - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - SWIG_croak_null(); - } -} - - XS(_wrap_CoreSession_preAnswer) { { CoreSession *arg1 = (CoreSession *) 0 ; @@ -10456,7 +10417,6 @@ static swig_command_info swig_commands[] = { {"freeswitchc::CoreSession_voice_name_get", _wrap_CoreSession_voice_name_get}, {"freeswitchc::CoreSession_insertFile", _wrap_CoreSession_insertFile}, {"freeswitchc::CoreSession_answer", _wrap_CoreSession_answer}, -{"freeswitchc::CoreSession_print", _wrap_CoreSession_print}, {"freeswitchc::CoreSession_preAnswer", _wrap_CoreSession_preAnswer}, {"freeswitchc::CoreSession_hangup", _wrap_CoreSession_hangup}, {"freeswitchc::CoreSession_hangupState", _wrap_CoreSession_hangupState}, diff --git a/src/mod/languages/mod_python/freeswitch.py b/src/mod/languages/mod_python/freeswitch.py index 4c9e4dd6b4..967e3eb51e 100644 --- a/src/mod/languages/mod_python/freeswitch.py +++ b/src/mod/languages/mod_python/freeswitch.py @@ -317,7 +317,6 @@ class CoreSession(_object): if _newclass:voice_name = _swig_property(_freeswitch.CoreSession_voice_name_get, _freeswitch.CoreSession_voice_name_set) def insertFile(self, *args): return _freeswitch.CoreSession_insertFile(self, *args) def answer(self): return _freeswitch.CoreSession_answer(self) - def _print(self, *args): return _freeswitch.CoreSession__print(self, *args) def preAnswer(self): return _freeswitch.CoreSession_preAnswer(self) def hangup(self, cause="normal_clearing"): return _freeswitch.CoreSession_hangup(self, cause) def hangupState(self): return _freeswitch.CoreSession_hangupState(self) diff --git a/src/mod/languages/mod_python/mod_python_wrap.cpp b/src/mod/languages/mod_python/mod_python_wrap.cpp index f39f9e61ce..aa71108c2b 100644 --- a/src/mod/languages/mod_python/mod_python_wrap.cpp +++ b/src/mod/languages/mod_python/mod_python_wrap.cpp @@ -6897,40 +6897,6 @@ fail: } -SWIGINTERN PyObject *_wrap_CoreSession__print(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - CoreSession *arg1 = (CoreSession *) 0 ; - char *arg2 = (char *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - int res2 ; - char *buf2 = 0 ; - int alloc2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - int result; - - if (!PyArg_ParseTuple(args,(char *)"OO:CoreSession__print",&obj0,&obj1)) 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__print" "', 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__print" "', argument " "2"" of type '" "char *""'"); - } - arg2 = reinterpret_cast< char * >(buf2); - result = (int)(arg1)->print(arg2); - resultobj = SWIG_From_int(static_cast< int >(result)); - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - return resultobj; -fail: - if (alloc2 == SWIG_NEWOBJ) delete[] buf2; - return NULL; -} - - SWIGINTERN PyObject *_wrap_CoreSession_preAnswer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CoreSession *arg1 = (CoreSession *) 0 ; @@ -10296,7 +10262,6 @@ static PyMethodDef SwigMethods[] = { { (char *)"CoreSession_voice_name_get", _wrap_CoreSession_voice_name_get, METH_VARARGS, NULL}, { (char *)"CoreSession_insertFile", _wrap_CoreSession_insertFile, METH_VARARGS, NULL}, { (char *)"CoreSession_answer", _wrap_CoreSession_answer, METH_VARARGS, NULL}, - { (char *)"CoreSession__print", _wrap_CoreSession__print, METH_VARARGS, NULL}, { (char *)"CoreSession_preAnswer", _wrap_CoreSession_preAnswer, METH_VARARGS, NULL}, { (char *)"CoreSession_hangup", _wrap_CoreSession_hangup, METH_VARARGS, NULL}, { (char *)"CoreSession_hangupState", _wrap_CoreSession_hangupState, METH_VARARGS, NULL},