[Freeswitch-svn] [commit] r4180 - in freeswitch/trunk: libs/sofia-sip/libsofia-sip-ua/nua libs/win32/sofia src/mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: mikej
Date: Fri Feb  9 14:14:20 2007
New Revision: 4180

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
   freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj

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

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c	Fri Feb  9 14:14:20 2007
@@ -2043,8 +2043,20 @@
   }
 
   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)

Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj
==============================================================================
--- freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj	(original)
+++ freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj	Fri Feb  9 14:14:20 2007
@@ -257,6 +257,10 @@
 					>
 				</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"
 					>
 				</File>

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj	Fri Feb  9 14:14:20 2007
@@ -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;"