Added NetworkConfig.

This commit is contained in:
Jari Sundell
2025-09-11 23:09:24 +02:00
committed by GitHub
parent 65906a033a
commit ba1ba3096a
4 changed files with 26 additions and 40 deletions
+7 -24
View File
@@ -19,6 +19,8 @@
#include <torrent/object_stream.h>
#include <torrent/throttle.h>
#include <torrent/net/http_stack.h>
#include <torrent/net/network_config.h>
#include <torrent/net/socket_address.h>
#include <torrent/utils/log.h>
#include "rpc/parse_commands.h"
@@ -183,11 +185,6 @@ Manager::listen_open() {
throw torrent::input_error("Could not open/bind port for listening: " + std::string(rak::error_number::current().c_str()));
}
std::string
Manager::bind_address() const {
return rak::socket_address::cast_from(torrent::connection_manager()->bind_address())->address_str();
}
void
Manager::set_bind_address(const std::string& addr) {
int err;
@@ -201,18 +198,14 @@ Manager::set_bind_address(const std::string& addr) {
if (torrent::connection_manager()->listen_port() != 0) {
torrent::connection_manager()->listen_close();
torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
torrent::config::network_config()->set_bind_address(ai->address()->c_sockaddr());
listen_open();
} else {
torrent::connection_manager()->set_bind_address(ai->address()->c_sockaddr());
torrent::config::network_config()->set_bind_address(ai->address()->c_sockaddr());
}
if (ai->address()->is_address_any())
torrent::net_thread::http_stack()->set_bind_address(std::string());
else
torrent::net_thread::http_stack()->set_bind_address(ai->address()->address_str());
rak::address_info::free_address_info(ai);
} catch (torrent::input_error& e) {
@@ -221,11 +214,6 @@ Manager::set_bind_address(const std::string& addr) {
}
}
std::string
Manager::local_address() const {
return rak::socket_address::cast_from(torrent::connection_manager()->local_address())->address_str();
}
void
Manager::set_local_address(const std::string& addr) {
int err;
@@ -236,8 +224,8 @@ Manager::set_local_address(const std::string& addr) {
throw torrent::input_error("Could not set local address: " + std::string(rak::address_info::strerror(err)) + ".");
try {
torrent::config::network_config()->set_local_address(ai->address()->c_sockaddr());
torrent::connection_manager()->set_local_address(ai->address()->c_sockaddr());
rak::address_info::free_address_info(ai);
} catch (torrent::input_error& e) {
@@ -246,11 +234,6 @@ Manager::set_local_address(const std::string& addr) {
}
}
std::string
Manager::proxy_address() const {
return rak::socket_address::cast_from(torrent::connection_manager()->proxy_address())->address_str();
}
void
Manager::set_proxy_address(const std::string& addr) {
int port;
@@ -272,7 +255,7 @@ Manager::set_proxy_address(const std::string& addr) {
try {
ai->address()->set_port(port);
torrent::connection_manager()->set_proxy_address(ai->address()->c_sockaddr());
torrent::config::network_config()->set_proxy_address(ai->address()->c_sockaddr());
rak::address_info::free_address_info(ai);