-fix up VS2008 recon build

  -Use OpenSSL 1.0.1 instead of custom dtls-srtp build of openssl
  -Fix inclusion of stdint.h that is not present on VS less than 2010
  -Added DTMFPayloadContents to resip project


git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@11173 ddefafc4-47db-0310-ae44-fa13212b10f2

contrib/srtp/srtp9.vcproj

@@ -322,6 +322,10 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath=".\srtp\ekt.c"
+				>
+			</File>
 			<File
 				RelativePath=".\srtp\srtp.c"
 				>

reflow/reflow_9_0.vcproj

@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(ProjectDir)/..";"$(ProjectDir)/../reTurn";"$(ProjectDir)/../contrib/asio";"$(ProjectDir)/../contrib/boost_1_34_1";"$(ProjectDir)/../contrib/openssl/inc32";"$(ProjectDir)/../contrib/srtp/include";"$(ProjectDir)/../contrib/srtp/crypto/include""
+				AdditionalIncludeDirectories=""$(ProjectDir)/..";"$(ProjectDir)/../reTurn";"$(ProjectDir)/../contrib/asio";"$(ProjectDir)/../contrib/boost_1_34_1";"$(ProjectDir)/../contrib/openssl/include";"$(ProjectDir)/../contrib/srtp/include";"$(ProjectDir)/../contrib/srtp/crypto/include""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0501;USE_IPV6;USE_ARES;BOOST_ALL_NO_LIB;LEAK_CHECK;ASIO_ENABLE_CANCELIO"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -110,7 +110,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/inc32&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0501;USE_IPV6;USE_ARES;BOOST_ALL_NO_LIB;ASIO_ENABLE_CANCELIO"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"
@@ -176,7 +176,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/inc32&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_WIN32_WINNT=0x0501;USE_IPV6;USE_ARES;BOOST_ALL_NO_LIB;USE_SSL;LEAK_CHECK;ASIO_ENABLE_CANCELIO"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -243,7 +243,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/inc32&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)/..&quot;;&quot;$(ProjectDir)/../reTurn&quot;;&quot;$(ProjectDir)/../contrib/asio&quot;;&quot;$(ProjectDir)/../contrib/boost_1_34_1&quot;;&quot;$(ProjectDir)/../contrib/openssl/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/include&quot;;&quot;$(ProjectDir)/../contrib/srtp/crypto/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_WIN32_WINNT=0x0501;USE_IPV6;USE_ARES;BOOST_ALL_NO_LIB;USE_SSL;ASIO_ENABLE_CANCELIO"
 				MinimalRebuild="false"
 				RuntimeLibrary="2"

resip/recon/BridgeMixer.hxx

@@ -1,7 +1,7 @@
 #if !defined(BridgeMixer_hxx)
 #define BridgeMixer_hxx
 
-#ifdef WIN32
+#if (_MSC_VER >= 1600)
 #include <stdint.h>       // Use Visual Studio's stdint.h
 #define _MSC_STDINT_H_    // This define will ensure that stdint.h in sipXport tree is not used
 #endif

resip/recon/ConversationManager.cxx

@@ -1,5 +1,5 @@
 // sipX includes
-#ifdef WIN32
+#if (_MSC_VER >= 1600)
 #include <stdint.h>       // Use Visual Studio's stdint.h
 #define _MSC_STDINT_H_    // This define will ensure that stdint.h in sipXport tree is not used
 #endif

resip/recon/FlowManagerSipXSocket.hxx

@@ -2,7 +2,7 @@
 #ifndef _FlowManagerSipXSocket_hxx_
 #define _FlowManagerSipXSocket_hxx_
 
-#ifdef WIN32
+#if (_MSC_VER >= 1600)
 #include <stdint.h>       // Use Visual Studio's stdint.h
 #define _MSC_STDINT_H_    // This define will ensure that stdint.h in sipXport tree is not used
 #endif

resip/recon/MediaInterface.hxx

@@ -1,7 +1,7 @@
 #if !defined(MediaInterface_hxx)
 #define MediaInterface_hxx
 
-#ifdef WIN32
+#if (_MSC_VER >= 1600)
 #include <stdint.h>       // Use Visual Studio's stdint.h
 #define _MSC_STDINT_H_    // This define will ensure that stdint.h in sipXport tree is not used
 #endif

resip/recon/MediaResourceParticipant.cxx

