From 104cb43158a339e71c1af1acdf6f577d797c50b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 1 Aug 2024 15:45:53 +0800 Subject: [PATCH] Wifi: rename `macAddress` to `bssid` --- src/detection/wifi/wifi.h | 2 +- src/detection/wifi/wifi_android.c | 8 ++++---- src/detection/wifi/wifi_apple.m | 6 +++--- src/detection/wifi/wifi_bsd.c | 4 ++-- src/detection/wifi/wifi_linux.c | 10 +++++----- src/detection/wifi/wifi_windows.c | 6 +++--- src/modules/wifi/wifi.c | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/detection/wifi/wifi.h b/src/detection/wifi/wifi.h index 2e292439d..10b4ffdbc 100644 --- a/src/detection/wifi/wifi.h +++ b/src/detection/wifi/wifi.h @@ -12,7 +12,7 @@ struct FFWifiConnection { FFstrbuf status; FFstrbuf ssid; - FFstrbuf macAddress; + FFstrbuf bssid; FFstrbuf protocol; FFstrbuf security; double signalQuality; // Percentage diff --git a/src/detection/wifi/wifi_android.c b/src/detection/wifi/wifi_android.c index e34f45365..a14989242 100644 --- a/src/detection/wifi/wifi_android.c +++ b/src/detection/wifi/wifi_android.c @@ -37,7 +37,7 @@ const char* ffDetectWifi(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -53,12 +53,12 @@ const char* ffDetectWifi(FFlist* result) if(!ffStrbufEqualS(&item->inf.status, "COMPLETED")) return NULL; - + double rssi = yyjson_get_num(yyjson_obj_get(root, "rssi")); item->conn.signalQuality = rssi >= -50 ? 100 : rssi <= -100 ? 0 : (rssi + 100) * 2; - + ffStrbufAppendS(&item->inf.description, yyjson_get_str(yyjson_obj_get(root, "ip"))); - ffStrbufAppendS(&item->conn.macAddress, yyjson_get_str(yyjson_obj_get(root, "bssid"))); + ffStrbufAppendS(&item->conn.bssid, yyjson_get_str(yyjson_obj_get(root, "bssid"))); ffStrbufAppendS(&item->conn.ssid, yyjson_get_str(yyjson_obj_get(root, "ssid"))); return NULL; diff --git a/src/detection/wifi/wifi_apple.m b/src/detection/wifi/wifi_apple.m index 8fdb40637..28edee5eb 100644 --- a/src/detection/wifi/wifi_apple.m +++ b/src/detection/wifi/wifi_apple.m @@ -37,7 +37,7 @@ const char* ffDetectWifi(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -63,9 +63,9 @@ const char* ffDetectWifi(FFlist* result) ffStrbufSetStatic(&item->conn.ssid, ""); // https://developer.apple.com/forums/thread/732431 if (inf.bssid) - ffStrbufAppendS(&item->conn.macAddress, inf.bssid.UTF8String); + ffStrbufAppendS(&item->conn.bssid, inf.bssid.UTF8String); else if (apple || (apple = getWifiInfoByApple80211(inf.interfaceName))) - ffStrbufAppendS(&item->conn.macAddress, [[apple valueForKey:@"BSSID"] UTF8String]); + ffStrbufAppendS(&item->conn.bssid, [[apple valueForKey:@"BSSID"] UTF8String]); switch(inf.activePHYMode) { diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c index 66edc10c6..1f47cf9ef 100644 --- a/src/detection/wifi/wifi_bsd.c +++ b/src/detection/wifi/wifi_bsd.c @@ -28,7 +28,7 @@ const char* ffDetectWifi(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -42,7 +42,7 @@ const char* ffDetectWifi(FFlist* result) if (ibssid < item->conn.ssid.length) { ibssid += (uint32_t) strlen(" bssid "); - ffStrbufSetS(&item->conn.macAddress, item->conn.ssid.chars + ibssid); + ffStrbufSetS(&item->conn.bssid, item->conn.ssid.chars + ibssid); } ffStrbufSubstrBeforeFirstC(&item->conn.ssid, ' '); diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index 60e510791..f85bb264a 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -75,7 +75,7 @@ static const char* detectWifiWithLibnm(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -143,7 +143,7 @@ static const char* detectWifiWithLibnm(FFlist* result) ffg_free(ssid); } - ffStrbufAppendS(&item->conn.macAddress, ffnm_access_point_get_bssid(ap)); + ffStrbufAppendS(&item->conn.bssid, ffnm_access_point_get_bssid(ap)); item->conn.signalQuality = ffnm_access_point_get_strength(ap); item->conn.rxRate = ffnm_access_point_get_max_bitrate(ap); @@ -242,7 +242,7 @@ static const char* detectWifiWithIoctls(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -281,8 +281,8 @@ static const char* detectWifiWithIoctls(FFlist* result) if(ioctl(sock, SIOCGIWAP, &iwr) >= 0) { for(int i = 0; i < 6; ++i) - ffStrbufAppendF(&item->conn.macAddress, "%.2X-", (uint8_t) iwr.u.ap_addr.sa_data[i]); - ffStrbufTrimRight(&item->conn.macAddress, '-'); + ffStrbufAppendF(&item->conn.bssid, "%.2X-", (uint8_t) iwr.u.ap_addr.sa_data[i]); + ffStrbufTrimRight(&item->conn.bssid, '-'); } struct iw_statistics stats; diff --git a/src/detection/wifi/wifi_windows.c b/src/detection/wifi/wifi_windows.c index 18638c046..0508a72d4 100644 --- a/src/detection/wifi/wifi_windows.c +++ b/src/detection/wifi/wifi_windows.c @@ -76,7 +76,7 @@ const char* ffDetectWifi(FFlist* result) ffStrbufInit(&item->inf.status); ffStrbufInit(&item->conn.status); ffStrbufInit(&item->conn.ssid); - ffStrbufInit(&item->conn.macAddress); + ffStrbufInit(&item->conn.bssid); ffStrbufInit(&item->conn.protocol); ffStrbufInit(&item->conn.security); item->conn.signalQuality = 0.0/0.0; @@ -107,8 +107,8 @@ const char* ffDetectWifi(FFlist* result) (const char *)connInfo->wlanAssociationAttributes.dot11Ssid.ucSSID); for (size_t i = 0; i < sizeof(connInfo->wlanAssociationAttributes.dot11Bssid); i++) - ffStrbufAppendF(&item->conn.macAddress, "%.2X-", connInfo->wlanAssociationAttributes.dot11Bssid[i]); - ffStrbufTrimRight(&item->conn.macAddress, '-'); + ffStrbufAppendF(&item->conn.bssid, "%.2X-", connInfo->wlanAssociationAttributes.dot11Bssid[i]); + ffStrbufTrimRight(&item->conn.bssid, '-'); switch (connInfo->wlanAssociationAttributes.dot11PhyType) { diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 18208d3a8..fa2ddb05d 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -85,7 +85,7 @@ void ffPrintWifi(FFWifiOptions* options) {FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.status, "inf-status"}, {FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.status, "status"}, {FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.ssid, "ssid"}, - {FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.macAddress, "mac-address"}, + {FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.bssid, "bssid"}, {FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.protocol, "protocol"}, {FF_FORMAT_ARG_TYPE_DOUBLE, &percentNum, "signal-quality"}, {FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.rxRate, "rx-rate"}, @@ -99,7 +99,7 @@ void ffPrintWifi(FFWifiOptions* options) ffStrbufDestroy(&item->inf.status); ffStrbufDestroy(&item->conn.status); ffStrbufDestroy(&item->conn.ssid); - ffStrbufDestroy(&item->conn.macAddress); + ffStrbufDestroy(&item->conn.bssid); ffStrbufDestroy(&item->conn.protocol); ffStrbufDestroy(&item->conn.security); } @@ -170,7 +170,7 @@ void ffGenerateWifiJsonResult(FF_MAYBE_UNUSED FFWifiOptions* options, yyjson_mut yyjson_mut_val* conn = yyjson_mut_obj_add_obj(doc, obj, "conn"); yyjson_mut_obj_add_strbuf(doc, conn, "status", &wifi->conn.status); yyjson_mut_obj_add_strbuf(doc, conn, "ssid", &wifi->conn.ssid); - yyjson_mut_obj_add_strbuf(doc, conn, "bssid", &wifi->conn.macAddress); + yyjson_mut_obj_add_strbuf(doc, conn, "bssid", &wifi->conn.bssid); yyjson_mut_obj_add_strbuf(doc, conn, "protocol", &wifi->conn.protocol); yyjson_mut_obj_add_strbuf(doc, conn, "security", &wifi->conn.security); yyjson_mut_obj_add_real(doc, conn, "signalQuality", wifi->conn.signalQuality); @@ -184,7 +184,7 @@ void ffGenerateWifiJsonResult(FF_MAYBE_UNUSED FFWifiOptions* options, yyjson_mut ffStrbufDestroy(&item->inf.status); ffStrbufDestroy(&item->conn.status); ffStrbufDestroy(&item->conn.ssid); - ffStrbufDestroy(&item->conn.macAddress); + ffStrbufDestroy(&item->conn.bssid); ffStrbufDestroy(&item->conn.protocol); ffStrbufDestroy(&item->conn.security); }