8000 start searching for the local port of a socket by dothebart · Pull Request #21833 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

start searching for the local port of a socket #21833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue 8000 and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jul 3, 2025
Merged

start searching for the local port of a socket #21833

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7961090
start searching for the local port of a socket
dothebart Jul 1, 2025
3b74f0d
more fiddling
dothebart Jul 1, 2025
6987a0b
add conversion option
dothebart Jul 2, 2025
05bd376
move to proper place
dothebart Jul 2, 2025
0a3d569
add local endpoint to the output for better tcpdump compareability
dothebart Jul 2, 2025
471aaf2
avoid nullptrs
dothebart Jul 2, 2025
0b8dd6c
fix capturing rendering of values
dothebart Jul 2, 2025
60c2c8c
acquire connection string while the connection is still active
dothebart Jul 2, 2025
23168b2
fix type
dothebart Jul 2, 2025
b85513e
lint
dothebart Jul 2, 2025
be89650
add dummy implementations of new method
dothebart Jul 2, 2025
6121fb8
add dummy implementations of new method
dothebart Jul 2, 2025
9be23f9
lint
dothebart Jul 2, 2025
75ec5cb
lint
dothebart Jul 2, 2025
cc278f0
convert from network byte order
dothebart Jul 3, 2025
4f599a8
Update 3rdParty/fuerte/src/AsioSockets.h
dothebart Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move to proper place
  • Loading branch information
@dothebart
dothebart committed Jul 2, 2025
commit 05bd376b004f9c47cbc10e963a6ce317ce65b93e
2 changes: 1 addition & 1 deletion 3rdParty/fuerte/include/fuerte/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
std::string endpoint() const;

/// @brief endpoint which we connect from
virtual std::string localEndpoint() const = 0;
virtual std::string localEndpoint() = 0;

protected:
Connection(detail::ConnectionConfiguration const& conf) : _config(conf) {}
Expand Down
99 changes: 56 additions & 43 deletions 3rdParty/fuerte/src/AsioSockets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,53 @@ void resolveConnect(detail::ConnectionConfiguration const& config,
resolver.async_resolve(config._host, config._port, std::move(cb));
#endif
}

template <typename SocketT>
std::string getConnectionNameS(SocketT& socket) {
asio_ns::detail::socket_addr_type *sa = nullptr;
boost::system::error_code ec;
size_t salen = 0;
size_t addr_len;
int port;
const char *addr;
std::string endpoint;
endpoint.reserve(32);
asio_ns::detail::socket_ops::getsockname(socket.lowest_layer().native_handle(), sa, &salen, ec);


switch (sa->sa_family)
{
case BOOST_ASIO_OS_DEF(AF_INET):
if (salen != sizeof(asio_ns::detail::sockaddr_in4_type))
{
return "failed to convert address";
}
addr = reinterpret_cast<const char*>(
&reinterpret_cast<const asio_ns::detail::sockaddr_in4_type*>(sa)->sin_addr);
addr_len = sizeof(asio_ns::detail::in4_addr_type);
port = reinterpret_cast<const asio_ns::detail::sockaddr_in4_type*>(sa)->sin_port;
endpoint = std::string(addr, addr_len);
endpoint.append(":");
endpoint.append(std::to_string(port));
break;
case BOOST_ASIO_OS_DEF(AF_INET6):
if (salen != sizeof(asio_ns::detail::sockaddr_in6_type))
{
return "failed to convert address";
}
addr = reinterpret_cast<const char*>(
&reinterpret_cast<const asio_ns::detail::sockaddr_in6_type*>(sa)->sin6_addr);
addr_len = sizeof(asio_ns::detail::in6_addr_type);
port = reinterpret_cast<const asio_ns::detail::sockaddr_in6_type*>(sa)->sin6_port;
endpoint = std::string(addr, addr_len);
endpoint.append(":");
endpoint.append(std::to_string(port));
break;
default:
return "unsupported connection type";
}
return endpoint;
}
} // namespace

enum class ConnectTimerRole {
Expand Down Expand Up @@ -136,6 +183,10 @@ struct Socket<SocketType::Tcp> {
});
}

std::string getConnectionName() {
return getConnectionNameS(socket);
}

bool isOpen() const {
return socket.is_open();
}
Expand Down Expand Up @@ -255,49 +306,7 @@ struct Socket<fuerte::SocketType::Ssl> {
}

std::string getConnectionName() {
asio_ns::detail::socket_addr_type *sa = nullptr;
boost::system::error_code ec;
size_t salen = 0;
size_t addr_len;
int port;
const char *addr;
std::string endpoint;
endpoint.reserve(32);
asio_ns::detail::socket_ops::getsockname(socket.lowest_layer().native_handle(), sa, &salen, ec);


switch (sa->sa_family)
{
case BOOST_ASIO_OS_DEF(AF_INET):
if (salen != sizeof(asio_ns::detail::sockaddr_in4_type))
{
return "failed to convert address";
}
addr = reinterpret_cast<const char*>(
&reinterpret_cast<const asio_ns::detail::sockaddr_in4_type*>(sa)->sin_addr);
addr_len = sizeof(asio_ns::detail::in4_addr_type);
port = reinterpret_cast<const asio_ns::detail::sockaddr_in4_type*>(sa)->sin_port;
endpoint = std::string(addr, addr_len);
endpoint.append(":");
endpoint.append(std::to_string(port));
break;
case BOOST_ASIO_OS_DEF(AF_INET6):
if (salen != sizeof(asio_ns::detail::sockaddr_in6_type))
{
return "failed to convert address";
}
addr = reinterpret_cast<const char*>(
&reinterpret_cast<const asio_ns::detail::sockaddr_in6_type*>(sa)->sin6_addr);
addr_len = sizeof(asio_ns::detail::in6_addr_type);
port = reinterpret_cast<const asio_ns::detail::sockaddr_in6_type*>(sa)->sin6_port;
endpoint = std::string(addr, addr_len);
endpoint.append(":");
endpoint.append(std::to_string(port));
break;
default:
return "unsupported connection type";
}
return endpoint;
return getConnectionNameS(socket);
}

bool isOpen() const {
Expand Down Expand Up @@ -407,6 +416,10 @@ struct Socket<fuerte::SocketType::Unix> {
socket.async_connect(ep, std::forward<F>(done));
}

std::string getConnectionName() {
return "no local connection name";
}

bool isOpen() const {
return socket.is_open();
}
Expand Down
22 changes: 2 additions & 20 deletions 3rdParty/fuerte/src/GeneralConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,8 @@ class GeneralConnection : public fuerte::Connection {
return _state.load(std::memory_order_acquire);
}

virtual std::string localEndpoint() const override final {
//boost::asio::detail::socket_addr_type addr;
//boost::system::error_code ec;

std::string endpoint;
endpoint.reserve(32);
/// TODO _proto.getsockname(&addr, sizeof(addr), ec);
// http
endpoint.append(fuerte::to_string(_config._protocolType));
endpoint.push_back('+');
// tcp/ssl/unix
endpoint.append(fuerte::to_string(_config._socketType));
endpoint.append("://");
// domain name or IP (xxx.xxx.xxx.xxx)
endpoint.append(_config._host);
if (_config._socketType != SocketType::Unix) {
endpoint.push_back(':');
endpoint.append(_config._port);
}
return endpoint;
4A75 virtual std::string localEndpoint() override final {
return _proto.getConnectionName();
}

/// The following public methods can be called from any thread:
Expand Down
0