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

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)

libs/win32/sofia/libsofia_sip_ua_static.vcproj

@@ -256,6 +256,10 @@
 					RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_root.c"
 					>
 				</File>
+				<File
+					RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_socket_port.c"
+					>
+				</File>
 				<File
 					RelativePath="..\..\sofia-sip\libsofia-sip-ua\su\su_sprintf.c"
 					>

src/mod/endpoints/mod_sofia/mod_sofia.vcproj

@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib"
 				OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread&quot;"
@@ -147,7 +147,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
+				AdditionalDependencies="ws2_32.lib advapi32.lib iphlpapi.lib"
 				OutputFile="$(SolutionDir)$(OutDir)/mod/$(InputName).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;..\..\..\..\w32\vsnet\$(OutDir)&quot;;&quot;$(InputDir)..\..\..\..\libs\sofia-sip\win32\pthread&quot;"