ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert code to use boost::beast

Browse Source
This commit is contained in:
seelabs
2018-04-17 14:56:24 -04:00
parent 2ac1c2b433
commit 27703859e7
71 changed files with 513 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ripple/rpc/impl/ServerHandlerImp.cpp
View File

@@ -39,9 +39,9 @@
#include <ripple/rpc/impl/Tuning.h>
#include <ripple/rpc/RPCHandler.h>
#include <ripple/server/SimpleWriter.h>
#include <beast/core/detail/base64.hpp>
#include <beast/http/fields.hpp>
#include <beast/http/string_body.hpp>
#include <boost/beast/core/detail/base64.hpp>
#include <boost/beast/http/fields.hpp>
#include <boost/beast/http/string_body.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/type_traits.hpp>
#include <boost/optional.hpp>
@@ -57,10 +57,10 @@ isStatusRequest(
http_request_type const& request)
{
return
request.version >= 11 &&
request.version() >= 11 &&
request.target() == "/" &&
request.body.size() == 0 &&
request.method() == beast::http::verb::get;
request.body().size() == 0 &&
request.method() == boost::beast::http::verb::get;
}
static
@@ -68,21 +68,21 @@ Handoff
unauthorizedResponse(
http_request_type const& request)
{
using namespace beast::http;
using namespace boost::beast::http;
Handoff handoff;
response<string_body> msg;
msg.version = request.version;
msg.result(beast::http::status::unauthorized);
msg.version(request.version());
msg.result(boost::beast::http::status::unauthorized);
msg.insert("Server", BuildInfo::getFullVersionString());
msg.insert("Content-Type", "text/html");
msg.insert("Connection", "close");
msg.body = "Invalid protocol.";
msg.body() = "Invalid protocol.";
msg.prepare_payload();
handoff.response = std::make_shared<SimpleWriter>(msg);
return handoff;
}
// VFALCO TODO Rewrite to use beast::http::fields
// VFALCO TODO Rewrite to use boost::beast::http::fields
static
bool
authorized (
@@ -97,7 +97,7 @@ authorized (
return false;
std::string strUserPass64 = it->second.substr (6);
boost::trim (strUserPass64);
std::string strUserPass = beast::detail::base64_decode (strUserPass64);
std::string strUserPass = boost::beast::detail::base64_decode (strUserPass64);
std::string::size_type nColon = strUserPass.find (":");
if (nColon == std::string::npos)
return false;
@@ -178,7 +178,7 @@ ServerHandlerImp::onHandoff (Session& session,
(session.port().protocol.count("wss") > 0) ||
(session.port().protocol.count("wss2") > 0);
if(beast::websocket::is_upgrade(request))
if(boost::beast::websocket::is_upgrade(request))
{
if(is_ws)
{
@@ -218,7 +218,7 @@ ServerHandlerImp::onHandoff (Session& session,
boost::asio::ip::tcp::endpoint remote_address) ->
Handoff
{
if(beast::websocket::is_upgrade(request))
if(boost::beast::websocket::is_upgrade(request))
{
if (session.port().protocol.count("ws2") > 0 ||
session.port().protocol.count("ws") > 0)
@@ -250,7 +250,7 @@ ServerHandlerImp::onHandoff (Session& session,
static inline
Json::Output makeOutput (Session& session)
{
return [&](beast::string_view const& b)
return [&](boost::beast::string_view const& b)
{
session.write (b.data(), b.size());
};
@@ -259,7 +259,7 @@ Json::Output makeOutput (Session& session)
// HACK!
static
std::map<std::string, std::string>
build_map(beast::http::fields const& h)
build_map(boost::beast::http::fields const& h)
{
std::map <std::string, std::string> c;
for (auto const& e : h)
@@ -343,7 +343,7 @@ ServerHandlerImp::onWSMessage(
jvResult[jss::type] = jss::error;
jvResult[jss::error] = "jsonInvalid";
jvResult[jss::value] = buffers_to_string(buffers);
beast::multi_buffer sb;
boost::beast::multi_buffer sb;
Json::stream(jvResult,
[&sb](auto const p, auto const n)
{
@@ -369,7 +369,7 @@ ServerHandlerImp::onWSMessage(
this->processSession(session, coro, jv);
auto const s = to_string(jr);
auto const n = s.length();
beast::multi_buffer sb(n);
boost::beast::multi_buffer sb(n);
sb.commit(boost::asio::buffer_copy(
sb.prepare(n), boost::asio::buffer(s.c_str(), n)));
session->send(std::make_shared<
@@ -511,7 +511,7 @@ ServerHandlerImp::processSession (std::shared_ptr<Session> const& session,
{
processRequest (
session->port(), buffers_to_string(
session->request().body.data()),
session->request().body().data()),
session->remoteAddress().at_port (0),
makeOutput (*session), coro,
[&]
@@ -849,25 +849,25 @@ Handoff
ServerHandlerImp::statusResponse(
http_request_type const& request) const
{
using namespace beast::http;
using namespace boost::beast::http;
Handoff handoff;
response<string_body> msg;
std::string reason;
if (app_.serverOkay(reason))
{
msg.result(beast::http::status::ok);
msg.body = "<!DOCTYPE html><html><head><title>" + systemName() +
msg.result(boost::beast::http::status::ok);
msg.body() = "<!DOCTYPE html><html><head><title>" + systemName() +
" Test page for rippled</title></head><body><h1>" +
systemName() + " Test</h1><p>This page shows rippled http(s) "
"connectivity is working.</p></body></html>";
}
else
{
msg.result(beast::http::status::internal_server_error);
msg.body = "<HTML><BODY>Server cannot accept clients: " +
msg.result(boost::beast::http::status::internal_server_error);
msg.body() = "<HTML><BODY>Server cannot accept clients: " +
reason + "</BODY></HTML>";
}
msg.version = request.version;
msg.version(request.version());
msg.insert("Server", BuildInfo::getFullVersionString());
msg.insert("Content-Type", "text/html");
msg.insert("Connection", "close");