fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

LocalIP: cache default route value

Browse Source
This commit is contained in:
李通洲
2023-09-26 21:49:01 +08:00
parent 4843dedb4d
commit 917b049030
8 changed files with 64 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/netif/netif.c
+35
View File
@@ -0,0 +1,35 @@
#include "netif.h"
#ifndef _WIN32
#include <net/if.h>
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1]);
const char* ffNetifGetDefaultRoute()
{
static char iface[IF_NAMESIZE + 1];
if (*(uint16_t*) iface == 0)
{
if (!ffNetifGetDefaultRouteImpl(iface))
iface[1] = 1;
}
return iface;
}
#else
bool ffNetifGetDefaultRouteImpl(uint32_t* ifIndex);
uint32_t ffNetifGetDefaultRoute()
{
static uint32_t ifIndex = (uint32_t) -1;
if (ifIndex == (uint32_t) -1)
{
if (!ffNetifGetDefaultRouteImpl(&ifIndex))
ifIndex = (uint32_t) -2;
}
return ifIndex;
}
#endif
src/common/netif/netif.h
+2 -2
View File
@@ -3,7 +3,7 @@
#include "fastfetch.h"
#ifndef _WIN32
bool ffNetifGetDefaultRoute(FFstrbuf* iface);
const char* ffNetifGetDefaultRoute();
#else
bool ffNetifGetDefaultRoute(uint32_t* ifIndex);
uint32_t ffNetifGetDefaultRoute();
#endif
src/common/netif/netif_bsd.c
+5 -4
View File
@@ -2,6 +2,7 @@
#include "common/io/io.h"
#include <net/if.h>
#include <net/if_dl.h>
#include <net/route.h>
#include <netinet/in.h>
@@ -38,9 +39,7 @@ get_rt_address(struct rt_msghdr *rtm, int desired)
return NULL;
}
bool ffNetifGetDefaultRoute(FFstrbuf* iface)
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
{
//https://github.com/hashPirate/copenheimer-masscan-fork/blob/36f1ed9f7b751a7dccd5ed27874e2e703db7d481/src/rawsock-getif.c#L104
@@ -86,7 +85,9 @@ bool ffNetifGetDefaultRoute(FFstrbuf* iface)
struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(&rtmsg.hdr, RTA_IFP);
if (sdl)
{
ffStrbufSetNS(iface, sdl->sdl_nlen, sdl->sdl_data);
assert(sdl->sdl_nlen <= IF_NAMESIZE);
memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
iface[sdl->sdl_nlen] = '\0';
return true;
}
return false;
src/common/netif/netif_linux.c
+6 -4
View File
@@ -1,9 +1,13 @@
#include "netif.h"
#include "common/io/io.h"
#include <net/if.h>
#include <stdio.h>
bool ffNetifGetDefaultRoute(FFstrbuf* iface)
#define FF_STR_INDIR(x) #x
#define FF_STR(x) FF_STR_INDIR(x)
bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1])
{
FILE* FF_AUTO_CLOSE_FILE netRoute = fopen("/proc/net/route", "r");
if (!netRoute) return false;
@@ -14,11 +18,9 @@ bool ffNetifGetDefaultRoute(FFstrbuf* iface)
funlockfile(netRoute);
unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
char buf[16 /*IF_NAMESIZE*/ + 1];
while (fscanf(netRoute, "%16s%llx%*[^\n]", buf, &destination) == 2)
while (fscanf(netRoute, "%" FF_STR(IF_NAMESIZE) "s%llx%*[^\n]", iface, &destination) == 2)
{
if (destination != 0) continue;
ffStrbufSetS(iface, buf);
return true;
}
return false;
src/common/netif/netif_windows.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include <iphlpapi.h>
bool ffNetifGetDefaultRoute(uint32_t* ifIndex)
bool ffNetifGetDefaultRouteImpl(uint32_t* ifIndex)
{
ULONG size = 0;
if (GetIpForwardTable(NULL, &size, TRUE) != ERROR_INSUFFICIENT_BUFFER)
src/detection/localip/localip_linux.c
+8 -7
View File
@@ -1,6 +1,7 @@
#include "localip.h"
#include "common/io/io.h"
#include "common/netif/netif.h"
#include "util/stringUtils.h"
#include <string.h>
#include <ctype.h>
@@ -56,15 +57,15 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
if(getifaddrs(&ifAddrStruct) < 0)
return "getifaddrs(&ifAddrStruct) failed";
FF_STRBUF_AUTO_DESTROY defaultRouteIface = ffStrbufCreate();
ffNetifGetDefaultRoute(&defaultRouteIface);
const char* defaultRouteIface = ffNetifGetDefaultRoute();
for (struct ifaddrs* ifa = ifAddrStruct; ifa; ifa = ifa->ifa_next)
{
if (!ifa->ifa_addr || !(ifa->ifa_flags & IFF_RUNNING))
continue;
if (options->defaultRouteOnly && !ffStrbufEqualS(&defaultRouteIface, ifa->ifa_name))
bool isDefaultRoute = ffStrEquals(defaultRouteIface, ifa->ifa_name);
if (options->defaultRouteOnly && !isDefaultRoute)
continue;
if ((ifa->ifa_flags & IFF_LOOPBACK) && !(options->showType & FF_LOCALIP_TYPE_LOOP_BIT))
@@ -81,7 +82,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
struct sockaddr_in* ipv4 = (struct sockaddr_in*) ifa->ifa_addr;
char addressBuffer[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);
addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET, ffStrbufEqualS(&defaultRouteIface, ifa->ifa_name));
addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET, isDefaultRoute);
}
else if (ifa->ifa_addr->sa_family == AF_INET6)
{
@@ -91,7 +92,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
struct sockaddr_in6* ipv6 = (struct sockaddr_in6 *)ifa->ifa_addr;
char addressBuffer[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET6, ffStrbufEqualS(&defaultRouteIface, ifa->ifa_name));
addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET6, isDefaultRoute);
}
#if defined(__FreeBSD__) || defined(__APPLE__)
else if (ifa->ifa_addr->sa_family == AF_LINK)
@@ -103,7 +104,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
uint8_t* ptr = (uint8_t*) LLADDR((struct sockaddr_dl *)ifa->ifa_addr);
snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
addNewIp(results, ifa->ifa_name, addressBuffer, -1, ffStrbufEqualS(&defaultRouteIface, ifa->ifa_name));
addNewIp(results, ifa->ifa_name, addressBuffer, -1, isDefaultRoute);
}
#else
else if (ifa->ifa_addr->sa_family == AF_PACKET)
@@ -115,7 +116,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
uint8_t* ptr = ((struct sockaddr_ll *)ifa->ifa_addr)->sll_addr;
snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
addNewIp(results, ifa->ifa_name, addressBuffer, -1, ffStrbufEqualS(&defaultRouteIface, ifa->ifa_name));
addNewIp(results, ifa->ifa_name, addressBuffer, -1, isDefaultRoute);
}
#endif
}
src/detection/localip/localip_windows.c
+6 -6
View File
@@ -70,13 +70,13 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
return "GetAdaptersAddresses() failed";
}
uint32_t defaultRouteIfIndex = (uint32_t)-1;
ffNetifGetDefaultRoute(&defaultRouteIfIndex);
uint32_t defaultRouteIfIndex = ffNetifGetDefaultRoute();
// Iterate through all of the adapters
for (IP_ADAPTER_ADDRESSES* adapter = adapter_addresses; adapter; adapter = adapter->Next)
{
if (options->defaultRouteOnly && adapter->IfIndex != defaultRouteIfIndex)
bool isDefaultRoute = adapter->IfIndex == defaultRouteIfIndex;
if (options->defaultRouteOnly && !isDefaultRoute)
continue;
bool isLoop = adapter->IfType == IF_TYPE_SOFTWARE_LOOPBACK;
@@ -96,7 +96,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
uint8_t* ptr = adapter->PhysicalAddress;
snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
addNewIp(results, name, addressBuffer, -1, newIp, adapter->IfIndex == defaultRouteIfIndex);
addNewIp(results, name, addressBuffer, -1, newIp, isDefaultRoute);
newIp = false;
}
@@ -107,7 +107,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
SOCKADDR_IN* ipv4 = (SOCKADDR_IN*) ifa->Address.lpSockaddr;
char addressBuffer[INET_ADDRSTRLEN];
inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);
addNewIp(results, name, addressBuffer, AF_INET, newIp, adapter->IfIndex == defaultRouteIfIndex);
addNewIp(results, name, addressBuffer, AF_INET, newIp, isDefaultRoute);
newIp = false;
}
else if (ifa->Address.lpSockaddr->sa_family == AF_INET6)
@@ -115,7 +115,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
SOCKADDR_IN6* ipv6 = (SOCKADDR_IN6*) ifa->Address.lpSockaddr;
char addressBuffer[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
addNewIp(results, name, addressBuffer, AF_INET6, newIp, adapter->IfIndex == defaultRouteIfIndex);
addNewIp(results, name, addressBuffer, AF_INET6, newIp, isDefaultRoute);
newIp = false;
}
}