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

More de-bastardizing.

Browse Source
This commit is contained in:
JoelKatz
2013-01-25 11:08:49 -08:00
parent 938357b7ae
commit 2fb4df3ba3
3 changed files with 60 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/cpp/websocketpp/src/connection.hpp
View File

@@ -899,38 +899,18 @@ public:
{
// TODO: read timeout timer?
if (socket_type::get_socket().isSecure())
{
boost::asio::async_read(
socket_type::get_socket().SSLSocket(),
m_buf,
boost::asio::transfer_at_least(std::min(
m_read_threshold,
static_cast<size_t>(m_processor->get_bytes_needed())
)),
m_strand.wrap(boost::bind(
&type::handle_read_frame,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
}
else
{
boost::asio::async_read(
socket_type::get_socket().PlainSocket(),
m_buf,
boost::asio::transfer_at_least(std::min(
m_read_threshold,
static_cast<size_t>(m_processor->get_bytes_needed())
)),
m_strand.wrap(boost::bind(
&type::handle_read_frame,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
}
socket_type::get_socket().async_read(
m_buf,
boost::asio::transfer_at_least(std::min(
m_read_threshold,
static_cast<size_t>(m_processor->get_bytes_needed())
)),
m_strand.wrap(boost::bind(
&type::handle_read_frame,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
}
}
public:
@@ -1228,31 +1208,14 @@ public:
//m_endpoint.alog().at(log::alevel::DEVEL) << "write header: " << zsutil::to_hex(m_write_queue.front()->get_header()) << log::endl;
if (socket_type::get_socket().isSecure())
{
boost::asio::async_write(
socket_type::get_socket().SSLSocket(),
m_write_buf,
m_strand.wrap(boost::bind(
&type::handle_write,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
}
else
{
boost::asio::async_write(
socket_type::get_socket().PlainSocket(),
m_write_buf,
m_strand.wrap(boost::bind(
&type::handle_write,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
}
socket_type::get_socket().async_write(
m_write_buf,
m_strand.wrap(boost::bind(
&type::handle_write,
type::shared_from_this(),
boost::asio::placeholders::error
))
);
} else {
// if we are in an inturrupted state and had nothing else to write
// it is safe to terminate the connection.

41
src/cpp/websocketpp/src/roles/server.hpp
View File

@@ -544,36 +544,17 @@ void server<endpoint>::connection<connection_type>::async_init() {
m_connection.register_timeout(5000,fail::status::TIMEOUT_WS,
"Timeout on WebSocket handshake");
if (m_connection.get_socket().isSecure())
{
boost::asio::async_read_until(
m_connection.get_socket().SSLSocket(),
m_connection.buffer(),
// match_header,
"\r\n\r\n",
m_connection.get_strand().wrap(boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred
))
);
}
else
{
boost::asio::async_read_until(
m_connection.get_socket().PlainSocket(),
m_connection.buffer(),
// match_header,
"\r\n\r\n",
m_connection.get_strand().wrap(boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred
))
);
}
m_connection.get_socket().async_read_until(
m_connection.buffer(),
// match_header,
std::string("\r\n\r\n"),
m_connection.get_strand().wrap(boost::bind(
&type::handle_read_request,
m_connection.shared_from_this(),
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred
))
);
}
/// processes the response from an async read for an HTTP header