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

Netif (macOS): improves reliability

Browse Source
This commit is contained in:
李通洲
2026-04-30 11:00:22 +08:00
parent 14b8bb2bb5
commit 42f2e5a745
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/impl/netif_apple.c
+22 -3
View File
@@ -1,6 +1,5 @@
#include "common/netif.h"
#include "common/io.h"
#include "common/mallocHelper.h"
#include <net/if.h>
#include <net/if_dl.h>
@@ -98,7 +97,16 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
return false;
}
while (recv(pfRoute, &rtmsg, sizeof(rtmsg), 0) > 0 && !(rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == (pid_t) pid));
bool gotResponse = false;
while (recv(pfRoute, &rtmsg, sizeof(rtmsg), 0) > 0) {
if (rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == (pid_t) pid) {
gotResponse = true;
break;
}
}
if (!gotResponse) {
return false;
}
#ifndef __sun // On Solaris, the RTF_GATEWAY flag is not set for default routes for some reason
if ((rtmsg.hdr.rtm_flags & (RTF_UP | RTF_GATEWAY)) == (RTF_UP | RTF_GATEWAY))
@@ -109,6 +117,7 @@ bool ffNetifGetDefaultRouteImplV4(FFNetifDefaultRouteResult* result) {
#ifndef __sun
&& sdl->sdl_len
#endif
&& sdl->sdl_family == AF_LINK
) {
if (sdl->sdl_nlen > IF_NAMESIZE) {
return false;
@@ -173,7 +182,16 @@ bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) {
return false;
}
while (recv(pfRoute, &rtmsg, sizeof(rtmsg), 0) > 0 && !(rtmsg.hdr.rtm_seq == 2 && rtmsg.hdr.rtm_pid == (pid_t) pid));
bool gotResponse = false;
while (recv(pfRoute, &rtmsg, sizeof(rtmsg), 0) > 0) {
if (rtmsg.hdr.rtm_seq == 2 && rtmsg.hdr.rtm_pid == (pid_t) pid) {
gotResponse = true;
break;
}
}
if (!gotResponse) {
return false;
}
#ifndef __sun // On Solaris, the RTF_GATEWAY flag is not set for default routes for some reason
if ((rtmsg.hdr.rtm_flags & (RTF_UP | RTF_GATEWAY)) == (RTF_UP | RTF_GATEWAY))
@@ -184,6 +202,7 @@ bool ffNetifGetDefaultRouteImplV6(FFNetifDefaultRouteResult* result) {
#ifndef __sun
&& sdl->sdl_len
#endif
&& sdl->sdl_family == AF_LINK
) {
if (sdl->sdl_nlen > IF_NAMESIZE) {
return false;