@@ -216,9 +216,9 @@ MediaResourceParticipant::startPlay()
             {
                StackLog(<<"sending tone to sipX connection: " << participant->getMediaConnectionId());
                // this uses the original API, where both inband and RFC2833 tones are always sent simultaneously:
-               //status = getMediaInterface()->getInterface()->startChannelTone(participant->getMediaConnectionId(), toneid, mRemoteOnly ? FALSE : TRUE /* local */, mLocalOnly ? FALSE : TRUE /* remote */);
+               status = getMediaInterface()->getInterface()->startChannelTone(participant->getMediaConnectionId(), toneid, mRemoteOnly ? FALSE : TRUE /* local */, mLocalOnly ? FALSE : TRUE /* remote */);
                // this is for newer sipXtapi API, option to suppress inband tones:
-               status = getMediaInterface()->getInterface()->startChannelTone(participant->getMediaConnectionId(), toneid, mRemoteOnly ? FALSE : TRUE /* local */, mLocalOnly ? FALSE : TRUE /* remote */, !isDtmf /* inband */, true /* RFC 4733 */);
+               //status = getMediaInterface()->getInterface()->startChannelTone(participant->getMediaConnectionId(), toneid, mRemoteOnly ? FALSE : TRUE /* local */, mLocalOnly ? FALSE : TRUE /* remote */, !isDtmf /* inband */, true /* RFC 4733 */);
             }
             else
             {
@@ -421,9 +421,9 @@ MediaResourceParticipant::destroyParticipant()
                if(participant)
                {
                   // this uses the original API, where both inband and RFC2833 tones are always sent simultaneously:
-                  //status = getMediaInterface()->getInterface()->stopChannelTone(participant->getMediaConnectionId());
+                  status = getMediaInterface()->getInterface()->stopChannelTone(participant->getMediaConnectionId());
                   // this is for newer sipXtapi API, option to suppress inband tones:
-                  status = getMediaInterface()->getInterface()->stopChannelTone(participant->getMediaConnectionId(), !isDtmf, true);
+                  //status = getMediaInterface()->getInterface()->stopChannelTone(participant->getMediaConnectionId(), !isDtmf, true);
                }
                else
                {

resip/recon/RemoteParticipantDialogSet.cxx

@@ -3,7 +3,7 @@
 #endif
 
 // sipX includes
-#ifdef WIN32
+#if (_MSC_VER >= 1600)
 #include <stdint.h>       // Use Visual Studio's stdint.h
 #define _MSC_STDINT_H_    // This define will ensure that stdint.h in sipXport tree is not used
 #endif

resip/recon/recon_9_0.sln

@@ -17,6 +17,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reTurnClient", "..\..\reTurn\client\reTurnClient_9_0.vcproj", "{67B5906C-5C9D-4D09-AC7E-AF71D72175F8}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sipXportLib-msvc8", "..\..\..\sipXtapi\sipXportLib\sipXportLib-msvc8.vcproj", "{14631055-9D3F-47E5-B6A7-16BFC0CC8091}"
+	ProjectSection(ProjectDependencies) = postProject
+		{38594885-CF9C-4C5F-B3F0-E4969D7E3F58} = {38594885-CF9C-4C5F-B3F0-E4969D7E3F58}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sipXsdpLib-msvc8", "..\..\..\sipXtapi\sipXsdpLib\sipXsdpLib-msvc8.vcproj", "{E1D81EA9-4AC3-4CF5-B600-090FD822B1F6}"
 EndProject
@@ -44,9 +47,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testUA", "test\testUA_9_0.v
 		{A9C94D26-C90D-4860-8195-56929E893757} = {A9C94D26-C90D-4860-8195-56929E893757}
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
 		{2A8BE839-6466-4001-B224-8F1C3168D04A} = {2A8BE839-6466-4001-B224-8F1C3168D04A}
-		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{12720B4D-F4FC-4502-8FA9-589BF5166216} = {12720B4D-F4FC-4502-8FA9-589BF5166216}
+		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{14631055-9D3F-47E5-B6A7-16BFC0CC8091} = {14631055-9D3F-47E5-B6A7-16BFC0CC8091}
+		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{16CD976A-5D3B-4329-88BA-A32560CDFCC7} = {16CD976A-5D3B-4329-88BA-A32560CDFCC7}
 		{82A7C86A-5F71-47C3-A74D-54C48C6CD5EE} = {82A7C86A-5F71-47C3-A74D-54C48C6CD5EE}
 		{67B5906C-5C9D-4D09-AC7E-AF71D72175F8} = {67B5906C-5C9D-4D09-AC7E-AF71D72175F8}
@@ -56,7 +60,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testUA", "test\testUA_9_0.v
 		{E1D81EA9-4AC3-4CF5-B600-090FD822B1F6} = {E1D81EA9-4AC3-4CF5-B600-090FD822B1F6}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
 		{6442C7DE-E500-4BA2-B821-98092F1EDCAF} = {6442C7DE-E500-4BA2-B821-98092F1EDCAF}
-		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{3D0E5CEB-93DC-4FDB-918B-D08FA369E106} = {3D0E5CEB-93DC-4FDB-918B-D08FA369E106}
 	EndProjectSection
 EndProject
@@ -68,9 +71,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTests", "test\unitTests
 		{A9C94D26-C90D-4860-8195-56929E893757} = {A9C94D26-C90D-4860-8195-56929E893757}
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
 		{2A8BE839-6466-4001-B224-8F1C3168D04A} = {2A8BE839-6466-4001-B224-8F1C3168D04A}
-		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{12720B4D-F4FC-4502-8FA9-589BF5166216} = {12720B4D-F4FC-4502-8FA9-589BF5166216}
+		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{14631055-9D3F-47E5-B6A7-16BFC0CC8091} = {14631055-9D3F-47E5-B6A7-16BFC0CC8091}
+		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{16CD976A-5D3B-4329-88BA-A32560CDFCC7} = {16CD976A-5D3B-4329-88BA-A32560CDFCC7}
 		{67B5906C-5C9D-4D09-AC7E-AF71D72175F8} = {67B5906C-5C9D-4D09-AC7E-AF71D72175F8}
 		{0EC8287A-481E-45DC-8F95-BAD940AE1038} = {0EC8287A-481E-45DC-8F95-BAD940AE1038}
@@ -79,7 +83,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unitTests", "test\unitTests
 		{E1D81EA9-4AC3-4CF5-B600-090FD822B1F6} = {E1D81EA9-4AC3-4CF5-B600-090FD822B1F6}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
 		{6442C7DE-E500-4BA2-B821-98092F1EDCAF} = {6442C7DE-E500-4BA2-B821-98092F1EDCAF}
-		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{3D0E5CEB-93DC-4FDB-918B-D08FA369E106} = {3D0E5CEB-93DC-4FDB-918B-D08FA369E106}
 	EndProjectSection
 EndProject
@@ -104,9 +107,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOHParkServer", "MOHParkSer
 		{A9C94D26-C90D-4860-8195-56929E893757} = {A9C94D26-C90D-4860-8195-56929E893757}
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
 		{2A8BE839-6466-4001-B224-8F1C3168D04A} = {2A8BE839-6466-4001-B224-8F1C3168D04A}
-		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{12720B4D-F4FC-4502-8FA9-589BF5166216} = {12720B4D-F4FC-4502-8FA9-589BF5166216}
+		{F3BCA14E-F24D-4570-833E-8C20C4C393F7} = {F3BCA14E-F24D-4570-833E-8C20C4C393F7}
 		{14631055-9D3F-47E5-B6A7-16BFC0CC8091} = {14631055-9D3F-47E5-B6A7-16BFC0CC8091}
+		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{16CD976A-5D3B-4329-88BA-A32560CDFCC7} = {16CD976A-5D3B-4329-88BA-A32560CDFCC7}
 		{82A7C86A-5F71-47C3-A74D-54C48C6CD5EE} = {82A7C86A-5F71-47C3-A74D-54C48C6CD5EE}
 		{67B5906C-5C9D-4D09-AC7E-AF71D72175F8} = {67B5906C-5C9D-4D09-AC7E-AF71D72175F8}
@@ -116,7 +120,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MOHParkServer", "MOHParkSer
 		{E1D81EA9-4AC3-4CF5-B600-090FD822B1F6} = {E1D81EA9-4AC3-4CF5-B600-090FD822B1F6}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750}
 		{6442C7DE-E500-4BA2-B821-98092F1EDCAF} = {6442C7DE-E500-4BA2-B821-98092F1EDCAF}
-		{96CD935E-1951-43B8-AF75-F1C06B3778C1} = {96CD935E-1951-43B8-AF75-F1C06B3778C1}
 		{3D0E5CEB-93DC-4FDB-918B-D08FA369E106} = {3D0E5CEB-93DC-4FDB-918B-D08FA369E106}
 		{214007F3-D6E8-4B07-AC00-9FB673FF539E} = {214007F3-D6E8-4B07-AC00-9FB673FF539E}
 	EndProjectSection