From a9b8a530b1e082d2ab108947ef28e0a58c8fd838 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Fri, 9 Jan 2015 14:07:59 +0000
Subject: Extracted Google connection test

---
 src/Globals.h             | 10 ++++++
 src/OSSupport/Network.cpp | 77 ++---------------------------------------------
 2 files changed, 13 insertions(+), 74 deletions(-)

(limited to 'src')

diff --git a/src/Globals.h b/src/Globals.h
index f0726454b..51ddc4e79 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -298,6 +298,16 @@ void inline LOGD(const char* a_Format, ...)
 	va_end(argList);
 }
 
+void inline LOG(const char* a_Format, ...) FORMATSTRING(1, 2);
+
+void inline LOG(const char* a_Format, ...)
+{
+	va_list argList;
+	va_start(argList, a_Format);
+	vprintf(a_Format, argList);
+	va_end(argList);
+}
+
 #endif
 
 
diff --git a/src/OSSupport/Network.cpp b/src/OSSupport/Network.cpp
index 0e19e40de..0f532624d 100644
--- a/src/OSSupport/Network.cpp
+++ b/src/OSSupport/Network.cpp
@@ -5,12 +5,13 @@
 
 #include "Globals.h"
 #include "Network.h"
+#include "Event.h"
 #include <event2/event.h>
 #include <event2/thread.h>
 #include <event2/bufferevent.h>
 #include <event2/dns.h>
 
-
+#include <thread>
 
 
 
@@ -20,38 +21,6 @@
 class cNetworkTest
 {
 public:
-	/** cTCPLink callbacks that dump everything it received to the log. */
-	class cDumpCallbacks:
-		public cTCPLink::cCallbacks
-	{
-		cEvent & m_Event;
-
-		virtual void OnReceivedData(cTCPLink & a_Link, const char * a_Data, size_t a_Size) override
-		{
-			// Log the incoming data size:
-			AString Hex;
-			CreateHexDump(Hex, a_Data, a_Size, 16);
-			LOGD("Incoming data: %u bytes:\n%s", static_cast<unsigned>(a_Size), Hex.c_str());
-		}
-
-		virtual void OnRemoteClosed(cTCPLink & a_Link) override
-		{
-			LOGD("Remote has closed the connection.");
-			m_Event.Set();
-		}
-
-		virtual void OnError(cTCPLink & a_Link, int a_ErrorCode) override
-		{
-			LOGD("Error in the cDumpCallbacks.");
-			m_Event.Set();
-		}
-
-	public:
-		cDumpCallbacks(cEvent & a_Event):
-			m_Event(a_Event)
-		{
-		}
-	};
 
 
 	/** cTCPLink callbacks that echo everything they receive back to the remote peer. */
@@ -114,36 +83,6 @@ public:
 		}
 	};
 
-
-	/** Connect callbacks that send a HTTP GET request for google.com when connected. */
-	class cHTTPConnectCallbacks:
-		public cNetwork::cConnectCallbacks
-	{
-		cEvent & m_Event;
-		virtual void OnSuccess(cTCPLink & a_Link) override
-		{
-			LOGD("Connected, sending HTTP GET");
-			if (!a_Link.Send("GET / HTTP/1.0\r\nHost:google.com\r\n\r\n"))
-			{
-				LOGWARNING("Sending HTTP GET failed");
-			}
-			LOGD("HTTP GET queued.");
-		}
-
-		virtual void OnError(int a_ErrorCode) override
-		{
-			LOGD("Error while connecting HTTP: %d", a_ErrorCode);
-			m_Event.Set();
-		}
-
-	public:
-		cHTTPConnectCallbacks(cEvent & a_Event):
-			m_Event(a_Event)
-		{
-		}
-	};
-
-
 	/** Listen callbacks that send a simple welcome message to all connecting peers. */
 	class cListenCallbacks:
 		public cNetwork::cListenCallbacks
@@ -157,15 +96,6 @@ public:
 
 	cNetworkTest(void)
 	{
-		cEvent evtFinish;
-
-		LOGD("Network test: Connecting to google.com:80, reading front page via HTTP.");
-		if (!cNetwork::Connect("google.com", 80, std::make_shared<cHTTPConnectCallbacks>(evtFinish), std::make_shared<cDumpCallbacks>(evtFinish)))
-		{
-			LOGWARNING("Cannot queue connection to google.com");
-			abort();
-		}
-		LOGD("Connect request has been queued.");
 
 		/*
 		LOGD("Creating a server on port 33033");
@@ -182,8 +112,7 @@ public:
 		Server->Close();
 		*/
 
-		evtFinish.Wait();
-		LOGD("Network test finished");
+
 	}
 } g_NetworkTest;
 
-- 
cgit v1.2.3