kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 00:22:35 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4180 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-02-09 19:14:20 +00:00
parent dccf9b3d1b
commit 1eacf043d2
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c
View File

@ -2043,8 +2043,20 @@ int nua_invite_server_report(nua_server_request_t *sr, tagi_t const *tags)
} }
assert(ss); assert(ss);
#if 1
assert(ss->ss_state != nua_callstate_calling); assert(ss->ss_state != nua_callstate_calling);
assert(ss->ss_state != nua_callstate_proceeding); 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 */ /* Update session state */
if (status < 300 || application != 0) if (status < 300 || application != 0)

4
libs/win32/sofia/libsofia_sip_ua_static.vcproj
View File

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

4
src/mod/endpoints/mod_sofia/mod_sofia.vcproj
View File

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