From 04c90a3c7f57ed44788de90728a813093714fa1a Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 8 Oct 2009 17:15:01 +0000 Subject: [PATCH] swigall git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15120 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- .../languages/mod_managed/freeswitch_wrap.cxx | 105 ++++++++++++++++++ src/mod/languages/mod_managed/managed/swig.cs | 65 ++++++++++- src/mod/languages/mod_perl/mod_perl_wrap.cpp | 6 +- 3 files changed, 172 insertions(+), 4 deletions(-) diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index 92b9c65670..406eb0866b 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -1114,6 +1114,17 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_HOLDING_UUID_VARIABLE_get() { } +SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_SOFT_HOLDING_UUID_VARIABLE_get() { + char * jresult ; + char *result = 0 ; + + result = (char *) "soft_holding_uuid"; + + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_API_BRIDGE_END_VARIABLE_get() { char * jresult ; char *result = 0 ; @@ -5130,6 +5141,32 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message__line_get(void * j } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_set(void * jarg1, void * jarg2) { + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char **arg2 ; + + arg1 = (switch_core_session_message *)jarg1; + arg2 = (char **)jarg2; + { + size_t ii; + char const * *b = (char const * *) arg1->string_array_arg; + for (ii = 0; ii < (size_t)10; ii++) b[ii] = *((char const * *) arg2 + ii); + } +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_message_string_array_arg_get(void * jarg1) { + void * jresult ; + switch_core_session_message *arg1 = (switch_core_session_message *) 0 ; + char **result = 0 ; + + arg1 = (switch_core_session_message *)jarg1; + result = (char **)(char **) ((arg1)->string_array_arg); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_core_session_message() { void * jresult ; switch_core_session_message *result = 0 ; @@ -9721,6 +9758,64 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_caller_id_number_get( } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_set(void * jarg1, char * jarg2) { + switch_caller_profile *arg1 = (switch_caller_profile *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_caller_profile *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->callee_id_name = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->callee_id_name, (const char *)arg2); + } else { + arg1->callee_id_name = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_name_get(void * jarg1) { + char * jresult ; + switch_caller_profile *arg1 = (switch_caller_profile *) 0 ; + char *result = 0 ; + + arg1 = (switch_caller_profile *)jarg1; + result = (char *) ((arg1)->callee_id_name); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_set(void * jarg1, char * jarg2) { + switch_caller_profile *arg1 = (switch_caller_profile *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_caller_profile *)jarg1; + arg2 = (char *)jarg2; + { + if (arg2) { + arg1->callee_id_number = (char const *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->callee_id_number, (const char *)arg2); + } else { + arg1->callee_id_number = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_caller_profile_callee_id_number_get(void * jarg1) { + char * jresult ; + switch_caller_profile *arg1 = (switch_caller_profile *) 0 ; + char *result = 0 ; + + arg1 = (switch_caller_profile *)jarg1; + result = (char *) ((arg1)->callee_id_number); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_caller_ton_set(void * jarg1, unsigned char jarg2) { switch_caller_profile *arg1 = (switch_caller_profile *) 0 ; uint8_t arg2 ; @@ -22668,6 +22763,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_originate(void * jarg1, void * jarg } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_ivr_bridge_display(void * jarg1, void * jarg2) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_core_session_t *arg2 = (switch_core_session_t *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_core_session_t *)jarg2; + switch_ivr_bridge_display(arg1,arg2); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_multi_threaded_bridge(void * jarg1, void * jarg2, void * jarg3, void * jarg4, void * jarg5) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index cec8cb9e05..10d5ebe5af 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -3324,6 +3324,10 @@ public class freeswitch { return ret; } + public static void switch_ivr_bridge_display(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_switch_core_session peer_session) { + freeswitchPINVOKE.switch_ivr_bridge_display(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_switch_core_session.getCPtr(peer_session)); + } + public static switch_status_t switch_ivr_multi_threaded_bridge(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_switch_core_session peer_session, SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_p_void_unsigned_int__switch_status_t dtmf_callback, SWIGTYPE_p_void session_data, SWIGTYPE_p_void peer_session_data) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_multi_threaded_bridge(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_switch_core_session.getCPtr(peer_session), SWIGTYPE_p_f_p_switch_core_session_p_void_enum_switch_input_type_t_p_void_unsigned_int__switch_status_t.getCPtr(dtmf_callback), SWIGTYPE_p_void.getCPtr(session_data), SWIGTYPE_p_void.getCPtr(peer_session_data)); return ret; @@ -4361,6 +4365,7 @@ public class freeswitch { public static readonly string SWITCH_CHANNEL_EXECUTE_ON_RING_VARIABLE = freeswitchPINVOKE.SWITCH_CHANNEL_EXECUTE_ON_RING_VARIABLE_get(); public static readonly string SWITCH_CALL_TIMEOUT_VARIABLE = freeswitchPINVOKE.SWITCH_CALL_TIMEOUT_VARIABLE_get(); public static readonly string SWITCH_HOLDING_UUID_VARIABLE = freeswitchPINVOKE.SWITCH_HOLDING_UUID_VARIABLE_get(); + public static readonly string SWITCH_SOFT_HOLDING_UUID_VARIABLE = freeswitchPINVOKE.SWITCH_SOFT_HOLDING_UUID_VARIABLE_get(); public static readonly string SWITCH_API_BRIDGE_END_VARIABLE = freeswitchPINVOKE.SWITCH_API_BRIDGE_END_VARIABLE_get(); public static readonly string SWITCH_API_HANGUP_HOOK_VARIABLE = freeswitchPINVOKE.SWITCH_API_HANGUP_HOOK_VARIABLE_get(); public static readonly string SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE = freeswitchPINVOKE.SWITCH_SESSION_IN_HANGUP_HOOK_VARIABLE_get(); @@ -4876,6 +4881,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_HOLDING_UUID_VARIABLE_get")] public static extern string SWITCH_HOLDING_UUID_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_SOFT_HOLDING_UUID_VARIABLE_get")] + public static extern string SWITCH_SOFT_HOLDING_UUID_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_API_BRIDGE_END_VARIABLE_get")] public static extern string SWITCH_API_BRIDGE_END_VARIABLE_get(); @@ -5863,6 +5871,12 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message__line_get")] public static extern int switch_core_session_message__line_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message_string_array_arg_set")] + public static extern void switch_core_session_message_string_array_arg_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message_string_array_arg_get")] + public static extern IntPtr switch_core_session_message_string_array_arg_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_core_session_message")] public static extern IntPtr new_switch_core_session_message(); @@ -6871,6 +6885,18 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_caller_id_number_get")] public static extern string switch_caller_profile_caller_id_number_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_callee_id_name_set")] + public static extern void switch_caller_profile_callee_id_name_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_callee_id_name_get")] + public static extern string switch_caller_profile_callee_id_name_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_callee_id_number_set")] + public static extern void switch_caller_profile_callee_id_number_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_callee_id_number_get")] + public static extern string switch_caller_profile_callee_id_number_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_caller_ton_set")] public static extern void switch_caller_profile_caller_ton_set(HandleRef jarg1, byte jarg2); @@ -9988,6 +10014,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_originate")] public static extern int switch_ivr_originate(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, string jarg4, uint jarg5, HandleRef jarg6, string jarg7, string jarg8, HandleRef jarg9, HandleRef jarg10, uint jarg11); + [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_bridge_display")] + public static extern void switch_ivr_bridge_display(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_multi_threaded_bridge")] public static extern int switch_ivr_multi_threaded_bridge(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4, HandleRef jarg5); @@ -17673,6 +17702,26 @@ public class switch_caller_profile : IDisposable { } } + public string callee_id_name { + set { + freeswitchPINVOKE.switch_caller_profile_callee_id_name_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_caller_profile_callee_id_name_get(swigCPtr); + return ret; + } + } + + public string callee_id_number { + set { + freeswitchPINVOKE.switch_caller_profile_callee_id_number_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_caller_profile_callee_id_number_get(swigCPtr); + return ret; + } + } + public byte caller_ton { set { freeswitchPINVOKE.switch_caller_profile_caller_ton_set(swigCPtr, value); @@ -17993,7 +18042,7 @@ public enum switch_channel_flag_t { CF_ANSWERED = 1, CF_OUTBOUND, CF_EARLY_MEDIA, - CF_ORIGINATOR, + CF_BRIDGE_ORIGINATOR, CF_TRANSFER, CF_ACCEPT_CNG, CF_REDIRECT, @@ -18027,6 +18076,8 @@ public enum switch_channel_flag_t { CF_REPORTING, CF_PARK, CF_TIMESTAMP_SET, + CF_ORIGINATOR, + CF_XFER_ZOMBIE, CF_FLAG_MAX } @@ -19479,6 +19530,17 @@ public class switch_core_session_message : IDisposable { } } + public SWIGTYPE_p_p_char string_array_arg { + set { + freeswitchPINVOKE.switch_core_session_message_string_array_arg_set(swigCPtr, SWIGTYPE_p_p_char.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.switch_core_session_message_string_array_arg_get(swigCPtr); + SWIGTYPE_p_p_char ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_p_char(cPtr, false); + return ret; + } + } + public switch_core_session_message() : this(freeswitchPINVOKE.new_switch_core_session_message(), true) { } @@ -20907,6 +20969,7 @@ public enum switch_event_types_t { SWITCH_EVENT_NAT, SWITCH_EVENT_RECORD_START, SWITCH_EVENT_RECORD_STOP, + SWITCH_EVENT_CALL_UPDATE, SWITCH_EVENT_ALL } diff --git a/src/mod/languages/mod_perl/mod_perl_wrap.cpp b/src/mod/languages/mod_perl/mod_perl_wrap.cpp index 72280857f0..514b323c12 100644 --- a/src/mod/languages/mod_perl/mod_perl_wrap.cpp +++ b/src/mod/languages/mod_perl/mod_perl_wrap.cpp @@ -12045,17 +12045,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/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/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/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/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/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/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);