ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize source files

Browse Source
This commit is contained in:
Vinnie Falco
2016-04-19 20:29:16 -04:00
parent 2cb3834bbb
commit 4469ff4b9a
422 changed files with 4031 additions and 13217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/server/Handler.h
View File

@@ -22,7 +22,7 @@
#include <ripple/server/Handoff.h>
#include <ripple/server/WSSession.h>
#include <beast/asio/ssl_bundle.h>
#include <ripple/beast/asio/ssl_bundle.h>
#include <boost/asio/buffer.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/system/error_code.hpp>

4
src/ripple/server/Handoff.h
View File

@@ -21,8 +21,8 @@
#define RIPPLE_SERVER_HANDOFF_H_INCLUDED
#include <ripple/server/Writer.h>
#include <beast/http/message.h>
#include <beast/http/streambuf_body.h>
#include <beast/http/message.hpp>
#include <beast/http/streambuf_body.hpp>
#include <memory>
namespace ripple {

5
src/ripple/server/JsonWriter.h
View File

@@ -20,10 +20,11 @@
#ifndef RIPPLE_SERVER_JSONWRITER_H_INCLUDED
#define RIPPLE_SERVER_JSONWRITER_H_INCLUDED
#include <ripple/beast/deprecated_http.h>
#include <ripple/server/Writer.h>
#include <ripple/json/json_value.h>
#include <beast/asio/streambuf.h>
#include <beast/http/message.h>
#include <beast/streambuf.hpp>
#include <beast/http/message.hpp>
#include <algorithm>
#include <cstddef>
#include <sstream>

6
src/ripple/server/Port.h
View File

@@ -22,7 +22,7 @@
#include <ripple/basics/BasicConfig.h>
#include <ripple/beast/net/IPEndpoint.h>
#include <beast/ci_char_traits.h>
#include <beast/detail/ci_char_traits.hpp>
#include <boost/asio/ip/address.hpp>
#include <cstdint>
#include <memory>
@@ -39,7 +39,7 @@ struct Port
std::string name;
boost::asio::ip::address ip;
std::uint16_t port = 0;
std::set<std::string, beast::ci_less> protocol;
std::set<std::string, beast::detail::ci_less> protocol;
std::vector<beast::IP::Address> admin_ip;
std::vector<beast::IP::Address> secure_gateway_ip;
std::string user;
@@ -73,7 +73,7 @@ operator<< (std::ostream& os, Port const& p);
struct ParsedPort
{
std::string name;
std::set<std::string, beast::ci_less> protocol;
std::set<std::string, beast::detail::ci_less> protocol;
std::string user;
std::string password;
std::string admin_user;

1
src/ripple/server/ServerHandler.h
View File

@@ -24,6 +24,7 @@
#include <ripple/core/Config.h>
#include <ripple/server/Port.h>
#include <ripple/overlay/Overlay.h>
#include <ripple/beast/deprecated_http.h>
#include <ripple/beast/utility/Journal.h>
#include <boost/asio/ip/address.hpp>
#include <memory>

4
src/ripple/server/Session.h
View File

@@ -22,8 +22,8 @@
#include <ripple/server/Writer.h>
#include <ripple/server/WSSession.h>
#include <beast/http/body.h>
#include <beast/http/message.h>
#include <ripple/beast/deprecated_http.h>
#include <beast/http/message.hpp>
#include <ripple/beast/net/IPEndpoint.h>
#include <ripple/beast/utility/Journal.h>
#include <functional>

12
src/ripple/server/impl/BaseHTTPPeer.h
View File

@@ -26,12 +26,12 @@
#include <ripple/server/impl/io_list.h>
#include <ripple/server/impl/ServerImpl.h>
#include <ripple/beast/net/IPAddressConversion.h>
#include <beast/asio/placeholders.h>
#include <beast/asio/ssl_error.h> // for is_short_read?
#include <beast/http/read.h>
#include <beast/http/message.h>
#include <beast/http/parser.h>
#include <beast/http/streambuf_body.h>
#include <beast/placeholders.hpp>
#include <ripple/beast/asio/ssl_error.h> // for is_short_read?
#include <beast/http/read.hpp>
#include <beast/http/message.hpp>
#include <beast/http/parser.hpp>
#include <beast/http/streambuf_body.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/ssl/stream.hpp>
#include <boost/asio/streambuf.hpp>

12
src/ripple/server/impl/BaseWSPeer.h
View File

@@ -22,9 +22,9 @@
#include <ripple/server/impl/BasePeer.h>
#include <ripple/protocol/BuildInfo.h>
#include <beast/wsproto.h>
#include <beast/asio/streambuf.h>
#include <beast/http/message.h>
#include <beast/websocket.hpp>
#include <beast/streambuf.hpp>
#include <beast/http/message.hpp>
#include <cassert>
namespace ripple {
@@ -47,7 +47,7 @@ private:
friend class BasePeer<Impl>;
http_request_type request_;
beast::wsproto::opcode op_;
beast::websocket::opcode op_;
beast::streambuf rb_;
beast::streambuf wb_;
std::list<std::shared_ptr<WSMsg>> wq_;
@@ -164,7 +164,7 @@ BaseWSPeer<Impl>::run()
if(! strand_.running_in_this_thread())
return strand_.post(std::bind(
&BaseWSPeer::run, impl().shared_from_this()));
impl().ws_.set_option(beast::wsproto::decorate(identity{}));
impl().ws_.set_option(beast::websocket::decorate(identity{}));
using namespace beast::asio;
impl().ws_.async_accept(request_, strand_.wrap(std::bind(
&BaseWSPeer::on_write_sb, impl().shared_from_this(),
@@ -275,7 +275,7 @@ template<class Impl>
void
BaseWSPeer<Impl>::on_read(error_code const& ec)
{
if(ec == beast::wsproto::error::closed)
if(ec == beast::websocket::error::closed)
return do_close();
if(ec)
return fail(ec, "read");

4
src/ripple/server/impl/Door.cpp
View File

@@ -24,8 +24,8 @@
#include <ripple/server/impl/PlainHTTPPeer.h>
#include <ripple/server/impl/SSLHTTPPeer.h>
#include <boost/asio/buffer.hpp>
#include <beast/asio/placeholders.h>
#include <beast/asio/ssl_bundle.h>
#include <beast/placeholders.hpp>
#include <ripple/beast/asio/ssl_bundle.h>
#include <functional>
namespace ripple {

2
src/ripple/server/impl/Door.h
View File

@@ -22,7 +22,7 @@
#include <ripple/server/impl/io_list.h>
#include <ripple/server/impl/ServerImpl.h>
#include <beast/asio/streambuf.h>
#include <beast/streambuf.hpp>
#include <boost/asio/basic_waitable_timer.hpp>
#include <boost/asio/io_service.hpp>
#include <boost/asio/ip/tcp.hpp>

2
src/ripple/server/impl/PlainWSPeer.h
View File

@@ -39,7 +39,7 @@ private:
using waitable_timer = boost::asio::basic_waitable_timer <clock_type>;
using socket_type = boost::asio::ip::tcp::socket;
beast::wsproto::socket<socket_type> ws_;
beast::websocket::stream<socket_type> ws_;
public:
template<class Body, class Headers>

4
src/ripple/server/impl/Port.cpp
View File

@@ -18,7 +18,7 @@
//==============================================================================
#include <ripple/server/Port.h>
#include <beast/http/rfc2616.h>
#include <beast/http/rfc2616.hpp>
#include <ripple/beast/core/LexicalCast.h>
namespace ripple {
@@ -192,7 +192,7 @@ parse_Port (ParsedPort& port, Section const& section, std::ostream& log)
{
auto const lim = get (section, "limit", "unlimited");
if (!beast::ci_equal (lim, "unlimited"))
if (!beast::detail::ci_equal (lim, "unlimited"))
{
try
{

2
src/ripple/server/impl/SSLHTTPPeer.h
View File

@@ -22,7 +22,7 @@
#include <ripple/server/impl/BaseHTTPPeer.h>
#include <ripple/server/impl/SSLWSPeer.h>
#include <beast/asio/ssl_bundle.h>
#include <ripple/beast/asio/ssl_bundle.h>
#include <memory>
namespace ripple {

8
src/ripple/server/impl/SSLWSPeer.h
View File

@@ -22,9 +22,9 @@
#include <ripple/server/impl/BaseHTTPPeer.h>
#include <ripple/server/WSSession.h>
#include <beast/asio/ssl_bundle.h>
#include <beast/asio/placeholders.h>
#include <beast/wsproto/ssl.h>
#include <ripple/beast/asio/ssl_bundle.h>
#include <beast/placeholders.hpp>
#include <beast/websocket/ssl.hpp>
#include <memory>
namespace ripple {
@@ -44,7 +44,7 @@ private:
boost::asio::basic_waitable_timer <clock_type>;
std::unique_ptr<beast::asio::ssl_bundle> ssl_bundle_;
beast::wsproto::socket<
beast::websocket::stream<
beast::asio::ssl_bundle::stream_type&> ws_;
public:

6
src/ripple/server/impl/ServerHandlerImp.cpp
View File

@@ -38,8 +38,8 @@
#include <ripple/resource/Fees.h>
#include <ripple/rpc/impl/Tuning.h>
#include <ripple/rpc/RPCHandler.h>
#include <beast/crypto/base64.h>
#include <beast/http/rfc2616.h>
#include <beast/detail/base64.hpp>
#include <beast/http/rfc2616.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/type_traits.hpp>
#include <boost/optional.hpp>
@@ -676,7 +676,7 @@ ServerHandlerImp::authorized (Port const& port,
return false;
std::string strUserPass64 = it->second.substr (6);
boost::trim (strUserPass64);
std::string strUserPass = beast::base64_decode (strUserPass64);
std::string strUserPass = beast::detail::base64_decode (strUserPass64);
std::string::size_type nColon = strUserPass.find (":");
if (nColon == std::string::npos)
return false;

2
src/ripple/server/tests/Server_test.cpp
View File

@@ -23,7 +23,7 @@
#include <ripple/server/make_Server.h>
#include <ripple/server/Server.h>
#include <ripple/server/Session.h>
#include <beast/unit_test/suite.h>
#include <ripple/beast/unit_test.h>
#include <boost/asio.hpp>
#include <boost/optional.hpp>
#include <boost/utility/in_place_factory.hpp>