0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #19687

Browse source 
Convert to async i/o the use of asio::write() in connection::transfer()
when sending data size. That'll prevent exceptions from escaping through
connection::transfer().
This commit is contained in:
Sergey Popov 2012-05-06 19:18:05 +00:00
parent 6b12e3e4cd
commit 4ebe6a850f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/network_asio.cpp
View file

@ -13,6 +13,7 @@
See the COPYING file for more details.
*/
#include <deque>
#include <boost/bind.hpp>
#include <boost/ref.hpp>
#include <boost/cstdint.hpp>
@ -120,11 +121,13 @@ void connection::transfer(const config& request, config& response)
std::ostream os(&write_buf_);
write_gz(os, request);
bytes_to_write_ = write_buf_.size();
bytes_to_write_ = write_buf_.size() + 4;
bytes_written_ = 0;
std::size_t size = htonl(bytes_to_write_);
boost::asio::write(socket_, boost::asio::buffer(reinterpret_cast<const char*>(&size), 4));
boost::asio::async_write(socket_, write_buf_,
payload_size_ = htonl(bytes_to_write_ - 4);
boost::asio::streambuf::const_buffers_type gzipped_data = write_buf_.data();
std::deque<boost::asio::const_buffer> bufs(gzipped_data.begin(), gzipped_data.end());
bufs.push_front(boost::asio::buffer(reinterpret_cast<const char*>(&payload_size_), 4));
boost::asio::async_write(socket_, bufs,
boost::bind(&connection::is_write_complete, this, _1, _2),
boost::bind(&connection::handle_write, this, _1, _2)
);
@ -166,6 +169,7 @@ void connection::handle_write(
)
{
DBG_NW << "Written " << bytes_transferred << " bytes.\n";
write_buf_.consume(bytes_transferred);
if(ec)
throw system_error(ec);
}

1
src/network_asio.hpp
View file

@ -91,6 +91,7 @@ class connection
std::size_t bytes_transferred,
config& response
);
boost::uint32_t payload_size_;
std::size_t bytes_to_write_;
std::size_t bytes_written_;
std::size_t bytes_to_read_;