ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes send buffer going out of scope, references #209

Browse Source
This commit is contained in:
Peter Thorson
2013-04-16 11:26:13 -05:00
parent 16f28ea671
commit 4bc4518df0
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websocketpp/connection.hpp
View File

@@ -1038,6 +1038,10 @@ private:
*/
std::vector<transport::buffer> m_send_buffer;
/// a pointer to hold on to the current message being written to keep it
/// from going out of scope before the write is complete.
message_ptr m_current_msg;
/// True if there is currently an outstanding transport write
/**
* Lock m_write_lock

12
websocketpp/impl/connection_impl.hpp
View File

@@ -1319,7 +1319,6 @@ template <typename config>
void connection<config>::write_frame() {
m_alog.write(log::alevel::devel,"connection write_frame");
message_ptr msg;
{
scoped_lock_type lock(m_write_lock);
@@ -1333,9 +1332,9 @@ void connection<config>::write_frame() {
// Get the next message in the queue. This will return an empty
// message if the queue was empty.
msg = write_pop();
m_current_msg = write_pop();
if (!msg) {
if (!m_current_msg) {
return;
}
@@ -1345,8 +1344,8 @@ void connection<config>::write_frame() {
m_write_flag = true;
}
const std::string& header = msg->get_header();
const std::string& payload = msg->get_payload();
const std::string& header = m_current_msg->get_header();
const std::string& payload = m_current_msg->get_payload();
m_send_buffer.push_back(transport::buffer(header.c_str(),header.size()));
m_send_buffer.push_back(transport::buffer(payload.c_str(),payload.size()));
@@ -1368,7 +1367,7 @@ void connection<config>::write_frame() {
lib::bind(
&type::handle_write_frame,
type::shared_from_this(),
msg->get_terminal(),
m_current_msg->get_terminal(),
lib::placeholders::_1
)
);
@@ -1379,6 +1378,7 @@ void connection<config>::handle_write_frame(bool terminate,
const lib::error_code& ec)
{
m_send_buffer.clear();
m_current_msg.reset();
if (ec) {
m_elog.write(log::elevel::fatal,"error in handle_write_frame: "+ec.message());