merge sofia windows build, add ifdefed out code to avoid assert if it comes back.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4180 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
index f17808ee09973564d26a02e432508a2d446183c7..f7e862e367327b215052f7697c0b9dae79975914 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
@@ -2043,8 +2043,20 @@ int nua_invite_server_report(nua_server_request_t *sr, tagi_t const *tags)
   }
 
   assert(ss);
+#if 1
   assert(ss->ss_state != nua_callstate_calling);
   assert(ss->ss_state != nua_callstate_proceeding);
+#else
+//  assert(ss->ss_state != nua_callstate_calling);
+//  assert(ss->ss_state != nua_callstate_proceeding);
+  if(ss->ss_state == nua_callstate_calling || ss->ss_state != nua_callstate_proceeding) {
+         /* somthing is badly wrong here.  Lets kill it gracefully for now */
+               sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR);
+        signal_call_state_change(nh, NULL, status, phrase,
+                              nua_callstate_terminated);
+               return retval;
+  }
+#endif
 
   /* Update session state */
   if (status < 300 || application != 0)

diff --git a/libs/win32/sofia/libsofia_sip_ua_static.vcproj b/libs/win32/sofia/libsofia_sip_ua_static.vcproj
index a6fac3b8fe36341a1d2b2675abfb6d9326fb8988..151ff12c45fcbd39259cf823698665acb49d0e04 100644 (file)
--- a/libs/win32/sofia/libsofia_sip_ua_static.vcproj
+++ b/libs/win32/sofia/libsofia_sip_ua_static.vcproj
@@ -256,6 +256,10 @@
                                        RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_root.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_socket_port.c"\r
+                                       >\r
+                               </File>\r
                                <File\r
                                        RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_sprintf.c"\r
                                        >\r

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
index 64af4fbc264f355155b59c84b3eb599cd46d5d97..f97fa5c96e56b029ef136b1e91f1347e15d062e2 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
@@ -65,7 +65,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread&quot;"\r
@@ -147,7 +147,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="ws2_32.lib"\r
+                               AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib"\r
                                OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread&quot;"\r