From 376861fd8c2a45cb9710c535cdb55ab5c75aa858 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 11 Dec 2009 00:29:40 +0000 Subject: [PATCH] reswig git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15892 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../languages/mod_managed/freeswitch_wrap.cxx | 19 ++++--------------- src/mod/languages/mod_managed/managed/swig.cs | 18 ++++++------------ src/mod/languages/mod_perl/mod_perl_wrap.cpp | 6 +++--- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index 46ae163ea3..dbe71a238c 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -4329,19 +4329,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_CORE_DB_DONE_get() { } -SWIGEXPORT char * SWIGSTDCALL CSharp_switch_mprintf(char * jarg1) { - char * jresult ; - char *arg1 = (char *) 0 ; - void *arg2 = 0 ; - char *result = 0 ; - - arg1 = (char *)jarg1; - result = (char *)switch_mprintf((char const *)arg1,arg2); - jresult = SWIG_csharp_string_callback((const char *)result); - return jresult; -} - - SWIGEXPORT void * SWIGSTDCALL CSharp_switch_regex_compile(char * jarg1, int jarg2, void * jarg3, void * jarg4, void * jarg5) { void * jresult ; char *arg1 = (char *) 0 ; @@ -6258,11 +6245,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reporting_state(void * ja } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hangup_state(void * jarg1) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_hangup_state(void * jarg1, int jarg2) { switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_bool_t arg2 ; arg1 = (switch_core_session_t *)jarg1; - switch_core_session_hangup_state(arg1); + arg2 = (switch_bool_t)jarg2; + switch_core_session_hangup_state(arg1,arg2); } diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 765d964cff..dfc5b585ad 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -852,11 +852,6 @@ public class freeswitch { return ret; } - public static string switch_mprintf(string zFormat) { - string ret = freeswitchPINVOKE.switch_mprintf(zFormat); - return ret; - } - public static SWIGTYPE_p_real_pcre switch_regex_compile(string pattern, int options, ref string errorptr, SWIGTYPE_p_int erroroffset, SWIGTYPE_p_unsigned_char tables) { IntPtr cPtr = freeswitchPINVOKE.switch_regex_compile(pattern, options, ref errorptr, SWIGTYPE_p_int.getCPtr(erroroffset), SWIGTYPE_p_unsigned_char.getCPtr(tables)); SWIGTYPE_p_real_pcre ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_real_pcre(cPtr, false); @@ -1199,8 +1194,8 @@ public class freeswitch { freeswitchPINVOKE.switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session.getCPtr(session)); } - public static void switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session session) { - freeswitchPINVOKE.switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session.getCPtr(session)); + public static void switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session session, switch_bool_t force) { + freeswitchPINVOKE.switch_core_session_hangup_state(SWIGTYPE_p_switch_core_session.getCPtr(session), (int)force); } public static uint switch_core_session_count() { @@ -5911,9 +5906,6 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_CORE_DB_DONE_get")] public static extern int SWITCH_CORE_DB_DONE_get(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_mprintf")] - public static extern string switch_mprintf(string jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_regex_compile")] public static extern IntPtr switch_regex_compile(string jarg1, int jarg2, ref string jarg3, HandleRef jarg4, HandleRef jarg5); @@ -6353,7 +6345,7 @@ class freeswitchPINVOKE { public static extern void switch_core_session_reporting_state(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hangup_state")] - public static extern void switch_core_session_hangup_state(HandleRef jarg1); + public static extern void switch_core_session_hangup_state(HandleRef jarg1, int jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_count")] public static extern uint switch_core_session_count(); @@ -19207,6 +19199,7 @@ public enum switch_channel_flag_t { CF_BYPASS_MEDIA_AFTER_BRIDGE, CF_LEG_HOLDING, CF_BROADCAST_DROP_MEDIA, + CF_EARLY_HANGUP, CF_FLAG_MAX } @@ -20444,7 +20437,8 @@ namespace FreeSWITCH.Native { SCF_VG = (1 << 3), SCF_RESTART = (1 << 4), SCF_SHUTDOWN_REQUESTED = (1 << 5), - SCF_USE_AUTO_NAT = (1 << 6) + SCF_USE_AUTO_NAT = (1 << 6), + SCF_EARLY_HANGUP = (1 << 7) } } diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp index 34787520d8..4dcb7cf32b 100644 --- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp +++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp @@ -12073,17 +12073,17 @@ XS(SWIG_init) { SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv);