mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 02:15:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix: review comments

Browse source
This commit is contained in:
Volodymyr Yavdoshenko 2025-05-08 14:40:11 +03:00
parent a9b7be3c0e
commit 7d82078c22
No known key found for this signature in database
GPG key ID: 24BC74845F4F4064
1 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/facade/socket_utils.cc
View file

@ -15,6 +15,21 @@
#endif #endif
namespace {
int get_socket_family(int fd) {
struct sockaddr_storage ss;
socklen_t len = sizeof(ss);
if (getsockname(fd, (struct sockaddr*)&ss, &len) == -1) {
return -1; // Indicate an error
}
return ss.ss_family;
}
} // namespace
namespace dfly { namespace dfly {
// Returns information about the TCP socket state by its descriptor // Returns information about the TCP socket state by its descriptor
@ -28,13 +43,18 @@ std::string GetSocketInfo(int socket_fd) {
return "could not stat socket"; return "could not stat socket";
} }
auto tcp_info = io::ReadTcpInfo(sock_stat.st_ino); io::Result<io::TcpInfo> tcp_info;
int family = get_socket_family(socket_fd);
if (family == AF_INET) {
tcp_info = io::ReadTcpInfo(sock_stat.st_ino);
} else if (family == AF_INET6) {
tcp_info = io::ReadTcp6Info(sock_stat.st_ino);
} else {
return "unsupported socket family";
}
if (!tcp_info) { if (!tcp_info) {
auto tcp6_info = io::ReadTcp6Info(sock_stat.st_ino); return "socket not found in /proc/net/tcp or /proc/net/tcp6";
if (!tcp6_info) {
return "socket not found in /proc/net/tcp or /proc/net/tcp6";
}
tcp_info = std::move(tcp6_info);
} }
std::string state_str = io::TcpStateToString(tcp_info->state); std::string state_str = io::TcpStateToString(tcp_info->state);