CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-21 04:43:36 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #462 from correabuscar/freebsd_replace__getnameinfo__with__inet_ntop

Browse source 
FreeBSD: replace getnameinfo with inet_ntop
This commit is contained in:
Jakob P. Liljenberg 2022-11-06 12:43:57 +01:00 committed by GitHub
parent 5a53fb4a2c 12def527cd
commit 20df83658a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/freebsd/btop_collect.cpp
View file

@ -27,6 +27,7 @@ tab-size = 4
#include <net/route.h>
#include <netdb.h>
#include <netinet/tcp_fsm.h>
#include <netinet/in.h> // for inet_ntop stuff
#include <pwd.h>
#include <sys/_timeval.h>
#include <sys/endian.h>
@ -821,7 +822,9 @@ namespace Net {
return empty_net;
}
int family = 0;
char ip[NI_MAXHOST];
static_assert(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN); // 46 >= 16, compile-time assurance.
enum { IPBUFFER_MAXSIZE = INET6_ADDRSTRLEN }; // manually using the known biggest value, guarded by the above static_assert
char ip[IPBUFFER_MAXSIZE];
interfaces.clear();
string ipv4, ipv6;
@ -843,17 +846,27 @@ namespace Net {
}
//? Get IPv4 address
if (family == AF_INET) {
if (net[iface].ipv4.empty() and
getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr), ip, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) == 0)
net[iface].ipv4 = ip;
if (net[iface].ipv4.empty()) {
if (NULL != inet_ntop(family, &(reinterpret_cast<struct sockaddr_in*>(ifa->ifa_addr)->sin_addr), ip, IPBUFFER_MAXSIZE)) {
net[iface].ipv4 = ip;
} else {
int errsv = errno;
Logger::error("Net::collect() -> Failed to convert IPv4 to string for iface " + string(iface) + ", errno: " + strerror(errsv));
}
}
}
//? Get IPv6 address
// else if (family == AF_INET6) {
// if (net[iface].ipv6.empty() and
// getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in6), ip, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) == 0)
// net[iface].ipv6 = ip;
// }
else if (family == AF_INET6) {
if (net[iface].ipv6.empty()) {
if (NULL != inet_ntop(family, &(reinterpret_cast<struct sockaddr_in6*>(ifa->ifa_addr)->sin6_addr), ip, IPBUFFER_MAXSIZE)) {
net[iface].ipv6 = ip;
} else {
int errsv = errno;
Logger::error("Net::collect() -> Failed to convert IPv6 to string for iface " + string(iface) + ", errno: " + strerror(errsv));
}
}
}
}
unordered_flat_map<string, std::tuple<uint64_t, uint64_t>> ifstats;