diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-01-10 11:50:58 +0100 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-01-10 11:50:58 +0100 |
commit | ab8a32429a2394e183d3d999859017c51cc0b469 (patch) | |
tree | 6a0d636d4cddcf254e98aa55d72c26e8bbf8ec65 /contrib/epee/include/net/http_server_impl_base.h | |
parent | Merge pull request #2983 (diff) | |
parent | fix some link errors in debug mode for macos (diff) | |
download | monero-ab8a32429a2394e183d3d999859017c51cc0b469.tar.xz |
Merge pull request #2985
6d8b29ef fix some link errors in debug mode for macos (stoffu)
fdd4c5e5 move memwipe to epee to avoid common<->crypto circular dependencies (moneromooo-monero)
40ab12a7 epee: remove dependency on common (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/net/http_server_impl_base.h')
-rw-r--r-- | contrib/epee/include/net/http_server_impl_base.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/epee/include/net/http_server_impl_base.h b/contrib/epee/include/net/http_server_impl_base.h index 8b8e31b51..1a97e610a 100644 --- a/contrib/epee/include/net/http_server_impl_base.h +++ b/contrib/epee/include/net/http_server_impl_base.h @@ -55,13 +55,14 @@ namespace epee : m_net_server(external_io_service) {} - bool init(const std::string& bind_port = "0", const std::string& bind_ip = "0.0.0.0", + bool init(std::function<void(size_t, uint8_t*)> rng, const std::string& bind_port = "0", const std::string& bind_ip = "0.0.0.0", std::vector<std::string> access_control_origins = std::vector<std::string>(), boost::optional<net_utils::http::login> user = boost::none) { //set self as callback handler m_net_server.get_config_object().m_phandler = static_cast<t_child_class*>(this); + m_net_server.get_config_object().rng = std::move(rng); //here set folder for hosting reqests m_net_server.get_config_object().m_folder = ""; |