LocalIP: add support for Windows

2026-10-30 09:33:39 +01:00 · 2022-10-08 22:48:13 +08:00
parent 5114051725
commit 2c51252396
5 changed files with 225 additions and 74 deletions
@@ -1,90 +1,66 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/localip/localip.h"

 #define FF_LOCALIP_MODULE_NAME "Local IP"
-#define FF_LOCALIP_NUM_FORMAT_ARGS 1
-
-#include <string.h>
-#include <ctype.h>
-#include <ifaddrs.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#ifdef __FreeBSD__
-    #include <sys/socket.h> // FreeBSD needs this for AF_INET
-#endif
-
-static void printValue(FFinstance* instance, const char* ifaName, const char* addressBuffer)
-{
-    FFstrbuf key;
-    ffStrbufInit(&key);
-
-    if (instance->config.localIP.key.length == 0)
-    {
-        ffStrbufAppendF(&key, FF_LOCALIP_MODULE_NAME " (%s)", ifaName);
-    }
-    else
-    {
-        ffParseFormatString(&key, &instance->config.localIP.key, 1, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRING, ifaName}
-        });
-    }
-
-    if (instance->config.localIP.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, key.chars, 0, NULL);
-        puts(addressBuffer);
-    }
-    else
-    {
-        ffPrintFormatString(instance, key.chars, 0, NULL, &instance->config.localIP.outputFormat, FF_LOCALIP_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRING, addressBuffer}
-        });
-    }
-
-    ffStrbufDestroy(&key);
-}
+#define FF_LOCALIP_NUM_FORMAT_ARGS 2

 void ffPrintLocalIp(FFinstance* instance)
 {
-    struct ifaddrs* ifAddrStruct = NULL;
-    int ret = getifaddrs(&ifAddrStruct);
-    if (ret < 0) {
-        ffPrintError(instance, FF_LOCALIP_MODULE_NAME, 0, &instance->config.localIP, "getifaddrs(&ifAddrStruct) < 0 (%i)", ret);
-        return;
+    FFlist results;
+    ffListInit(&results, sizeof(FFLocalIpResult));
+
+    const char* error = ffDetectLocalIps(instance, &results);
+
+    if(error)
+    {
+        ffPrintError(instance, FF_LOCALIP_MODULE_NAME, 0, &instance->config.localIP, "%s", error);
+        goto exit;
    }

-    for (struct ifaddrs* ifa = ifAddrStruct; ifa != NULL; ifa = ifa->ifa_next) {
-        if (!ifa->ifa_addr)
-            continue;
+    if(results.length == 0)
+    {
+        ffPrintError(instance, FF_LOCALIP_MODULE_NAME, 0, &instance->config.localIP, "Failed to detect any IPs");
+        goto exit;
+    }

-        // loop back
-        if (strncmp(ifa->ifa_name, "lo", 2) == 0 && (ifa->ifa_name[2] == '\0' || isdigit(ifa->ifa_name[2])) && !instance->config.localIpShowLoop)
-            continue;
+    FFstrbuf key;
+    ffStrbufInit(&key);

-        if (instance->config.localIpNamePrefix.length && strncmp(ifa->ifa_name, instance->config.localIpNamePrefix.chars, instance->config.localIpNamePrefix.length) != 0)
-            continue;
+    for(uint32_t i = 0; i < results.length; ++i)
+    {
+        FFLocalIpResult* ip = (FFLocalIpResult*) ffListGet(&results, i);

-        if (ifa->ifa_addr->sa_family == AF_INET) { // check it is IP4
-            // is a valid IP4 Address
-            if (!instance->config.localIpShowIpV4)
-                continue;
-
-            void* tmpAddrPtr=&((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
-            char addressBuffer[INET_ADDRSTRLEN];
-            inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
-            printValue(instance, ifa->ifa_name, addressBuffer);
-        } else if (ifa->ifa_addr->sa_family == AF_INET6) { // check it is IP6
-            // is a valid IP6 Address
-            if (!instance->config.localIpShowIpV6)
-                continue;
-
-            void* tmpAddrPtr=&((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
-            char addressBuffer[INET6_ADDRSTRLEN];
-            inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
-            printValue(instance, ifa->ifa_name, addressBuffer);
+        if(instance->config.localIP.key.length == 0)
+        {
+            ffStrbufSetF(&key, FF_LOCALIP_MODULE_NAME " (%*s)", ip->name.length, ip->name.chars);
        }
+        else
+        {
+            ffParseFormatString(&key, &instance->config.localIP.key, 1, (FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_STRBUF, &ip->name}
+            });
+        }
+
+        if(instance->config.localIP.outputFormat.length == 0)
+        {
+            ffPrintLogoAndKey(instance, key.chars, 0, NULL);
+            ffStrbufPutTo(&ip->addr, stdout);
+        }
+        else
+        {
+            ffPrintFormatString(instance, key.chars, 0, NULL, &instance->config.localIP.outputFormat, FF_LOCALIP_NUM_FORMAT_ARGS, (FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_STRBUF, &ip->addr},
+                {FF_FORMAT_ARG_TYPE_STRING, ip->ipv6 ? "IPv6" : "IPv4"}
+            });
+        }
+
+        ffStrbufDestroy(&ip->name);
+        ffStrbufDestroy(&ip->addr);
    }

-    if (ifAddrStruct) freeifaddrs(ifAddrStruct);
+    ffStrbufDestroy(&key);
+
+exit:
+    ffListDestroy(&results);
 }