flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Extracted Google connection test

Browse Source
This commit is contained in:
Tycho
2015-01-22 20:12:42 +01:00
committed by Mattes D
parent b8b3409b74
commit a9b8a530b1
5 changed files with 113 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OSSupport/Network.cpp
+3 -74
View File
@@ -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;