From 2a2555f0c2593ce32622be32d048bc4b58c53c8f Mon Sep 17 00:00:00 2001 From: Seva Date: Wed, 3 Jul 2019 12:10:49 -0400 Subject: [PATCH] dhtproxy: fix type nomenclature & compile warnings --- include/opendht/dht_proxy_client.h | 2 +- include/opendht/http.h | 14 ++++----- src/dht_proxy_client.cpp | 46 +++++++++++++++--------------- src/dht_proxy_server.cpp | 8 +++--- src/http.cpp | 18 ++++++------ 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/include/opendht/dht_proxy_client.h b/include/opendht/dht_proxy_client.h index 9d6d51af..ec87f465 100644 --- a/include/opendht/dht_proxy_client.h +++ b/include/opendht/dht_proxy_client.h @@ -197,7 +197,7 @@ public: void pushNotificationReceived(const std::map& notification); time_point periodic(const uint8_t*, size_t, const SockAddr&); - time_point periodic(const uint8_t *buf, size_t buflen, const sockaddr* from, socklen_t fromlen) { + time_point periodic(const uint8_t* buf, size_t buflen, const sockaddr* from, socklen_t fromlen) { return periodic(buf, buflen, SockAddr(from, fromlen)); } diff --git a/include/opendht/http.h b/include/opendht/http.h index ad1585ef..43cc3a00 100644 --- a/include/opendht/http.h +++ b/include/opendht/http.h @@ -86,7 +86,7 @@ public: * Connection state change used to handle Listeners disconnects. * RESTinio >= 0.5.1 https://github.com/Stiffstream/restinio/issues/28 */ - void state_changed(const restinio::connection_state::notice_t ¬ice) noexcept; + void state_changed(const restinio::connection_state::notice_t& notice) noexcept; private: std::string to_str( restinio::connection_state::cause_t cause ) noexcept; @@ -101,10 +101,10 @@ private: class OPENDHT_PUBLIC Client { public: - using HandlerCb = std::function; + using HandlerCb = std::function; using ConnectionCb = std::function)>; - Client(asio::io_context &ctx, const std::string host, const std::string service = "80", + Client(asio::io_context& ctx, const std::string host, const std::string service = "80", std::shared_ptr logger = {}, const bool resolve = true); asio::io_context& io_context(); @@ -131,18 +131,18 @@ public: private: std::shared_ptr create_connection(); - void handle_connect(const asio::error_code &ec, + void handle_connect(const asio::error_code& ec, asio::ip::tcp::resolver::iterator endpoint_it, std::shared_ptr conn = {}, HandlerCb cb = {}); - void handle_resolve(const asio::error_code &ec, + void handle_resolve(const asio::error_code& ec, asio::ip::tcp::resolver::iterator endpoint_it, std::shared_ptr conn = {}); - void handle_request(const asio::error_code &ec, + void handle_request(const asio::error_code& ec, std::shared_ptr conn = {}); - void handle_response(const asio::error_code &ec, + void handle_response(const asio::error_code& ec, std::shared_ptr conn = {}); std::string service_; diff --git a/src/dht_proxy_client.cpp b/src/dht_proxy_client.cpp index ba40204a..bd567749 100644 --- a/src/dht_proxy_client.cpp +++ b/src/dht_proxy_client.cpp @@ -71,8 +71,8 @@ struct DhtProxyClient::ProxySearch { DhtProxyClient::DhtProxyClient() {} -DhtProxyClient::DhtProxyClient(std::function signal, const std::string &serverHost, - const std::string &pushClientId, std::shared_ptr logger): +DhtProxyClient::DhtProxyClient(std::function signal, const std::string& serverHost, + const std::string& pushClientId, std::shared_ptr logger): pushClientId_(pushClientId), loopSignal_(signal), logger_(logger) { @@ -93,7 +93,7 @@ DhtProxyClient::DhtProxyClient(std::function signal, const std::string & if (logger_) logger_->d("[proxy:client] http client io context stopped"); } - catch(const std::exception &ex){ + catch(const std::exception& ex){ if (logger_) logger_->e("[proxy:client] error starting io context"); } @@ -302,7 +302,7 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, { std::lock_guard lock(lockCallbacks_); callbacks_.emplace_back([=](){ - donecb(context->ok, {}); + donecb(ok, {}); context->stop = true; }); } @@ -317,7 +317,7 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { auto context = static_cast(parser->data); if (parser->status_code != 200){ if (context->logger) @@ -326,7 +326,7 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, } return 0; }; - parser_s->on_body = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_body = [](http_parser* parser, const char* at, size_t length) -> int { auto context = static_cast(parser->data); try { Json::Value json; @@ -351,7 +351,7 @@ DhtProxyClient::get(const InfoHash& key, GetCallback cb, DoneCallback donecb, } return 0; }; - parser_s->on_message_complete = [](http_parser *parser) -> int { + parser_s->on_message_complete = [](http_parser* parser) -> int { auto context = static_cast(parser->data); try { if (context->donecb) @@ -390,12 +390,12 @@ DhtProxyClient::put(const InfoHash& key, Sp val, DoneCallback cb, if (permanent) { std::lock_guard lock(searchLock_); auto id = val->id; - auto &search = searches_[key]; + auto& search = searches_[key]; auto refreshTimer = std::make_shared(httpContext_, std::chrono::steady_clock::now() + proxy::OP_TIMEOUT - proxy::OP_MARGIN); auto ok = std::make_shared(false); // define refresh timer handler - refreshTimer->async_wait([this, key, id, ok](const asio::error_code &ec){ + refreshTimer->async_wait([this, key, id, ok](const asio::error_code& ec){ if (ec){ if (logger_) logger_->e("[proxy:client] [listener:refresh] error key=%s", key.toString().c_str()); @@ -467,7 +467,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp val, DoneCallback cb, time_ { std::lock_guard lock(lockCallbacks_); callbacks_.emplace_back([=](){ - cb(context->ok, {}); + cb(ok, {}); }); } loopSignal_(); @@ -481,7 +481,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp val, DoneCallback cb, time_ auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { GetContext* context = static_cast(parser->data); if (parser->status_code == 200){ context->ok = true; @@ -491,7 +491,7 @@ DhtProxyClient::doPut(const InfoHash& key, Sp val, DoneCallback cb, time_ } return 0; }; - parser_s->on_message_complete = [](http_parser * parser) -> int { + parser_s->on_message_complete = [](http_parser* parser) -> int { auto context = static_cast(parser->data); try { if (context->donecb) @@ -589,7 +589,7 @@ DhtProxyClient::getProxyInfos() } void -DhtProxyClient::handleProxyStatus(const asio::error_code &ec, +DhtProxyClient::handleProxyStatus(const asio::error_code& ec, std::shared_ptr infoState) { if (ec){ @@ -600,7 +600,7 @@ DhtProxyClient::handleProxyStatus(const asio::error_code &ec, } // A node can have a Ipv4 and a Ipv6. So, we need to retrieve all public ips httpClient_->async_resolve(serverHostService_.first, serverHostService_.second, - [this, infoState](const asio::error_code &ec){ + [this, infoState](const asio::error_code& ec){ if (ec){ logger_->e("[proxy:client] [status] error resolving: %s", ec.message().c_str()); return; @@ -651,7 +651,7 @@ DhtProxyClient::handleProxyStatus(const asio::error_code &ec, // init the parser callbacks auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { auto context = static_cast(parser->data); if (parser->status_code != 200){ if (context->logger) @@ -660,7 +660,7 @@ DhtProxyClient::handleProxyStatus(const asio::error_code &ec, } return 0; }; - parser_s->on_body = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_body = [](http_parser* parser, const char* at, size_t length) -> int { auto context = static_cast(parser->data); try{ std::string err; @@ -830,7 +830,7 @@ DhtProxyClient::listen(const InfoHash& key, ValueCallback cb, Value::Filter filt l->second.refreshTimer->expires_at(std::chrono::steady_clock::now() + proxy::OP_TIMEOUT - proxy::OP_MARGIN); l->second.refreshTimer->async_wait( - [this, key, token, state](const asio::error_code &ec) + [this, key, token, state](const asio::error_code& ec) { if (ec){ if (logger_) @@ -912,9 +912,9 @@ DhtProxyClient::cancelListen(const InfoHash& key, size_t gtoken) { void DhtProxyClient::sendListen(const restinio::http_request_header_t header, - const ValueCallback &cb, const Value::Filter &filter, - const Sp &state, - Listener &listener, ListenMethod method) + const ValueCallback& cb, const Value::Filter& filter, + const Sp& state, + Listener& listener, ListenMethod method) { auto headers = this->initHeaderFields(); auto conn = restinio::http_connection_header_t::close; @@ -951,7 +951,7 @@ DhtProxyClient::sendListen(const restinio::http_request_header_t header, auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { auto context = static_cast(parser->data); if (parser->status_code != 200){ if (context->logger) @@ -960,7 +960,7 @@ DhtProxyClient::sendListen(const restinio::http_request_header_t header, } return 0; }; - parser_s->on_body = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_body = [](http_parser* parser, const char* at, size_t length) -> int { auto context = static_cast(parser->data); try { Json::Value json; @@ -1051,7 +1051,7 @@ DhtProxyClient::doCancelListen(const InfoHash& key, size_t ltoken) // define callbacks auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = [](http_parser *parser, const char *at, size_t length) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { auto context = static_cast(parser->data); if (parser->status_code != 200){ if (context->logger) diff --git a/src/dht_proxy_server.cpp b/src/dht_proxy_server.cpp index 5fbdb80f..c8f45848 100644 --- a/src/dht_proxy_server.cpp +++ b/src/dht_proxy_server.cpp @@ -274,7 +274,7 @@ DhtProxyServer::createRestRouter() RequestStatus DhtProxyServer::getNodeInfo(restinio::request_handle_t request, - restinio::router::route_params_t params) const + restinio::router::route_params_t /*params*/) const { Json::Value result; std::lock_guard lck(statsMutex_); @@ -294,7 +294,7 @@ DhtProxyServer::getNodeInfo(restinio::request_handle_t request, RequestStatus DhtProxyServer::getStats(restinio::request_handle_t request, - restinio::router::route_params_t params) + restinio::router::route_params_t /*params*/) { requestNum_++; try { @@ -680,7 +680,7 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso auto parser_s = std::make_shared(); http_parser_settings_init(parser_s.get()); - parser_s->on_status = []( http_parser * parser, const char * at, size_t length ) -> int { + parser_s->on_status = [](http_parser* parser, const char* /*at*/, size_t /*length*/) -> int { auto context = static_cast(parser->data); if (parser->status_code == 200) return 0; @@ -977,7 +977,7 @@ DhtProxyServer::putEncrypted(restinio::request_handle_t request, RequestStatus DhtProxyServer::options(restinio::request_handle_t request, - restinio::router::route_params_t params) + restinio::router::route_params_t /*params*/) { this->requestNum_++; #ifdef OPENDHT_PROXY_SERVER_IDENTITY diff --git a/src/http.cpp b/src/http.cpp index bf4fb6e8..6933620c 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -65,7 +65,7 @@ ConnectionListener::~ConnectionListener() {} void -ConnectionListener::state_changed(const restinio::connection_state::notice_t ¬ice) noexcept +ConnectionListener::state_changed(const restinio::connection_state::notice_t& notice) noexcept { std::lock_guard lock(*lock_); auto id = notice.connection_id(); @@ -107,7 +107,7 @@ ConnectionListener::to_str(restinio::connection_state::cause_t cause) noexcept // client -Client::Client(asio::io_context &ctx, const std::string host, const std::string service, +Client::Client(asio::io_context& ctx, const std::string host, const std::string service, std::shared_ptr logger, const bool resolve): resolver_(ctx), logger_(logger) { @@ -139,7 +139,7 @@ Client::active_connection(const ConnectionId conn_id) void Client::close_connection(const ConnectionId conn_id) { - auto &req = requests_[conn_id]; + auto& req = requests_[conn_id]; // ensure on_message_complete is fired http_parser_execute(req.parser.get(), req.parser_settings.get(), "", 0); // close the socket @@ -164,7 +164,7 @@ Client::async_resolve(const std::string host, const std::string service, Handler // resolve the query to the server resolver_.async_resolve(query, [this, host, service, cb]( - const asio::error_code &ec, + const asio::error_code& ec, asio::ip::tcp::resolver::results_type endpoints) { if (ec){ @@ -251,7 +251,7 @@ Client::async_connect(ConnectionCb cb) // try to connect conn->socket_.async_connect(endpoint, std::bind( &Client::handle_connect, this, std::placeholders::_1, ++endpoint_it, conn, - [this, endpoint, conn, cb](const asio::error_code &ec){ + [this, endpoint, conn, cb](const asio::error_code& ec){ if (!ec){ // save the associated endpoint conn->endpoint_ = endpoint; @@ -264,7 +264,7 @@ Client::async_connect(ConnectionCb cb) } void -Client::handle_connect(const asio::error_code &ec, +Client::handle_connect(const asio::error_code& ec, asio::ip::tcp::resolver::iterator endpoint_it, std::shared_ptr conn, HandlerCb cb) { @@ -324,7 +324,7 @@ Client::async_request(std::shared_ptr conn, std::string request, } void -Client::handle_request(const asio::error_code &ec, std::shared_ptr conn) +Client::handle_request(const asio::error_code& ec, std::shared_ptr conn) { if (!conn->is_open()) return; @@ -345,7 +345,7 @@ Client::handle_request(const asio::error_code &ec, std::shared_ptr c } void -Client::handle_response(const asio::error_code &ec, std::shared_ptr conn) +Client::handle_response(const asio::error_code& ec, std::shared_ptr conn) { if (!conn->is_open()) return; @@ -370,7 +370,7 @@ Client::handle_response(const asio::error_code &ec, std::shared_ptr logger_->d("%s", str_s.str().c_str()); // parse the request - auto &req = requests_[conn->id()]; + auto& req = requests_[conn->id()]; http_parser_execute(req.parser.get(), req.parser_settings.get(), str_s.str().c_str(), str_s.str().size());