[Freeswitch-trunk] [commit] r13551 - in freeswitch/trunk/src: . include mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl
FreeSWITCH SVN
anthm at freeswitch.org
Tue Jun 2 12:50:06 PDT 2009
Author: anthm
Date: Tue Jun 2 14:50:04 2009
New Revision: 13551
Log:
fix recursive file record during file playback issue IRC-00
Modified:
freeswitch/trunk/src/include/switch_cpp.h
freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs
freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp
freeswitch/trunk/src/switch_cpp.cpp
Modified: freeswitch/trunk/src/include/switch_cpp.h
==============================================================================
--- freeswitch/trunk/src/include/switch_cpp.h (original)
+++ freeswitch/trunk/src/include/switch_cpp.h Tue Jun 2 14:50:04 2009
@@ -203,7 +203,6 @@
char *xml_cdr_text;
void store_file_handle(switch_file_handle_t *fh);
void *on_hangup; // language specific callback function, cast as void *
- switch_file_handle_t local_fh;
switch_file_handle_t *fhp;
char dtmf_buf[512];
Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Jun 2 14:50:04 2009
@@ -5718,6 +5718,32 @@
}
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_memory_pool_set_data(void * jarg1, char * jarg2, void * jarg3) {
+ switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ void *arg3 = (void *) 0 ;
+
+ arg1 = (switch_memory_pool_t *)jarg1;
+ arg2 = (char *)jarg2;
+ arg3 = (void *)jarg3;
+ switch_core_memory_pool_set_data(arg1,(char const *)arg2,arg3);
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_memory_pool_get_data(void * jarg1, char * jarg2) {
+ void * jresult ;
+ switch_memory_pool_t *arg1 = (switch_memory_pool_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ void *result = 0 ;
+
+ arg1 = (switch_memory_pool_t *)jarg1;
+ arg2 = (char *)jarg2;
+ result = (void *)switch_core_memory_pool_get_data(arg1,(char const *)arg2);
+ jresult = (void *)result;
+ return jresult;
+}
+
+
SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_run(void * jarg1) {
switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
@@ -5968,6 +5994,14 @@
}
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_reporting_state(void * jarg1) {
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+
+ arg1 = (switch_core_session_t *)jarg1;
+ switch_core_session_reporting_state(arg1);
+}
+
+
SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_core_session_count() {
unsigned long jresult ;
uint32_t result;
@@ -6082,6 +6116,18 @@
}
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_force_locate(char * jarg1) {
+ void * jresult ;
+ char *arg1 = (char *) 0 ;
+ switch_core_session_t *result = 0 ;
+
+ arg1 = (char *)jarg1;
+ result = (switch_core_session_t *)switch_core_session_force_locate((char const *)arg1);
+ jresult = (void *)result;
+ return jresult;
+}
+
+
SWIGEXPORT char * SWIGSTDCALL CSharp_switch_core_get_variable(char * jarg1) {
char * jresult ;
char *arg1 = (char *) 0 ;
@@ -6142,6 +6188,20 @@
}
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_partner(void * jarg1, void * jarg2) {
+ int jresult ;
+ switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;
+ switch_core_session_t **arg2 = (switch_core_session_t **) 0 ;
+ switch_status_t result;
+
+ arg1 = (switch_core_session_t *)jarg1;
+ arg2 = (switch_core_session_t **)jarg2;
+ result = (switch_status_t)switch_core_session_get_partner(arg1,arg2);
+ jresult = result;
+ return jresult;
+}
+
+
SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_message_send(char * jarg1, void * jarg2) {
int jresult ;
char *arg1 = (char *) 0 ;
@@ -8687,17 +8747,19 @@
}
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, int jarg3) {
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_find_local_ip(char * jarg1, int jarg2, void * jarg3, int jarg4) {
int jresult ;
char *arg1 = (char *) 0 ;
int arg2 ;
- int arg3 ;
+ int *arg3 = (int *) 0 ;
+ int arg4 ;
switch_status_t result;
arg1 = (char *)jarg1;
arg2 = (int)jarg2;
- arg3 = (int)jarg3;
- result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3);
+ arg3 = (int *)jarg3;
+ arg4 = (int)jarg4;
+ result = (switch_status_t)switch_find_local_ip(arg1,arg2,arg3,arg4);
jresult = result;
return jresult;
}
@@ -9029,7 +9091,7 @@
arg1 = (char *)jarg1;
arg2 = (char *)jarg2;
arg3 = (size_t)jarg3;
- result = (switch_bool_t)switch_ast2regex(arg1,arg2,arg3);
+ result = (switch_bool_t)switch_ast2regex((char const *)arg1,arg2,arg3);
jresult = result;
return jresult;
}
@@ -9195,17 +9257,19 @@
}
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, int jarg2, void * jarg3) {
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_network_list_create(void * jarg1, char * jarg2, int jarg3, void * jarg4) {
int jresult ;
switch_network_list_t **arg1 = (switch_network_list_t **) 0 ;
- switch_bool_t arg2 ;
- switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ switch_bool_t arg3 ;
+ switch_memory_pool_t *arg4 = (switch_memory_pool_t *) 0 ;
switch_status_t result;
arg1 = (switch_network_list_t **)jarg1;
- arg2 = (switch_bool_t)jarg2;
- arg3 = (switch_memory_pool_t *)jarg3;
- result = (switch_status_t)switch_network_list_create(arg1,arg2,arg3);
+ arg2 = (char *)jarg2;
+ arg3 = (switch_bool_t)jarg3;
+ arg4 = (switch_memory_pool_t *)jarg4;
+ result = (switch_status_t)switch_network_list_create(arg1,(char const *)arg2,arg3,arg4);
jresult = result;
return jresult;
}
@@ -10587,6 +10651,29 @@
}
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_extra_data_set(void * jarg1, void * jarg2) {
+ switch_frame *arg1 = (switch_frame *) 0 ;
+ void *arg2 = (void *) 0 ;
+
+ arg1 = (switch_frame *)jarg1;
+ arg2 = (void *)jarg2;
+ if (arg1) (arg1)->extra_data = arg2;
+
+}
+
+
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_frame_extra_data_get(void * jarg1) {
+ void * jresult ;
+ switch_frame *arg1 = (switch_frame *) 0 ;
+ void *result = 0 ;
+
+ arg1 = (switch_frame *)jarg1;
+ result = (void *) ((arg1)->extra_data);
+ jresult = (void *)result;
+ return jresult;
+}
+
+
SWIGEXPORT void SWIGSTDCALL CSharp_switch_frame_data_set(void * jarg1, void * jarg2) {
switch_frame *arg1 = (switch_frame *) 0 ;
void *arg2 = (void *) 0 ;
@@ -18478,6 +18565,18 @@
}
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_wait_for_state_timeout(void * jarg1, int jarg2, unsigned long jarg3) {
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ switch_channel_state_t arg2 ;
+ uint32_t arg3 ;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (switch_channel_state_t)jarg2;
+ arg3 = (uint32_t)jarg3;
+ switch_channel_wait_for_state_timeout(arg1,arg2,arg3);
+}
+
+
SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_wait_for_flag(void * jarg1, int jarg2, int jarg3, unsigned long jarg4, void * jarg5) {
int jresult ;
switch_channel_t *arg1 = (switch_channel_t *) 0 ;
@@ -18933,6 +19032,20 @@
}
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_channel_test_flag_partner(void * jarg1, int jarg2) {
+ unsigned long jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ switch_channel_flag_t arg2 ;
+ uint32_t result;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (switch_channel_flag_t)jarg2;
+ result = (uint32_t)switch_channel_test_flag_partner(arg1,arg2);
+ jresult = (unsigned long)result;
+ return jresult;
+}
+
+
SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_state_flag(void * jarg1, int jarg2) {
switch_channel_t *arg1 = (switch_channel_t *) 0 ;
switch_channel_flag_t arg2 ;
@@ -24398,6 +24511,20 @@
}
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str_dynamic(char * jarg1, int jarg2) {
+ void * jresult ;
+ char *arg1 = (char *) 0 ;
+ switch_bool_t arg2 ;
+ switch_xml_t result;
+
+ arg1 = (char *)jarg1;
+ arg2 = (switch_bool_t)jarg2;
+ result = (switch_xml_t)switch_xml_parse_str_dynamic(arg1,arg2);
+ jresult = (void *)result;
+ return jresult;
+}
+
+
SWIGEXPORT void * SWIGSTDCALL CSharp_switch_xml_parse_str(char * jarg1, void * jarg2) {
void * jresult ;
char *arg1 = (char *) 0 ;
Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Jun 2 14:50:04 2009
@@ -1050,6 +1050,16 @@
return ret;
}
+ public static void switch_core_memory_pool_set_data(SWIGTYPE_p_apr_pool_t pool, string key, SWIGTYPE_p_void data) {
+ freeswitchPINVOKE.switch_core_memory_pool_set_data(SWIGTYPE_p_apr_pool_t.getCPtr(pool), key, SWIGTYPE_p_void.getCPtr(data));
+ }
+
+ public static SWIGTYPE_p_void switch_core_memory_pool_get_data(SWIGTYPE_p_apr_pool_t pool, string key) {
+ IntPtr cPtr = freeswitchPINVOKE.switch_core_memory_pool_get_data(SWIGTYPE_p_apr_pool_t.getCPtr(pool), key);
+ SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false);
+ return ret;
+ }
+
public static void switch_core_session_run(SWIGTYPE_p_switch_core_session session) {
freeswitchPINVOKE.switch_core_session_run(SWIGTYPE_p_switch_core_session.getCPtr(session));
}
@@ -1130,6 +1140,10 @@
freeswitchPINVOKE.switch_core_session_destroy_state(SWIGTYPE_p_switch_core_session.getCPtr(session));
}
+ public static void switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session session) {
+ freeswitchPINVOKE.switch_core_session_reporting_state(SWIGTYPE_p_switch_core_session.getCPtr(session));
+ }
+
public static uint switch_core_session_count() {
uint ret = freeswitchPINVOKE.switch_core_session_count();
return ret;
@@ -1182,6 +1196,12 @@
return ret;
}
+ public static SWIGTYPE_p_switch_core_session switch_core_session_force_locate(string uuid_str) {
+ IntPtr cPtr = freeswitchPINVOKE.switch_core_session_force_locate(uuid_str);
+ SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false);
+ return ret;
+ }
+
public static string switch_core_get_variable(string varname) {
string ret = freeswitchPINVOKE.switch_core_get_variable(varname);
return ret;
@@ -1207,6 +1227,11 @@
freeswitchPINVOKE.switch_core_session_hupall_endpoint(switch_endpoint_interface.getCPtr(endpoint_interface), (int)cause);
}
+ public static switch_status_t switch_core_session_get_partner(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_p_switch_core_session partner) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_partner(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_p_switch_core_session.getCPtr(partner));
+ return ret;
+ }
+
public static switch_status_t switch_core_session_message_send(string uuid_str, switch_core_session_message message) {
switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_message_send(uuid_str, switch_core_session_message.getCPtr(message));
return ret;
@@ -2102,8 +2127,8 @@
return ret;
}
- public static switch_status_t switch_find_local_ip(string buf, int len, int family) {
- switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_find_local_ip(buf, len, family);
+ public static switch_status_t switch_find_local_ip(string buf, int len, SWIGTYPE_p_int mask, int family) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_find_local_ip(buf, len, SWIGTYPE_p_int.getCPtr(mask), family);
return ret;
}
@@ -2274,8 +2299,8 @@
return ret;
}
- public static switch_status_t switch_network_list_create(SWIGTYPE_p_p_switch_network_list list, switch_bool_t default_type, SWIGTYPE_p_apr_pool_t pool) {
- switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_network_list_create(SWIGTYPE_p_p_switch_network_list.getCPtr(list), (int)default_type, SWIGTYPE_p_apr_pool_t.getCPtr(pool));
+ public static switch_status_t switch_network_list_create(SWIGTYPE_p_p_switch_network_list list, string name, switch_bool_t default_type, SWIGTYPE_p_apr_pool_t pool) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_network_list_create(SWIGTYPE_p_p_switch_network_list.getCPtr(list), name, (int)default_type, SWIGTYPE_p_apr_pool_t.getCPtr(pool));
return ret;
}
@@ -2355,6 +2380,10 @@
freeswitchPINVOKE.switch_channel_wait_for_state(SWIGTYPE_p_switch_channel.getCPtr(channel), SWIGTYPE_p_switch_channel.getCPtr(other_channel), (int)want_state);
}
+ public static void switch_channel_wait_for_state_timeout(SWIGTYPE_p_switch_channel other_channel, switch_channel_state_t want_state, uint timeout) {
+ freeswitchPINVOKE.switch_channel_wait_for_state_timeout(SWIGTYPE_p_switch_channel.getCPtr(other_channel), (int)want_state, timeout);
+ }
+
public static switch_status_t switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t want_flag, switch_bool_t pres, uint to, SWIGTYPE_p_switch_channel super_channel) {
switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_wait_for_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)want_flag, (int)pres, to, SWIGTYPE_p_switch_channel.getCPtr(super_channel));
return ret;
@@ -2523,6 +2552,11 @@
return ret;
}
+ public static uint switch_channel_test_flag_partner(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t flag) {
+ uint ret = freeswitchPINVOKE.switch_channel_test_flag_partner(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)flag);
+ return ret;
+ }
+
public static void switch_channel_set_state_flag(SWIGTYPE_p_switch_channel channel, switch_channel_flag_t flag) {
freeswitchPINVOKE.switch_channel_set_state_flag(SWIGTYPE_p_switch_channel.getCPtr(channel), (int)flag);
}
@@ -3706,6 +3740,12 @@
return ret;
}
+ public static switch_xml switch_xml_parse_str_dynamic(string s, switch_bool_t dup) {
+ IntPtr cPtr = freeswitchPINVOKE.switch_xml_parse_str_dynamic(s, (int)dup);
+ switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false);
+ return ret;
+ }
+
public static switch_xml switch_xml_parse_str(string s, SWIGTYPE_p_switch_size_t len) {
IntPtr cPtr = freeswitchPINVOKE.switch_xml_parse_str(s, SWIGTYPE_p_switch_size_t.getCPtr(len));
switch_xml ret = (cPtr == IntPtr.Zero) ? null : new switch_xml(cPtr, false);
@@ -5850,6 +5890,12 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_perform_destroy_memory_pool")]
public static extern int switch_core_perform_destroy_memory_pool(HandleRef jarg1, string jarg2, string jarg3, int jarg4);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_memory_pool_set_data")]
+ public static extern void switch_core_memory_pool_set_data(HandleRef jarg1, string jarg2, HandleRef jarg3);
+
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_memory_pool_get_data")]
+ public static extern IntPtr switch_core_memory_pool_get_data(HandleRef jarg1, string jarg2);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_run")]
public static extern void switch_core_session_run(HandleRef jarg1);
@@ -5895,6 +5941,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_destroy_state")]
public static extern void switch_core_session_destroy_state(HandleRef jarg1);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_reporting_state")]
+ public static extern void switch_core_session_reporting_state(HandleRef jarg1);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_count")]
public static extern uint switch_core_session_count();
@@ -5925,6 +5974,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_locate")]
public static extern IntPtr switch_core_session_locate(string jarg1);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_force_locate")]
+ public static extern IntPtr switch_core_session_force_locate(string jarg1);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_get_variable")]
public static extern string switch_core_get_variable(string jarg1);
@@ -5943,6 +5995,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_hupall_endpoint")]
public static extern void switch_core_session_hupall_endpoint(HandleRef jarg1, int jarg2);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_partner")]
+ public static extern int switch_core_session_get_partner(HandleRef jarg1, HandleRef jarg2);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_message_send")]
public static extern int switch_core_session_message_send(string jarg1, HandleRef jarg2);
@@ -6493,7 +6548,7 @@
public static extern int switch_frame_free(HandleRef jarg1);
[DllImport("mod_managed", EntryPoint="CSharp_switch_find_local_ip")]
- public static extern int switch_find_local_ip(string jarg1, int jarg2, int jarg3);
+ public static extern int switch_find_local_ip(string jarg1, int jarg2, HandleRef jarg3, int jarg4);
[DllImport("mod_managed", EntryPoint="CSharp_get_addr")]
public static extern string get_addr(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4);
@@ -6595,7 +6650,7 @@
public static extern int switch_parse_cidr(string jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4);
[DllImport("mod_managed", EntryPoint="CSharp_switch_network_list_create")]
- public static extern int switch_network_list_create(HandleRef jarg1, int jarg2, HandleRef jarg3);
+ public static extern int switch_network_list_create(HandleRef jarg1, string jarg2, int jarg3, HandleRef jarg4);
[DllImport("mod_managed", EntryPoint="CSharp_switch_network_list_add_cidr_token")]
public static extern int switch_network_list_add_cidr_token(HandleRef jarg1, string jarg2, int jarg3, string jarg4);
@@ -6912,6 +6967,12 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_frame_packetlen_get")]
public static extern uint switch_frame_packetlen_get(HandleRef jarg1);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_extra_data_set")]
+ public static extern void switch_frame_extra_data_set(HandleRef jarg1, HandleRef jarg2);
+
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_frame_extra_data_get")]
+ public static extern IntPtr switch_frame_extra_data_get(HandleRef jarg1);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_frame_data_set")]
public static extern void switch_frame_data_set(HandleRef jarg1, HandleRef jarg2);
@@ -8910,6 +8971,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_state")]
public static extern void switch_channel_wait_for_state(HandleRef jarg1, HandleRef jarg2, int jarg3);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_state_timeout")]
+ public static extern void switch_channel_wait_for_state_timeout(HandleRef jarg1, int jarg2, uint jarg3);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_wait_for_flag")]
public static extern int switch_channel_wait_for_flag(HandleRef jarg1, int jarg2, int jarg3, uint jarg4, HandleRef jarg5);
@@ -9012,6 +9076,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_clear_flag_partner")]
public static extern int switch_channel_clear_flag_partner(HandleRef jarg1, int jarg2);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_test_flag_partner")]
+ public static extern uint switch_channel_test_flag_partner(HandleRef jarg1, int jarg2);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_state_flag")]
public static extern void switch_channel_set_state_flag(HandleRef jarg1, int jarg2);
@@ -10185,6 +10252,9 @@
[DllImport("mod_managed", EntryPoint="CSharp_delete_switch_xml")]
public static extern void delete_switch_xml(HandleRef jarg1);
+ [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_parse_str_dynamic")]
+ public static extern IntPtr switch_xml_parse_str_dynamic(string jarg1, int jarg2);
+
[DllImport("mod_managed", EntryPoint="CSharp_switch_xml_parse_str")]
public static extern IntPtr switch_xml_parse_str(string jarg1, HandleRef jarg2);
@@ -17542,6 +17612,10 @@
CF_PAUSE_BUGS,
CF_DIVERT_EVENTS,
CF_BLOCK_STATE,
+ CF_FS_RTP,
+ CF_REPORTING,
+ CF_PARK,
+ CF_TIMESTAMP_SET,
CF_FLAG_MAX
}
@@ -18779,7 +18853,8 @@
SCF_CRASH_PROT = (1 << 3),
SCF_VG = (1 << 4),
SCF_RESTART = (1 << 5),
- SCF_SHUTDOWN_REQUESTED = (1 << 6)
+ SCF_SHUTDOWN_REQUESTED = (1 << 6),
+ SCF_USE_AUTO_NAT = (1 << 7)
}
}
@@ -20324,6 +20399,7 @@
SWITCH_EVENT_CHANNEL_STATE,
SWITCH_EVENT_CHANNEL_ANSWER,
SWITCH_EVENT_CHANNEL_HANGUP,
+ SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE,
SWITCH_EVENT_CHANNEL_EXECUTE,
SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE,
SWITCH_EVENT_CHANNEL_BRIDGE,
@@ -20382,6 +20458,7 @@
SWITCH_EVENT_SERVER_DISCONNECTED,
SWITCH_EVENT_SEND_INFO,
SWITCH_EVENT_RECV_INFO,
+ SWITCH_EVENT_CALL_SECURE,
SWITCH_EVENT_ALL
}
@@ -21123,6 +21200,17 @@
}
}
+ public SWIGTYPE_p_void extra_data {
+ set {
+ freeswitchPINVOKE.switch_frame_extra_data_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value));
+ }
+ get {
+ IntPtr cPtr = freeswitchPINVOKE.switch_frame_extra_data_get(swigCPtr);
+ SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false);
+ return ret;
+ }
+ }
+
public SWIGTYPE_p_void data {
set {
freeswitchPINVOKE.switch_frame_data_set(swigCPtr, SWIGTYPE_p_void.getCPtr(value));
@@ -21260,7 +21348,8 @@
SFF_PLC = (1 << 3),
SFF_RFC2833 = (1 << 4),
SFF_PROXY_PACKET = (1 << 5),
- SFF_DYNAMIC = (1 << 6)
+ SFF_DYNAMIC = (1 << 6),
+ SFF_ZRTP = (1 << 7)
}
}
@@ -23391,7 +23480,11 @@
SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19),
SWITCH_RTP_FLAG_FLUSH = (1 << 20),
SWITCH_RTP_FLAG_AUTOFLUSH = (1 << 21),
- SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22)
+ SWITCH_RTP_FLAG_STICKY_FLUSH = (1 << 22),
+ SWITCH_ZRTP_FLAG_SECURE_SEND = (1 << 23),
+ SWITCH_ZRTP_FLAG_SECURE_RECV = (1 << 24),
+ SWITCH_ZRTP_FLAG_SECURE_MITM_SEND = (1 << 25),
+ SWITCH_ZRTP_FLAG_SECURE_MITM_RECV = (1 << 26)
}
}
Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original)
+++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Tue Jun 2 14:50:04 2009
@@ -11562,17 +11562,17 @@
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);
Modified: freeswitch/trunk/src/switch_cpp.cpp
==============================================================================
--- freeswitch/trunk/src/switch_cpp.cpp (original)
+++ freeswitch/trunk/src/switch_cpp.cpp Tue Jun 2 14:50:04 2009
@@ -829,6 +829,7 @@
switch_status_t status;
//switch_file_handle_t fh = { 0 };
const char *prebuf;
+ switch_file_handle_t local_fh;
this_check(-1);
sanity_check(-1);
@@ -978,6 +979,7 @@
SWITCH_DECLARE(int) CoreSession::recordFile(char *file_name, int time_limit, int silence_threshold, int silence_hits)
{
switch_status_t status;
+ switch_file_handle_t local_fh;
this_check(-1);
sanity_check(-1);
More information about the Freeswitch-trunk
mailing list