build tweak + vs2010 swig

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 9fa52fae50a18ae84a7cf2cef25377cf6b3eab49..e76a56a4aaaec30dcb86814a53695d5d2ec749a6 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -1233,7 +1233,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
        uint32_t gateway_loops = 0;
        int loops = 0;
        uint32_t qsize;
-       void *pop;
+       void *pop = NULL;
        int loop_count = 0;
        switch_size_t sql_len = 1024 * 32;
        char *tmp, *sqlbuf = NULL;
@@ -1254,7 +1254,7 @@ void *SWITCH_THREAD_FUNC sofia_profile_worker_thread_run(switch_thread_t *thread
 
        while ((mod_sofia_globals.running == 1 && sofia_test_pflag(profile, PFLAG_RUNNING)) || qsize) {
                if (sofia_test_pflag(profile, PFLAG_SQL_IN_TRANS)) {
-                       if (qsize > 0 && (qsize >= 1024 || ++loop_count >= profile->trans_timeout)) {
+                       if (qsize > 0 && (qsize >= 1024 || ++loop_count >= (int)profile->trans_timeout)) {
                                switch_size_t newlen;
                                uint32_t iterations = 0;
                                switch_size_t len = 0;

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 4b0a1df8c30963e08e5640d0ef8f80462aea4131..04a2f3f967dd7e75f62c771c72e310f9cd783c07 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -2813,6 +2813,68 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtp_numbers_t(void * jarg1) {
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_set(void * jarg1, unsigned long jarg2) {\r
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;\r
+  uint32_t arg2 ;\r
+  \r
+  arg1 = (switch_rtcp_numbers_t *)jarg1; \r
+  arg2 = (uint32_t)jarg2; \r
+  if (arg1) (arg1)->packet_count = arg2;\r
+}\r
+\r
+\r
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_packet_count_get(void * jarg1) {\r
+  unsigned long jresult ;\r
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;\r
+  uint32_t result;\r
+  \r
+  arg1 = (switch_rtcp_numbers_t *)jarg1; \r
+  result = (uint32_t) ((arg1)->packet_count);\r
+  jresult = (unsigned long)result; \r
+  return jresult;\r
+}\r
+\r
+\r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_set(void * jarg1, unsigned long jarg2) {\r
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;\r
+  uint32_t arg2 ;\r
+  \r
+  arg1 = (switch_rtcp_numbers_t *)jarg1; \r
+  arg2 = (uint32_t)jarg2; \r
+  if (arg1) (arg1)->octet_count = arg2;\r
+}\r
+\r
+\r
+SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_rtcp_numbers_t_octet_count_get(void * jarg1) {\r
+  unsigned long jresult ;\r
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;\r
+  uint32_t result;\r
+  \r
+  arg1 = (switch_rtcp_numbers_t *)jarg1; \r
+  result = (uint32_t) ((arg1)->octet_count);\r
+  jresult = (unsigned long)result; \r
+  return jresult;\r
+}\r
+\r
+\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtcp_numbers_t() {\r
+  void * jresult ;\r
+  switch_rtcp_numbers_t *result = 0 ;\r
+  \r
+  result = (switch_rtcp_numbers_t *)new switch_rtcp_numbers_t();\r
+  jresult = (void *)result; \r
+  return jresult;\r
+}\r
+\r
+\r
+SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_rtcp_numbers_t(void * jarg1) {\r
+  switch_rtcp_numbers_t *arg1 = (switch_rtcp_numbers_t *) 0 ;\r
+  \r
+  arg1 = (switch_rtcp_numbers_t *)jarg1; \r
+  delete arg1;\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_inbound_set(void * jarg1, void * jarg2) {\r
   switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;\r
   switch_rtp_numbers_t *arg2 = (switch_rtp_numbers_t *) 0 ;\r
@@ -2857,6 +2919,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_outbound_get(void * jarg
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_set(void * jarg1, void * jarg2) {\r
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;\r
+  switch_rtcp_numbers_t *arg2 = (switch_rtcp_numbers_t *) 0 ;\r
+  \r
+  arg1 = (switch_rtp_stats_t *)jarg1; \r
+  arg2 = (switch_rtcp_numbers_t *)jarg2; \r
+  if (arg1) (arg1)->rtcp = *arg2;\r
+}\r
+\r
+\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_stats_t_rtcp_get(void * jarg1) {\r
+  void * jresult ;\r
+  switch_rtp_stats_t *arg1 = (switch_rtp_stats_t *) 0 ;\r
+  switch_rtcp_numbers_t *result = 0 ;\r
+  \r
+  arg1 = (switch_rtp_stats_t *)jarg1; \r
+  result = (switch_rtcp_numbers_t *)& ((arg1)->rtcp);\r
+  jresult = (void *)result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_rtp_stats_t() {\r
   void * jresult ;\r
   switch_rtp_stats_t *result = 0 ;\r
@@ -10518,11 +10602,13 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_interface(void
 }\r
 \r
 \r
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_init() {\r
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_loadable_module_init(int jarg1) {\r
   int jresult ;\r
+  switch_bool_t arg1 ;\r
   switch_status_t result;\r
   \r
-  result = (switch_status_t)switch_loadable_module_init();\r
+  arg1 = (switch_bool_t)jarg1; \r
+  result = (switch_status_t)switch_loadable_module_init(arg1);\r
   jresult = result; \r
   return jresult;\r
 }\r
@@ -13050,6 +13136,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_originatee_caller_pro
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_set(void * jarg1, void * jarg2) {\r
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;\r
+  switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;\r
+  \r
+  arg1 = (switch_caller_profile *)jarg1; \r
+  arg2 = (switch_caller_profile *)jarg2; \r
+  if (arg1) (arg1)->origination_caller_profile = arg2;\r
+}\r
+\r
+\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_caller_profile_origination_caller_profile_get(void * jarg1) {\r
+  void * jresult ;\r
+  switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;\r
+  switch_caller_profile *result = 0 ;\r
+  \r
+  arg1 = (switch_caller_profile *)jarg1; \r
+  result = (switch_caller_profile *) ((arg1)->origination_caller_profile);\r
+  jresult = (void *)result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_caller_profile_hunt_caller_profile_set(void * jarg1, void * jarg2) {\r
   switch_caller_profile *arg1 = (switch_caller_profile *) 0 ;\r
   switch_caller_profile *arg2 = (switch_caller_profile *) 0 ;\r
@@ -22219,6 +22327,28 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_originatee_caller_profil
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_set_origination_caller_profile(void * jarg1, void * jarg2) {\r
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;\r
+  switch_caller_profile_t *arg2 = (switch_caller_profile_t *) 0 ;\r
+  \r
+  arg1 = (switch_channel_t *)jarg1; \r
+  arg2 = (switch_caller_profile_t *)jarg2; \r
+  switch_channel_set_origination_caller_profile(arg1,arg2);\r
+}\r
+\r
+\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_origination_caller_profile(void * jarg1) {\r
+  void * jresult ;\r
+  switch_channel_t *arg1 = (switch_channel_t *) 0 ;\r
+  switch_caller_profile_t *result = 0 ;\r
+  \r
+  arg1 = (switch_channel_t *)jarg1; \r
+  result = (switch_caller_profile_t *)switch_channel_get_origination_caller_profile(arg1);\r
+  jresult = (void *)result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_uuid(void * jarg1) {\r
   char * jresult ;\r
   switch_channel_t *arg1 = (switch_channel_t *) 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 a76e35c5e8a9476ead441f38258e6ab6d81cc985..8bf2c6c38d0b6f3001e02eaf1db505fbf1f58aeb 100644 (file)
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -2309,8 +2309,8 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
-  public static switch_status_t switch_loadable_module_init() {\r
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_loadable_module_init();\r
+  public static switch_status_t switch_loadable_module_init(switch_bool_t autoload) {\r
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_loadable_module_init((int)autoload);\r
     return ret;\r
   }\r
 \r
@@ -3105,6 +3105,16 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
+  public static void switch_channel_set_origination_caller_profile(SWIGTYPE_p_switch_channel channel, switch_caller_profile caller_profile) {\r
+    freeswitchPINVOKE.switch_channel_set_origination_caller_profile(SWIGTYPE_p_switch_channel.getCPtr(channel), switch_caller_profile.getCPtr(caller_profile));\r
+  }\r
+\r
+  public static switch_caller_profile switch_channel_get_origination_caller_profile(SWIGTYPE_p_switch_channel channel) {\r
+    IntPtr cPtr = freeswitchPINVOKE.switch_channel_get_origination_caller_profile(SWIGTYPE_p_switch_channel.getCPtr(channel));\r
+    switch_caller_profile ret = (cPtr == IntPtr.Zero) ? null : new switch_caller_profile(cPtr, false);\r
+    return ret;\r
+  }\r
+\r
   public static string switch_channel_get_uuid(SWIGTYPE_p_switch_channel channel) {\r
     string ret = freeswitchPINVOKE.switch_channel_get_uuid(SWIGTYPE_p_switch_channel.getCPtr(channel));\r
     return ret;\r
@@ -6115,6 +6125,24 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_rtp_numbers_t")]\r
   public static extern void delete_switch_rtp_numbers_t(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtcp_numbers_t_packet_count_set")]\r
+  public static extern void switch_rtcp_numbers_t_packet_count_set(HandleRef jarg1, uint jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtcp_numbers_t_packet_count_get")]\r
+  public static extern uint switch_rtcp_numbers_t_packet_count_get(HandleRef jarg1);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtcp_numbers_t_octet_count_set")]\r
+  public static extern void switch_rtcp_numbers_t_octet_count_set(HandleRef jarg1, uint jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtcp_numbers_t_octet_count_get")]\r
+  public static extern uint switch_rtcp_numbers_t_octet_count_get(HandleRef jarg1);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_new_switch_rtcp_numbers_t")]\r
+  public static extern IntPtr new_switch_rtcp_numbers_t();\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_rtcp_numbers_t")]\r
+  public static extern void delete_switch_rtcp_numbers_t(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_stats_t_inbound_set")]\r
   public static extern void switch_rtp_stats_t_inbound_set(HandleRef jarg1, HandleRef jarg2);\r
 \r
@@ -6127,6 +6155,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_stats_t_outbound_get")]\r
   public static extern IntPtr switch_rtp_stats_t_outbound_get(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_stats_t_rtcp_set")]\r
+  public static extern void switch_rtp_stats_t_rtcp_set(HandleRef jarg1, HandleRef jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_stats_t_rtcp_get")]\r
+  public static extern IntPtr switch_rtp_stats_t_rtcp_get(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_new_switch_rtp_stats_t")]\r
   public static extern IntPtr new_switch_rtp_stats_t();\r
 \r
@@ -7982,7 +8016,7 @@ class freeswitchPINVOKE {
   public static extern void delete_switch_loadable_module_interface(HandleRef jarg1);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_loadable_module_init")]\r
-  public static extern int switch_loadable_module_init();\r
+  public static extern int switch_loadable_module_init(int jarg1);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_loadable_module_shutdown")]\r
   public static extern void switch_loadable_module_shutdown();\r
@@ -8518,6 +8552,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_originatee_caller_profile_get")]\r
   public static extern IntPtr switch_caller_profile_originatee_caller_profile_get(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_origination_caller_profile_set")]\r
+  public static extern void switch_caller_profile_origination_caller_profile_set(HandleRef jarg1, HandleRef jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_origination_caller_profile_get")]\r
+  public static extern IntPtr switch_caller_profile_origination_caller_profile_get(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_caller_profile_hunt_caller_profile_set")]\r
   public static extern void switch_caller_profile_hunt_caller_profile_set(HandleRef jarg1, HandleRef jarg2);\r
 \r
@@ -10900,6 +10940,12 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_originatee_caller_profile")]\r
   public static extern IntPtr switch_channel_get_originatee_caller_profile(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_origination_caller_profile")]\r
+  public static extern void switch_channel_set_origination_caller_profile(HandleRef jarg1, HandleRef jarg2);\r
+\r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_origination_caller_profile")]\r
+  public static extern IntPtr switch_channel_get_origination_caller_profile(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_uuid")]\r
   public static extern string switch_channel_get_uuid(HandleRef jarg1);\r
 \r
@@ -20494,6 +20540,17 @@ public class switch_caller_profile : IDisposable {
     } \r
   }\r
 \r
+  public switch_caller_profile origination_caller_profile {\r
+    set {\r
+      freeswitchPINVOKE.switch_caller_profile_origination_caller_profile_set(swigCPtr, switch_caller_profile.getCPtr(value));\r
+    } \r
+    get {\r
+      IntPtr cPtr = freeswitchPINVOKE.switch_caller_profile_origination_caller_profile_get(swigCPtr);\r
+      switch_caller_profile ret = (cPtr == IntPtr.Zero) ? null : new switch_caller_profile(cPtr, false);\r
+      return ret;\r
+    } \r
+  }\r
+\r
   public switch_caller_profile hunt_caller_profile {\r
     set {\r
       freeswitchPINVOKE.switch_caller_profile_hunt_caller_profile_set(swigCPtr, switch_caller_profile.getCPtr(value));\r
@@ -22237,7 +22294,8 @@ namespace FreeSWITCH.Native {
   SCF_USE_CLOCK_RT = (1 << 10),\r
   SCF_VERBOSE_EVENTS = (1 << 11),\r
   SCF_USE_WIN32_MONOTONIC = (1 << 12),\r
-  SCF_AUTO_SCHEMAS = (1 << 13)\r
+  SCF_AUTO_SCHEMAS = (1 << 13),\r
+  SCF_MINIMAL = (1 << 14)\r
 }\r
 \r
 }\r
@@ -27451,6 +27509,75 @@ public class switch_rtcp_hdr_t : IDisposable {
 \r
 namespace FreeSWITCH.Native {\r
 \r
+using System;\r
+using System.Runtime.InteropServices;\r
+\r
+public class switch_rtcp_numbers_t : IDisposable {\r
+  private HandleRef swigCPtr;\r
+  protected bool swigCMemOwn;\r
+\r
+  internal switch_rtcp_numbers_t(IntPtr cPtr, bool cMemoryOwn) {\r
+    swigCMemOwn = cMemoryOwn;\r
+    swigCPtr = new HandleRef(this, cPtr);\r
+  }\r
+\r
+  internal static HandleRef getCPtr(switch_rtcp_numbers_t obj) {\r
+    return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr;\r
+  }\r
+\r
+  ~switch_rtcp_numbers_t() {\r
+    Dispose();\r
+  }\r
+\r
+  public virtual void Dispose() {\r
+    lock(this) {\r
+      if (swigCPtr.Handle != IntPtr.Zero) {\r
+        if (swigCMemOwn) {\r
+          swigCMemOwn = false;\r
+          freeswitchPINVOKE.delete_switch_rtcp_numbers_t(swigCPtr);\r
+        }\r
+        swigCPtr = new HandleRef(null, IntPtr.Zero);\r
+      }\r
+      GC.SuppressFinalize(this);\r
+    }\r
+  }\r
+\r
+  public uint packet_count {\r
+    set {\r
+      freeswitchPINVOKE.switch_rtcp_numbers_t_packet_count_set(swigCPtr, value);\r
+    } \r
+    get {\r
+      uint ret = freeswitchPINVOKE.switch_rtcp_numbers_t_packet_count_get(swigCPtr);\r
+      return ret;\r
+    } \r
+  }\r
+\r
+  public uint octet_count {\r
+    set {\r
+      freeswitchPINVOKE.switch_rtcp_numbers_t_octet_count_set(swigCPtr, value);\r
+    } \r
+    get {\r
+      uint ret = freeswitchPINVOKE.switch_rtcp_numbers_t_octet_count_get(swigCPtr);\r
+      return ret;\r
+    } \r
+  }\r
+\r
+  public switch_rtcp_numbers_t() : this(freeswitchPINVOKE.new_switch_rtcp_numbers_t(), true) {\r
+  }\r
+\r
+}\r
+\r
+}\r
+/* ----------------------------------------------------------------------------\r
+ * This file was automatically generated by SWIG (http://www.swig.org).\r
+ * Version 2.0.0\r
+ *\r
+ * Do not make changes to this file unless you know what you are doing--modify\r
+ * the SWIG interface file instead.\r
+ * ----------------------------------------------------------------------------- */\r
+\r
+namespace FreeSWITCH.Native {\r
+\r
 public enum switch_rtp_bug_flag_t {\r
   RTP_BUG_NONE = 0,\r
   RTP_BUG_CISCO_SKIP_MARK_BIT_2833 = (1 << 0),\r
@@ -28021,6 +28148,17 @@ public class switch_rtp_stats_t : IDisposable {
     } \r
   }\r
 \r
+  public switch_rtcp_numbers_t rtcp {\r
+    set {\r
+      freeswitchPINVOKE.switch_rtp_stats_t_rtcp_set(swigCPtr, switch_rtcp_numbers_t.getCPtr(value));\r
+    } \r
+    get {\r
+      IntPtr cPtr = freeswitchPINVOKE.switch_rtp_stats_t_rtcp_get(swigCPtr);\r
+      switch_rtcp_numbers_t ret = (cPtr == IntPtr.Zero) ? null : new switch_rtcp_numbers_t(cPtr, false);\r
+      return ret;\r
+    } \r
+  }\r
+\r
   public switch_rtp_stats_t() : this(freeswitchPINVOKE.new_switch_rtp_stats_t(), true) {\r
   }\r
 \r

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index b5b2ef29dc7d151d995826c3b98a1038efa43df0..d5a06f8aebb629955bcf1ba917db1397f07c20e9 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -850,7 +850,7 @@ SWITCH_DECLARE(switch_bool_t) switch_cache_db_test_reactive(switch_cache_db_hand
 
 static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t *thread, void *obj)
 {
-       void *pop;
+       void *pop = NULL;
        uint32_t iterations = 0;
        uint8_t trans = 0;
        uint32_t target = 20000;