Skip to content

Commit 65c7f68

Browse files
committed
Wifi (macOS): remove usage of Apple80211
It's no longer useful in Sequoia
1 parent bf6d0f8 commit 65c7f68

File tree

2 files changed

+2
-80
lines changed

2 files changed

+2
-80
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,6 @@ elseif(APPLE)
15701570
PRIVATE "-F /System/Library/PrivateFrameworks"
15711571
PRIVATE "-weak_framework DisplayServices"
15721572
PRIVATE "-weak_framework MediaRemote"
1573-
PRIVATE "-weak_framework Apple80211"
15741573
)
15751574
elseif(WIN32)
15761575
target_link_libraries(libfastfetch

src/detection/wifi/wifi_apple.m

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,6 @@
44

55
#import <CoreWLAN/CoreWLAN.h>
66

7-
struct Apple80211; // https://code.google.com/archive/p/iphone-wireless/wikis/Apple80211.wiki
8-
9-
// 0 is successful; < 0 is failure
10-
int Apple80211GetInfoCopy(struct Apple80211 *handle, CFDictionaryRef *info) __attribute__((weak_import));
11-
12-
@interface CWInterface()
13-
@property (readonly) struct Apple80211* device;
14-
@end
15-
16-
inline static NSDictionary* getWifiInfoByApple80211(CWInterface* inf)
17-
{
18-
if (!inf.device || !Apple80211GetInfoCopy) return NULL;
19-
CFDictionaryRef result = NULL;
20-
if (Apple80211GetInfoCopy(inf.device, &result) < 0) return NULL;
21-
return CFBridgingRelease(result);
22-
}
23-
247
static bool queryIpconfig(const char* ifName, FFstrbuf* result)
258
{
269
return ffProcessAppendStdOut(result, (char* const[]) {
@@ -89,22 +72,17 @@ static bool getWifiInfoByIpconfig(FFstrbuf* ipconfig, const char* prefix, FFstrb
8972
if(inf.interfaceMode == kCWInterfaceModeNone)
9073
continue;
9174

92-
NSDictionary* apple = nil; // For getWifiInfoByApple80211
9375
FF_STRBUF_AUTO_DESTROY ipconfig = ffStrbufCreate();
9476

9577
if (inf.ssid) // https://developer.apple.com/forums/thread/732431
9678
ffStrbufAppendS(&item->conn.ssid, inf.ssid.UTF8String);
97-
else if (apple || (apple = getWifiInfoByApple80211(inf)))
98-
ffStrbufAppendS(&item->conn.ssid, [apple[@"SSID_STR"] UTF8String]);
9979
else if (ipconfig.length || (queryIpconfig(item->inf.description.chars, &ipconfig)))
10080
getWifiInfoByIpconfig(&ipconfig, "\n SSID : ", &item->conn.ssid);
10181
else
10282
ffStrbufSetStatic(&item->conn.ssid, "<unknown ssid>"); // https://developer.apple.com/forums/thread/732431
10383

10484
if (inf.bssid)
10585
ffStrbufAppendS(&item->conn.bssid, inf.bssid.UTF8String);
106-
else if (apple || (apple = getWifiInfoByApple80211(inf)))
107-
ffStrbufAppendS(&item->conn.bssid, [apple[@"BSSID"] UTF8String]);
10886
else if (ipconfig.length || (queryIpconfig(item->inf.description.chars, &ipconfig)))
10987
getWifiInfoByIpconfig(&ipconfig, "\n BSSID : ", &item->conn.bssid);
11088

@@ -193,63 +171,8 @@ static bool getWifiInfoByIpconfig(FFstrbuf* ipconfig, const char* prefix, FFstrb
193171
ffStrbufSetStatic(&item->conn.security, "OWE Transition");
194172
break;
195173
case kCWSecurityUnknown:
196-
// Sonoma...
197-
if (apple || (apple = getWifiInfoByApple80211(inf)))
198-
{
199-
NSDictionary* authType = apple[@"AUTH_TYPE"];
200-
if (authType)
201-
{
202-
// AUTH_LOWER seems useless. `airport` verifies if its value is between 1 and 3, and prints `unknown` if not
203-
204-
NSNumber* authUpper = authType[@"AUTH_UPPER"];
205-
if (!authUpper)
206-
ffStrbufSetStatic(&item->conn.security, "Insecure");
207-
else
208-
{
209-
int authUpperValue = authUpper.intValue;
210-
switch (authUpperValue)
211-
{
212-
case 1:
213-
ffStrbufSetStatic(&item->conn.security, "WPA");
214-
break;
215-
case 2:
216-
ffStrbufSetStatic(&item->conn.security, "WPA-PSK");
217-
break;
218-
case 4:
219-
ffStrbufSetStatic(&item->conn.security, "WPA2");
220-
break;
221-
case 8:
222-
ffStrbufSetStatic(&item->conn.security, "WPA2-PSK");
223-
break;
224-
case 16:
225-
ffStrbufSetStatic(&item->conn.security, "FT-WPA2-PSK");
226-
break;
227-
case 32:
228-
ffStrbufSetStatic(&item->conn.security, "LEAP");
229-
break;
230-
case 64:
231-
ffStrbufSetStatic(&item->conn.security, "802.1X");
232-
break;
233-
case 128:
234-
ffStrbufSetStatic(&item->conn.security, "FT-WPA2");
235-
break;
236-
case 256:
237-
ffStrbufSetStatic(&item->conn.security, "WPS");
238-
break;
239-
case 4096:
240-
ffStrbufSetStatic(&item->conn.security, "WPA3-SAE");
241-
break;
242-
case 8192:
243-
ffStrbufSetStatic(&item->conn.security, "WPA3-FT-SAE");
244-
break;
245-
default: // TODO: support more auth types
246-
ffStrbufAppendF(&item->conn.security, "To be supported (%d)", authUpperValue);
247-
break;
248-
}
249-
}
250-
}
251-
}
252-
else if (ipconfig.length || (queryIpconfig(item->inf.description.chars, &ipconfig)))
174+
// Sonoma?
175+
if (ipconfig.length || (queryIpconfig(item->inf.description.chars, &ipconfig)))
253176
getWifiInfoByIpconfig(&ipconfig, "\n Security : ", &item->conn.security);
254177
break;
255178
default:

0 commit comments

Comments
 (0)