Update style to (almost) conform to ndn-cxx style using clang-format
diff --git a/server/connection.cpp b/server/connection.cpp
index 207c8c8..cdbf1b2 100644
--- a/server/connection.cpp
+++ b/server/connection.cpp
@@ -28,88 +28,85 @@
//
#include "connection.hpp"
-#include <vector>
-#include <boost/bind.hpp>
#include "connection_manager.hpp"
#include "request_handler.hpp"
+#include <boost/bind.hpp>
+#include <vector>
namespace http {
namespace server {
-connection::connection(boost::asio::io_service& io_service,
- connection_manager& manager, request_handler& handler)
- : socket_(io_service),
- connection_manager_(manager),
- request_handler_(handler)
+connection::connection(boost::asio::io_service& io_service, connection_manager& manager,
+ request_handler& handler)
+ : socket_(io_service)
+ , connection_manager_(manager)
+ , request_handler_(handler)
{
}
-boost::asio::ip::tcp::socket& connection::socket()
+boost::asio::ip::tcp::socket&
+connection::socket()
{
return socket_;
}
-void connection::start()
+void
+connection::start()
{
socket_.async_read_some(boost::asio::buffer(buffer_),
- boost::bind(&connection::handle_read, shared_from_this(),
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&connection::handle_read, shared_from_this(),
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
-void connection::stop()
+void
+connection::stop()
{
socket_.close();
}
-void connection::handle_read(const boost::system::error_code& e,
- std::size_t bytes_transferred)
+void
+connection::handle_read(const boost::system::error_code& e, std::size_t bytes_transferred)
{
- if (!e)
- {
+ if (!e) {
boost::tribool result;
- boost::tie(result, boost::tuples::ignore) = request_parser_.parse(
- request_, buffer_.data(), buffer_.data() + bytes_transferred);
+ boost::tie(result, boost::tuples::ignore) =
+ request_parser_.parse(request_, buffer_.data(), buffer_.data() + bytes_transferred);
- if (result)
- {
+ if (result) {
request_handler_.handle_request(request_, reply_);
boost::asio::async_write(socket_, reply_.to_buffers(),
- boost::bind(&connection::handle_write, shared_from_this(),
- boost::asio::placeholders::error));
+ boost::bind(&connection::handle_write, shared_from_this(),
+ boost::asio::placeholders::error));
}
- else if (!result)
- {
+ else if (!result) {
reply_ = reply::stock_reply(reply::bad_request);
boost::asio::async_write(socket_, reply_.to_buffers(),
- boost::bind(&connection::handle_write, shared_from_this(),
- boost::asio::placeholders::error));
+ boost::bind(&connection::handle_write, shared_from_this(),
+ boost::asio::placeholders::error));
}
- else
- {
+ else {
socket_.async_read_some(boost::asio::buffer(buffer_),
- boost::bind(&connection::handle_read, shared_from_this(),
- boost::asio::placeholders::error,
- boost::asio::placeholders::bytes_transferred));
+ boost::bind(&connection::handle_read, shared_from_this(),
+ boost::asio::placeholders::error,
+ boost::asio::placeholders::bytes_transferred));
}
}
- else if (e != boost::asio::error::operation_aborted)
- {
+ else if (e != boost::asio::error::operation_aborted) {
connection_manager_.stop(shared_from_this());
}
}
-void connection::handle_write(const boost::system::error_code& e)
+void
+connection::handle_write(const boost::system::error_code& e)
{
- if (!e)
- {
+ if (!e) {
// Initiate graceful connection closure.
boost::system::error_code ignored_ec;
socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignored_ec);
}
- if (e != boost::asio::error::operation_aborted)
- {
+ if (e != boost::asio::error::operation_aborted) {
connection_manager_.stop(shared_from_this());
}
}