Version 2.7.0: Adds support for reCAPTCHA

elkpi · Jul 20, 2015 · 5784d49 · 5784d49
1 parent a8c1dbd
commit 5784d49
Show file tree

Hide file tree

Showing 19 changed files with 829 additions and 67 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -56,6 +56,7 @@ webrtc2sip_SOURCES  = \
 	mp_proxyplugin_mgr.cc\
 	mp_proxyplugin_producer_audio.cc\
 	mp_proxyplugin_producer_video.cc\
+	mp_recaptcha.cc\
 	mp_session.cc\
 	mp_session_av.cc\
 	mp_wrap.cc

diff --git a/config.xml b/config.xml
@@ -45,5 +45,7 @@
   <database>sqlite;*</database>
   <!--account-mail>smtps;*;*;auth.smtp.1and1.fr;465;[email protected];[email protected];mysecret</account-mail-->
   <!--account-sip-caller>*;sip:[email protected];a;example.com;mysecret</account-sip-caller-->
+  <!--account-http-domain>click2dial.org</account-http-domain-->
+  <!--account-recaptcha>https://www.google.com/recaptcha/api/siteverify;your-secret-here</account-recaptcha-->
 
 </config>
diff --git a/doubango/tinyDAV.vcproj b/doubango/tinyDAV.vcproj
@@ -890,6 +890,34 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="directx"
+					>
+					<File
+						RelativePath="..\..\doubango\branches\2.0\doubango\tinyDAV\src\video\directx\tdav_producer_screencast_d3d9.cxx"
+						>
+					</File>
+					<File
+						RelativePath="..\..\doubango\branches\2.0\doubango\tinyDAV\src\video\directx\tdav_producer_screencast_ddraw.cxx"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								CompileAs="2"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								CompileAs="2"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="msrp"

diff --git a/doubango/tinyHTTP.vcproj b/doubango/tinyHTTP.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tinyHTTP"
 	ProjectGUID="{B3E45009-C7C3-4090-837C-2D30C9058443}"
 	RootNamespace="tinyHTTP"
@@ -197,6 +197,10 @@
 				RelativePath="..\..\doubango\branches\2.0\Doubango\tinyHTTP\src\thttp_message.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\doubango\branches\2.0\doubango\tinyHTTP\src\thttp_proxy_node_plugin.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\doubango\branches\2.0\Doubango\tinyHTTP\src\thttp_session.c"
 				>

diff --git a/doubango/tinyMEDIA.vcproj b/doubango/tinyMEDIA.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tinyMEDIA"
 	ProjectGUID="{52814B0D-7DCA-45B8-9A16-8B147040D619}"
 	RootNamespace="tinyMEDIA"

diff --git a/doubango/tinyNET.vcproj b/doubango/tinyNET.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="tinyNET"
 	ProjectGUID="{7522A458-92F4-4259-B906-E84C2A65D9F1}"
 	RootNamespace="tinyNET"
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\doubango\branches\2.0\Doubango\tinyNET\src;..\..\doubango\branches\2.0\Doubango\thirdparties\win32\include;..\..\doubango\branches\2.0\Doubango\tinySAK\src"
+				AdditionalIncludeDirectories="..\..\doubango\branches\2.0\Doubango\tinyNET\src;..\..\doubango\branches\2.0\Doubango\thirdparties\win32\include;..\..\doubango\branches\2.0\Doubango\thirdparties\common\include;..\..\doubango\branches\2.0\Doubango\tinySAK\src"
 				PreprocessorDefinitions="DEBUG_LEVEL=DEBUG_LEVEL_INFO;HAVE_OPENSSL=1;WIN32;_WIN32_WINNT=0x0501;_DEBUG;_WINDOWS;_USRDLL;TINYNET_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="false"
-				AdditionalIncludeDirectories="..\..\doubango\branches\2.0\Doubango\tinyNET\src;..\..\doubango\branches\2.0\Doubango\thirdparties\win32\include;..\..\doubango\branches\2.0\Doubango\tinySAK\src"
+				AdditionalIncludeDirectories="..\..\doubango\branches\2.0\Doubango\tinyNET\src;..\..\doubango\branches\2.0\Doubango\thirdparties\win32\include;..\..\doubango\branches\2.0\Doubango\thirdparties\common\include;..\..\doubango\branches\2.0\Doubango\tinySAK\src"
 				PreprocessorDefinitions="HAVE_OPENSSL=1;WIN32;NDEBUG;_WINDOWS;_USRDLL;TINYNET_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
@@ -197,6 +197,18 @@
 				RelativePath="..\..\doubango\branches\2.0\Doubango\tinyNET\src\tnet_poll.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\doubango\branches\2.0\doubango\tinyNET\src\tnet_proxy_node_socks_plugin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\doubango\branches\2.0\doubango\tinyNET\src\tnet_proxy_plugin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\doubango\branches\2.0\doubango\tinyNET\src\tnet_proxydetect.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\doubango\branches\2.0\Doubango\tinyNET\src\tnet_socket.c"
 				>

diff --git a/mediaproxy.vcproj b/mediaproxy.vcproj
@@ -229,6 +229,10 @@
 				RelativePath=".\mp_proxyplugin_producer_video.cc"
 				>
 			</File>
+			<File
+				RelativePath=".\mp_recaptcha.cc"
+				>
+			</File>
 			<File
 				RelativePath=".\mp_session.cc"
 				>
@@ -415,6 +419,10 @@
 				RelativePath=".\mp_proxyplugin_producer_video.h"
 				>
 			</File>
+			<File
+				RelativePath=".\mp_recaptcha.h"
+				>
+			</File>
 			<File
 				RelativePath=".\mp_session.h"
 				>
@@ -561,6 +569,22 @@
 		<File
 			RelativePath=".\config.xml"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+				/>
+			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>