Simplify body
Now that we have a custom boost http body class, we can use it in more
cases. There's some significant overhead and code when switching to a
file body, namely removing all the headers. Making the body class
support strings would allow us to completely avoid that inefficiency.
At the same time, it would mean that we can now use that class for all
cases, including HttpClient, and http::Request. This leads to some code
reduction overall, and means we're reliant on fewer beast structures.
As an added benefit, we no longer have to take a dependency on
boost::variant2.
Tested: Redfish service validator passes, with the exception of
badNamespaceInclude, which is showing warnings prior to this commit.
Change-Id: I061883a73230d6085d951c15891465c2c8445969
Signed-off-by: Ed Tanous <ed@tanous.net>
diff --git a/http/websocket.hpp b/http/websocket.hpp
index 4f5b3c1..388a3e4 100644
--- a/http/websocket.hpp
+++ b/http/websocket.hpp
@@ -128,8 +128,7 @@
}));
// Make a pointer to keep the req alive while we accept it.
- using Body =
- boost::beast::http::request<boost::beast::http::string_body>;
+ using Body = boost::beast::http::request<bmcweb::FileBody>;
std::unique_ptr<Body> mobile = std::make_unique<Body>(req.req);
Body* ptr = mobile.get();
// Perform the websocket upgrade
@@ -227,8 +226,8 @@
}
void acceptDone(const std::shared_ptr<Connection>& /*self*/,
- const std::unique_ptr<boost::beast::http::request<
- boost::beast::http::string_body>>& /*req*/,
+ const std::unique_ptr<
+ boost::beast::http::request<bmcweb::FileBody>>& /*req*/,
const boost::system::error_code& ec)
{
if (ec)