From a6cb30d6c822ba4e6ad0bc09aca4f9f9ce5de2a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 4 Apr 2024 10:09:06 +0800 Subject: [PATCH] LocalIP: print all IPs if multiple IPs are assigned to the same interface --- src/detection/localip/localip_linux.c | 6 ++++-- src/detection/localip/localip_windows.c | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index b1d64df3d..a1b3cc3ed 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -40,10 +40,12 @@ static void addNewIp(FFlist* list, const char* name, const char* addr, int type, switch (type) { case AF_INET: - ffStrbufSetS(&ip->ipv4, addr); + if (ip->ipv4.length) ffStrbufAppendC(&ip->ipv4, ','); + ffStrbufAppendS(&ip->ipv4, addr); break; case AF_INET6: - ffStrbufSetS(&ip->ipv6, addr); + if (ip->ipv6.length) ffStrbufAppendC(&ip->ipv6, ','); + ffStrbufAppendS(&ip->ipv6, addr); break; case -1: ffStrbufSetS(&ip->mac, addr); diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c index 3bbdddd8b..6e7af5661 100644 --- a/src/detection/localip/localip_windows.c +++ b/src/detection/localip/localip_windows.c @@ -6,7 +6,7 @@ #include "util/windows/unicode.h" #include "localip.h" -static void addNewIp(FFlist* list, const char* name, const char* value, int type, bool newIp, bool defaultRoute) +static void addNewIp(FFlist* list, const char* name, const char* addr, int type, bool newIp, bool defaultRoute) { FFLocalIpResult* ip = NULL; @@ -27,13 +27,15 @@ static void addNewIp(FFlist* list, const char* name, const char* value, int type switch (type) { case AF_INET: - ffStrbufSetS(&ip->ipv4, value); + if (ip->ipv4.length) ffStrbufAppendC(&ip->ipv4, ','); + ffStrbufAppendS(&ip->ipv4, addr); break; case AF_INET6: - ffStrbufSetS(&ip->ipv6, value); + if (ip->ipv6.length) ffStrbufAppendC(&ip->ipv6, ','); + ffStrbufAppendS(&ip->ipv6, addr); break; case -1: - ffStrbufSetS(&ip->mac, value); + ffStrbufSetS(&ip->mac, addr); break; } }