Skip to content
Snippets Groups Projects
Commit 166b5e35 authored by Seva's avatar Seva Committed by Adrien Béraud
Browse files

proxyserver: default push to localhost if empty host

parent 77356b05
Branches
Tags
No related merge requests found
...@@ -360,7 +360,7 @@ private: ...@@ -360,7 +360,7 @@ private:
mutable std::atomic<size_t> requestNum_ {0}; mutable std::atomic<size_t> requestNum_ {0};
mutable std::atomic<time_point> lastStatsReset_ {time_point::min()}; mutable std::atomic<time_point> lastStatsReset_ {time_point::min()};
const std::string pushServer_; std::string pushServer_;
#ifdef OPENDHT_PUSH_NOTIFICATIONS #ifdef OPENDHT_PUSH_NOTIFICATIONS
struct Listener { struct Listener {
......
...@@ -222,6 +222,16 @@ DhtProxyServer::DhtProxyServer( ...@@ -222,6 +222,16 @@ DhtProxyServer::DhtProxyServer(
jsonBuilder_["commentStyle"] = "None"; jsonBuilder_["commentStyle"] = "None";
jsonBuilder_["indentation"] = ""; jsonBuilder_["indentation"] = "";
if (!pushServer.empty()){
// no host delim, assume port only
if (pushServer.find(":") == std::string::npos)
pushServer_ = "localhost:" + pushServer_;
// define http request destination for push notifications
pushHostPort_ = splitPort(pushServer_);
if (logger_)
logger_->d("Using push server for notifications: %s:%s", pushHostPort_.first.c_str(),
pushHostPort_.second.c_str());
}
if (identity.first and identity.second) { if (identity.first and identity.second) {
asio::error_code ec; asio::error_code ec;
// define tls context // define tls context
...@@ -258,8 +268,6 @@ DhtProxyServer::DhtProxyServer( ...@@ -258,8 +268,6 @@ DhtProxyServer::DhtProxyServer(
restinio::own_io_context(), restinio::own_io_context(),
std::forward<restinio::run_on_this_thread_settings_t<RestRouterTraitsTls>>(std::move(settings)) std::forward<restinio::run_on_this_thread_settings_t<RestRouterTraitsTls>>(std::move(settings))
); );
// define http request destination
pushHostPort_ = splitPort(pushServer_);
// run http server // run http server
serverThread_ = std::thread([this]{ serverThread_ = std::thread([this]{
httpsServer_->open_async([]{/*ok*/}, [](std::exception_ptr ex){ httpsServer_->open_async([]{/*ok*/}, [](std::exception_ptr ex){
...@@ -276,8 +284,6 @@ DhtProxyServer::DhtProxyServer( ...@@ -276,8 +284,6 @@ DhtProxyServer::DhtProxyServer(
restinio::own_io_context(), restinio::own_io_context(),
std::forward<restinio::run_on_this_thread_settings_t<RestRouterTraits>>(std::move(settings)) std::forward<restinio::run_on_this_thread_settings_t<RestRouterTraits>>(std::move(settings))
); );
// define http request destination
pushHostPort_ = splitPort(pushServer_);
// run http server // run http server
serverThread_ = std::thread([this](){ serverThread_ = std::thread([this](){
httpServer_->open_async([]{/*ok*/}, [](std::exception_ptr ex){ httpServer_->open_async([]{/*ok*/}, [](std::exception_ptr ex){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment