LocalIP (GNU): adds MAC addr detection support

CarterLi · CarterLi · commit 13110e3074e9 · 2025-08-24T22:15:06.000+08:00
diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c
@@ -1008,14 +1008,16 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                     #endif
                 }
 
-                #ifdef __sun
+                #if __sun || __GNU__
                 if ((options->showType & FF_LOCALIP_TYPE_MAC_BIT) && ioctl(sockfd, SIOCGIFHWADDR, &ifr) == 0)
                 {
                     const uint8_t* ptr = (uint8_t*) ifr.ifr_addr.sa_data; // NOT ifr_enaddr
                     ffStrbufSetF(&iface->mac, "%02x:%02x:%02x:%02x:%02x:%02x",
                                 ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-                    FF_DEBUG("Added MAC address %s for interface %s (Solaris)", iface->mac.chars, iface->name.chars);
+                    FF_DEBUG("Added MAC address %s for interface %s (Solaris/GNU)", iface->mac.chars, iface->name.chars);
                 }
+                #endif
+                #if __sun
                 if (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)
                 {
                     __attribute__((__cleanup__(kstatFreeWrap))) kstat_ctl_t* kc = kstat_open();

Original file line number	Diff line number	Diff line change
`@@ -1008,14 +1008,16 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)`
`1008`	`1008`	`#endif`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`		`- #ifdef __sun`
	`1011`	`+ #if __sun \|\| __GNU__`
`1012`	`1012`	`if ((options->showType & FF_LOCALIP_TYPE_MAC_BIT) && ioctl(sockfd, SIOCGIFHWADDR, &ifr) == 0)`
`1013`	`1013`	`{`
`1014`	`1014`	`const uint8_t* ptr = (uint8_t*) ifr.ifr_addr.sa_data; // NOT ifr_enaddr`
`1015`	`1015`	`ffStrbufSetF(&iface->mac, "%02x:%02x:%02x:%02x:%02x:%02x",`
`1016`	`1016`	`ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);`
`1017`		`- FF_DEBUG("Added MAC address %s for interface %s (Solaris)", iface->mac.chars, iface->name.chars);`
	`1017`	`+ FF_DEBUG("Added MAC address %s for interface %s (Solaris/GNU)", iface->mac.chars, iface->name.chars);`
`1018`	`1018`	`}`
	`1019`	`+ #endif`
	`1020`	`+ #if __sun`
`1019`	`1021`	`if (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)`
`1020`	`1022`	`{`
`1021`	`1023`	`__attribute__((__cleanup__(kstatFreeWrap))) kstat_ctl_t* kc = kstat_open();`