windows trivial compiler fixes and vs2010 reswig

diff --git a/src/include/switch.h b/src/include/switch.h
index 2f7ac02f7f1e567e656488f0acbc7e8a2478f2f7..c7ea7b02189ae9c4c74a83b577343ab65542d513 100644 (file)
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -106,7 +106,11 @@
 #include <signal.h>
 #include <errno.h>
 
+#ifndef WIN32
 #include "stfu.h"
+#else
+#include "../../../libs/stfu/stfu.h"
+#endif
 #include "switch_platform.h"
 #include "switch_types.h"
 #include "switch_apr.h"

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 3183c52bb28f3667b30ba47495408f668762e8bd..5e23486d4ca579f768d91cebcd28c3a39e972e55 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -1840,6 +1840,16 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_DTMF_LOG_LEN_get() {
 }\r
 \r
 \r
+SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_MAX_TRANS_get() {\r
+  int jresult ;\r
+  int result;\r
+  \r
+  result = (int)(2000);\r
+  jresult = result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_dtmf_t_digit_set(void * jarg1, char jarg2) {\r
   switch_dtmf_t *arg1 = (switch_dtmf_t *) 0 ;\r
   char arg2 ;\r
@@ -2310,6 +2320,36 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_mod_dir_get(void * jarg1
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_lib_dir_set(void * jarg1, char * jarg2) {\r
+  switch_directories *arg1 = (switch_directories *) 0 ;\r
+  char *arg2 = (char *) 0 ;\r
+  \r
+  arg1 = (switch_directories *)jarg1; \r
+  arg2 = (char *)jarg2; \r
+  {\r
+    if (arg1->lib_dir) delete [] arg1->lib_dir;\r
+    if (arg2) {\r
+      arg1->lib_dir = (char *) (new char[strlen((const char *)arg2)+1]);\r
+      strcpy((char *)arg1->lib_dir, (const char *)arg2);\r
+    } else {\r
+      arg1->lib_dir = 0;\r
+    }\r
+  }\r
+}\r
+\r
+\r
+SWIGEXPORT char * SWIGSTDCALL CSharp_switch_directories_lib_dir_get(void * jarg1) {\r
+  char * jresult ;\r
+  switch_directories *arg1 = (switch_directories *) 0 ;\r
+  char *result = 0 ;\r
+  \r
+  arg1 = (switch_directories *)jarg1; \r
+  result = (char *) ((arg1)->lib_dir);\r
+  jresult = SWIG_csharp_string_callback((const char *)result); \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_directories_conf_dir_set(void * jarg1, char * jarg2) {\r
   switch_directories *arg1 = (switch_directories *) 0 ;\r
   char *arg2 = (char *) 0 ;\r
@@ -12048,27 +12088,29 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_destroy(void * jarg1)
 }\r
 \r
 \r
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, char * jarg5, char * jarg6, char * jarg7, char * jarg8) {\r
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_sql_queue_manager_init_name(char * jarg1, void * jarg2, unsigned long jarg3, char * jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9) {\r
   int jresult ;\r
   char *arg1 = (char *) 0 ;\r
   switch_sql_queue_manager_t **arg2 = (switch_sql_queue_manager_t **) 0 ;\r
   uint32_t arg3 ;\r
   char *arg4 = (char *) 0 ;\r
-  char *arg5 = (char *) 0 ;\r
+  uint32_t arg5 ;\r
   char *arg6 = (char *) 0 ;\r
   char *arg7 = (char *) 0 ;\r
   char *arg8 = (char *) 0 ;\r
+  char *arg9 = (char *) 0 ;\r
   switch_status_t result;\r
   \r
   arg1 = (char *)jarg1; \r
   arg2 = (switch_sql_queue_manager_t **)jarg2; \r
   arg3 = (uint32_t)jarg3; \r
   arg4 = (char *)jarg4; \r
-  arg5 = (char *)jarg5; \r
+  arg5 = (uint32_t)jarg5; \r
   arg6 = (char *)jarg6; \r
   arg7 = (char *)jarg7; \r
   arg8 = (char *)jarg8; \r
-  result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8);\r
+  arg9 = (char *)jarg9; \r
+  result = (switch_status_t)switch_sql_queue_manager_init_name((char const *)arg1,arg2,arg3,(char const *)arg4,arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,(char const *)arg9);\r
   jresult = result; \r
   return jresult;\r
 }\r
@@ -23326,6 +23368,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_session_get(void * jarg1) {
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_cur_frame_set(void * jarg1, void * jarg2) {\r
+  switch_codec *arg1 = (switch_codec *) 0 ;\r
+  switch_frame_t *arg2 = (switch_frame_t *) 0 ;\r
+  \r
+  arg1 = (switch_codec *)jarg1; \r
+  arg2 = (switch_frame_t *)jarg2; \r
+  if (arg1) (arg1)->cur_frame = arg2;\r
+}\r
+\r
+\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_codec_cur_frame_get(void * jarg1) {\r
+  void * jresult ;\r
+  switch_codec *arg1 = (switch_codec *) 0 ;\r
+  switch_frame_t *result = 0 ;\r
+  \r
+  arg1 = (switch_codec *)jarg1; \r
+  result = (switch_frame_t *) ((arg1)->cur_frame);\r
+  jresult = (void *)result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_codec() {\r
   void * jresult ;\r
   switch_codec *result = 0 ;\r

diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index a5ec72534d4d1da8d9e023a56a267376508765bd..5ce0dc006c5769131568c431194036ab0ddb654a 100644 (file)
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -2862,8 +2862,8 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
-  public static switch_status_t switch_sql_queue_manager_init_name(string name, SWIGTYPE_p_p_switch_sql_queue_manager qmp, uint numq, string dsn, string pre_trans_execute, string post_trans_execute, string inner_pre_trans_execute, string inner_post_trans_execute) {\r
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_sql_queue_manager_init_name(name, SWIGTYPE_p_p_switch_sql_queue_manager.getCPtr(qmp), numq, dsn, pre_trans_execute, post_trans_execute, inner_pre_trans_execute, inner_post_trans_execute);\r
+  public static switch_status_t switch_sql_queue_manager_init_name(string name, SWIGTYPE_p_p_switch_sql_queue_manager qmp, uint numq, string dsn, uint max_trans, string pre_trans_execute, string post_trans_execute, string inner_pre_trans_execute, string inner_post_trans_execute) {\r
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_sql_queue_manager_init_name(name, SWIGTYPE_p_p_switch_sql_queue_manager.getCPtr(qmp), numq, dsn, max_trans, pre_trans_execute, post_trans_execute, inner_pre_trans_execute, inner_post_trans_execute);\r
     return ret;\r
   }\r
 \r
@@ -6371,6 +6371,7 @@ public class freeswitch {
   public static readonly int SWITCH_BITS_PER_BYTE = freeswitchPINVOKE.SWITCH_BITS_PER_BYTE_get();\r
   public static readonly int SWITCH_DEFAULT_FILE_BUFFER_LEN = freeswitchPINVOKE.SWITCH_DEFAULT_FILE_BUFFER_LEN_get();\r
   public static readonly int SWITCH_DTMF_LOG_LEN = freeswitchPINVOKE.SWITCH_DTMF_LOG_LEN_get();\r
+  public static readonly int SWITCH_MAX_TRANS = freeswitchPINVOKE.SWITCH_MAX_TRANS_get();\r
   public static readonly int SWITCH_MAX_STACKS = freeswitchPINVOKE.SWITCH_MAX_STACKS_get();\r
   public static readonly int SWITCH_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_THREAD_STACKSIZE_get();\r
   public static readonly int SWITCH_SYSTEM_THREAD_STACKSIZE = freeswitchPINVOKE.SWITCH_SYSTEM_THREAD_STACKSIZE_get();\r
@@ -7084,6 +7085,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_DTMF_LOG_LEN_get")]\r
   public static extern int SWITCH_DTMF_LOG_LEN_get();\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_MAX_TRANS_get")]\r
+  public static extern int SWITCH_MAX_TRANS_get();\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_dtmf_t_digit_set")]\r
   public static extern void switch_dtmf_t_digit_set(HandleRef jarg1, char jarg2);\r
 \r
@@ -7210,6 +7214,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_mod_dir_get")]\r
   public static extern string switch_directories_mod_dir_get(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_lib_dir_set")]\r
+  public static extern void switch_directories_lib_dir_set(HandleRef jarg1, string jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_lib_dir_get")]\r
+  public static extern string switch_directories_lib_dir_get(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_directories_conf_dir_set")]\r
   public static extern void switch_directories_conf_dir_set(HandleRef jarg1, string jarg2);\r
 \r
@@ -9542,7 +9552,7 @@ class freeswitchPINVOKE {
   public static extern int switch_sql_queue_manager_destroy(HandleRef jarg1);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_init_name")]\r
-  public static extern int switch_sql_queue_manager_init_name(string jarg1, HandleRef jarg2, uint jarg3, string jarg4, string jarg5, string jarg6, string jarg7, string jarg8);\r
+  public static extern int switch_sql_queue_manager_init_name(string jarg1, HandleRef jarg2, uint jarg3, string jarg4, uint jarg5, string jarg6, string jarg7, string jarg8, string jarg9);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_sql_queue_manager_start")]\r
   public static extern int switch_sql_queue_manager_start(HandleRef jarg1);\r
@@ -12337,6 +12347,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_session_get")]\r
   public static extern IntPtr switch_codec_session_get(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_cur_frame_set")]\r
+  public static extern void switch_codec_cur_frame_set(HandleRef jarg1, HandleRef jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_cur_frame_get")]\r
+  public static extern IntPtr switch_codec_cur_frame_get(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_new_switch_codec")]\r
   public static extern IntPtr new_switch_codec();\r
 \r
@@ -24182,6 +24198,7 @@ public enum switch_channel_flag_t {
   CF_OUTBOUND,\r
   CF_EARLY_MEDIA,\r
   CF_BRIDGE_ORIGINATOR,\r
+  CF_UUID_BRIDGE_ORIGINATOR,\r
   CF_TRANSFER,\r
   CF_ACCEPT_CNG,\r
   CF_REDIRECT,\r
@@ -24950,6 +24967,17 @@ public class switch_codec : IDisposable {
     } \r
   }\r
 \r
+  public switch_frame cur_frame {\r
+    set {\r
+      freeswitchPINVOKE.switch_codec_cur_frame_set(swigCPtr, switch_frame.getCPtr(value));\r
+    } \r
+    get {\r
+      IntPtr cPtr = freeswitchPINVOKE.switch_codec_cur_frame_get(swigCPtr);\r
+      switch_frame ret = (cPtr == IntPtr.Zero) ? null : new switch_frame(cPtr, false);\r
+      return ret;\r
+    } \r
+  }\r
+\r
   public switch_codec() : this(freeswitchPINVOKE.new_switch_codec(), true) {\r
   }\r
 \r
@@ -26627,6 +26655,16 @@ public class switch_directories : IDisposable {
     } \r
   }\r
 \r
+  public string lib_dir {\r
+    set {\r
+      freeswitchPINVOKE.switch_directories_lib_dir_set(swigCPtr, value);\r
+    } \r
+    get {\r
+      string ret = freeswitchPINVOKE.switch_directories_lib_dir_get(swigCPtr);\r
+      return ret;\r
+    } \r
+  }\r
+\r
   public string conf_dir {\r
     set {\r
       freeswitchPINVOKE.switch_directories_conf_dir_set(swigCPtr, value);\r

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index ba98b02af494e3264bcdd4a3bb19dce71fcd5415..3d8b43564ef3a74e17c1148d65dbb03c8dd66886 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -1466,7 +1466,7 @@ static uint32_t do_trans(switch_sql_queue_manager_t *qm)
        switch_status_t status;
        uint32_t ttl = 0;
        switch_mutex_t *io_mutex = qm->event_db->io_mutex;
-       int i;
+       uint32_t i;
 
        if (io_mutex) switch_mutex_lock(io_mutex);
 
@@ -1648,8 +1648,7 @@ static void *SWITCH_THREAD_FUNC switch_user_sql_thread(switch_thread_t *thread,
 
 
        while (qm->thread_running == 1) {
-               int lc;
-               uint32_t i;
+               uint32_t i, lc;
                uint32_t written, iterations = 0;
 
                if (sql_manager.paused) {