fix windows build

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index 031effd4a49a03c047c0e5cfd9a3efb60bd9a463..908a851e5ad7009c6d9bd65d3bfd3e43583c9dd0 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -6529,19 +6529,21 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_xml(void * jarg
 }\r
 \r
 \r
-SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, int jarg2, void * jarg3, char * jarg4) {\r
+SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_request_uuid(void * jarg1, int jarg2, unsigned long jarg3, void * jarg4, char * jarg5) {\r
   void * jresult ;\r
   switch_endpoint_interface_t *arg1 = (switch_endpoint_interface_t *) 0 ;\r
   switch_call_direction_t arg2 ;\r
-  switch_memory_pool_t **arg3 = (switch_memory_pool_t **) 0 ;\r
-  char *arg4 = (char *) 0 ;\r
+  switch_originate_flag_t arg3 ;\r
+  switch_memory_pool_t **arg4 = (switch_memory_pool_t **) 0 ;\r
+  char *arg5 = (char *) 0 ;\r
   switch_core_session_t *result = 0 ;\r
   \r
   arg1 = (switch_endpoint_interface_t *)jarg1; \r
   arg2 = (switch_call_direction_t)jarg2; \r
-  arg3 = (switch_memory_pool_t **)jarg3; \r
-  arg4 = (char *)jarg4; \r
-  result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,arg3,(char const *)arg4);\r
+  arg3 = (switch_originate_flag_t)jarg3; \r
+  arg4 = (switch_memory_pool_t **)jarg4; \r
+  arg5 = (char *)jarg5; \r
+  result = (switch_core_session_t *)switch_core_session_request_uuid(arg1,arg2,arg3,arg4,(char const *)arg5);\r
   jresult = (void *)result; \r
   return jresult;\r
 }\r

diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index 8930e7b93ac5c5769d932b2e540bed641862b6a8..268187547f16112680ab3c484b7c96fcad4b978d 100644 (file)
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -1211,8 +1211,8 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
-  public static SWIGTYPE_p_switch_core_session switch_core_session_request_uuid(switch_endpoint_interface endpoint_interface, switch_call_direction_t direction, SWIGTYPE_p_p_apr_pool_t pool, string use_uuid) {\r
-    IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_uuid(switch_endpoint_interface.getCPtr(endpoint_interface), (int)direction, SWIGTYPE_p_p_apr_pool_t.getCPtr(pool), use_uuid);\r
+  public static SWIGTYPE_p_switch_core_session switch_core_session_request_uuid(switch_endpoint_interface endpoint_interface, switch_call_direction_t direction, uint originate_flags, SWIGTYPE_p_p_apr_pool_t pool, string use_uuid) {\r
+    IntPtr cPtr = freeswitchPINVOKE.switch_core_session_request_uuid(switch_endpoint_interface.getCPtr(endpoint_interface), (int)direction, originate_flags, SWIGTYPE_p_p_apr_pool_t.getCPtr(pool), use_uuid);\r
     SWIGTYPE_p_switch_core_session ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_core_session(cPtr, false);\r
     return ret;\r
   }\r
@@ -6889,7 +6889,7 @@ class freeswitchPINVOKE {
   public static extern IntPtr switch_core_session_request_xml(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_request_uuid")]\r
-  public static extern IntPtr switch_core_session_request_uuid(HandleRef jarg1, int jarg2, HandleRef jarg3, string jarg4);\r
+  public static extern IntPtr switch_core_session_request_uuid(HandleRef jarg1, int jarg2, uint jarg3, HandleRef jarg4, string jarg5);\r
 \r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_set_uuid")]\r
   public static extern int switch_core_session_set_uuid(HandleRef jarg1, string jarg2);\r
@@ -26653,7 +26653,8 @@ namespace FreeSWITCH.Native {
   SOF_NOBLOCK = (1 << 0),\r
   SOF_FORKED_DIAL = (1 << 1),\r
   SOF_NO_EFFECTIVE_CID_NUM = (1 << 2),\r
-  SOF_NO_EFFECTIVE_CID_NAME = (1 << 3)\r
+  SOF_NO_EFFECTIVE_CID_NAME = (1 << 3),\r
+  SOF_NO_LIMITS = (1 << 4)\r
 }\r
 \r
 }\r

diff --git a/src/switch.c b/src/switch.c
index 9183121ab49456d7d61b20cd0efca77727eedd59..b59097ac896b6d9e2ac8269bb1cb72471819c580 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -271,13 +271,13 @@ int main(int argc, char *argv[])
        switch_size_t pid_len, old_pid_len;
        const char *err = NULL;         /* error value for return from freeswitch initialization */
 #ifndef WIN32
-       int nf = 0;                                     /* TRUE if we are running in nofork mode */
        int bf = 0;
        char *runas_user = NULL;
        char *runas_group = NULL;
 #else
        int win32_service = 0;
 #endif
+       int nf = 0;                                     /* TRUE if we are running in nofork mode */
        int nc = 0;                                     /* TRUE if we are running in noconsole mode */
        pid_t pid = 0;
        int i, x;
@@ -813,9 +813,11 @@ int main(int argc, char *argv[])
                return 255;
        }
 
+#ifndef WIN32
        if(bf) {
                daemonize();
        }
+#endif
 
        switch_core_runtime_loop(nc);