Skip to content

Commit 5020f7d

Browse files
committed
Misc cleanup improvements to the x-plat http listener implementation.
1. Whitespace clean up issues with tabs/indentation/spaces, brackets on wrong l$ 2. Removed using statements from header files. 3. Removed unused macro. 4. Updated some loops to be ranged based for loops. 5. Updated some unique_ptr to use our utility make unique_ptr. 6. Replaced some hardcoded http header field names.
1 parent 5d7934b commit 5020f7d

File tree

2 files changed

+122
-129
lines changed

2 files changed

+122
-129
lines changed

Release/include/cpprest/http_linux_server.h

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,12 @@
1919
#include "pplx/threadpool.h"
2020
#include "http_server.h"
2121

22-
using boost::asio::ip::tcp;
23-
using namespace boost::asio;
24-
25-
#define FAILED(x) ((x) != 0)
26-
2722
namespace web
2823
{
29-
3024
namespace http
3125
{
32-
3326
namespace experimental
3427
{
35-
3628
namespace listener
3729
{
3830

@@ -41,7 +33,6 @@ class http_linux_server;
4133
namespace details
4234
{
4335

44-
4536
struct linux_request_context : web::http::details::_http_server_context
4637
{
4738
linux_request_context(){}
@@ -58,7 +49,7 @@ class hostport_listener;
5849
class connection
5950
{
6051
private:
61-
std::unique_ptr<tcp::socket> m_socket;
52+
std::unique_ptr<boost::asio::ip::tcp::socket> m_socket;
6253
boost::asio::streambuf m_request_buf;
6354
boost::asio::streambuf m_response_buf;
6455
http_linux_server* m_p_server;
@@ -71,7 +62,7 @@ class connection
7162
std::atomic<int> m_refs; // track how many threads are still referring to this
7263

7364
public:
74-
connection(std::unique_ptr<tcp::socket> socket, http_linux_server* server, hostport_listener* parent)
65+
connection(std::unique_ptr<boost::asio::ip::tcp::socket> socket, http_linux_server* server, hostport_listener* parent)
7566
: m_socket(std::move(socket))
7667
, m_request_buf()
7768
, m_response_buf()
@@ -113,7 +104,7 @@ class hostport_listener
113104
private:
114105
friend class connection;
115106

116-
std::unique_ptr<tcp::acceptor> m_acceptor;
107+
std::unique_ptr<boost::asio::ip::tcp::acceptor> m_acceptor;
117108
std::map<std::string, web::http::experimental::listener::details::http_listener_impl* > m_listeners;
118109
pplx::extensibility::reader_writer_lock_t m_listeners_lock;
119110

@@ -155,14 +146,12 @@ class hostport_listener
155146
void remove_listener(const std::string& path, web::http::experimental::listener::details::http_listener_impl* listener);
156147

157148
private:
158-
void on_accept(ip::tcp::socket* socket, const boost::system::error_code& ec);
149+
void on_accept(boost::asio::ip::tcp::socket* socket, const boost::system::error_code& ec);
159150

160151
};
161152

162153
}
163154

164-
using namespace http::experimental::listener::details;
165-
166155
struct iequal_to
167156
{
168157
bool operator()(const std::string& left, const std::string& right) const
@@ -177,8 +166,8 @@ class http_linux_server : public web::http::experimental::details::http_server
177166
friend class http::experimental::listener::details::connection;
178167

179168
pplx::extensibility::reader_writer_lock_t m_listeners_lock;
180-
std::map<std::string, std::unique_ptr<hostport_listener>, iequal_to> m_listeners;
181-
std::unordered_map<web::http::experimental::listener::details::http_listener_impl *, std::unique_ptr<pplx::extensibility::reader_writer_lock_t>> m_registered_listeners;
169+
std::map<std::string, std::unique_ptr<details::hostport_listener>, iequal_to> m_listeners;
170+
std::unordered_map<details::http_listener_impl *, std::unique_ptr<pplx::extensibility::reader_writer_lock_t>> m_registered_listeners;
182171
bool m_started;
183172

184173
public:
@@ -202,7 +191,4 @@ class http_linux_server : public web::http::experimental::details::http_server
202191
pplx::task<void> respond(http::http_response response);
203192
};
204193

205-
}
206-
}
207-
}
208-
}
194+
}}}}

0 commit comments

Comments
 (0)