mirror of
https://github.com/Xahau/xahaud.git
synced 2026-09-28 16:08:05 +00:00
b8c80c51db
Resolves the 28 conflicts from cherry-picking XRPLF/rippled 1506e65558 (#5570) onto origin/dev: - io_service -> io_context everywhere upstream renamed it, keeping the xahaud-only code around those lines (UDP door in ServerImpl, sticky endpoint selection in WorkBase with bind_executor instead of strand.wrap, useSqLiteStore in PeerfinderManager, RPCSub after #677). - src/xrpld/rpc/detail/RPCSub.cpp (upstream path) dropped; xahaud's copy lives at src/xrpld/net/detail/RPCSub.cpp and its local io_service is renamed there. - conanfile.py: boost/1.88.0 in xahaud's override form, without_cobalt on gcc/clang; boost::boost kept. - Boost 1.88 removes the io_service typedef and address::from_string and makes Boost.Process v2 the default: the #677 tests move to io_context, executor_work_guard and make_address; Main.cpp includes the v1 process headers it already uses instead of the umbrella. Not yet compiled.
46 lines
1.6 KiB
C++
46 lines
1.6 KiB
C++
//------------------------------------------------------------------------------
|
|
/*
|
|
This file is part of rippled: https://github.com/ripple/rippled
|
|
Copyright (c) 2012, 2013 Ripple Labs Inc.
|
|
|
|
Permission to use, copy, modify, and/or distribute this software for any
|
|
purpose with or without fee is hereby granted, provided that the above
|
|
copyright notice and this permission notice appear in all copies.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
//==============================================================================
|
|
|
|
#ifndef RIPPLE_SERVER_SERVER_H_INCLUDED
|
|
#define RIPPLE_SERVER_SERVER_H_INCLUDED
|
|
|
|
#include <xrpl/beast/utility/Journal.h>
|
|
#include <xrpl/beast/utility/PropertyStream.h>
|
|
#include <xrpl/server/Port.h>
|
|
#include <xrpl/server/detail/ServerImpl.h>
|
|
|
|
#include <boost/asio/io_context.hpp>
|
|
|
|
namespace ripple {
|
|
|
|
/** Create the HTTP server using the specified handler. */
|
|
template <class Handler>
|
|
std::unique_ptr<Server>
|
|
make_Server(
|
|
Handler& handler,
|
|
boost::asio::io_context& io_context,
|
|
beast::Journal journal)
|
|
{
|
|
return std::make_unique<ServerImpl<Handler>>(handler, io_context, journal);
|
|
}
|
|
|
|
} // namespace ripple
|
|
|
|
#endif
|