fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-02 03:14:15 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Wifi: support multiple interfaces

Browse Source
This commit is contained in:
李通洲
2022-11-28 15:13:47 +08:00
parent db33d246cb
commit 974dc96259
4 changed files with 212 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/wifi.c
+46 -54
View File
@@ -7,73 +7,65 @@
void ffPrintWifi(FFinstance* instance)
{
FFWifiResult result;
ffStrbufInit(&result.inf.description);
ffStrbufInit(&result.inf.status);
ffStrbufInit(&result.conn.status);
ffStrbufInit(&result.conn.ssid);
ffStrbufInit(&result.conn.macAddress);
ffStrbufInit(&result.conn.phyType);
result.conn.signalQuality = 0.0/0.0;
result.conn.rxRate = 0.0/0.0;
result.conn.txRate = 0.0/0.0;
result.security.enabled = false;
result.security.oneXEnabled = false;
ffStrbufInit(&result.security.authAlgo);
ffStrbufInit(&result.security.cipherAlgo);
ffStrbufInit(&result.error);
FFlist result;
ffListInit(&result, sizeof(FFWifiResult));
ffDetectWifi(instance, &result);
const char* error = ffDetectWifi(instance, &result);
if(!result.error.length)
if(!error)
{
if(instance->config.wifi.outputFormat.length == 0)
for(uint32_t index = 0; index < result.length; ++index)
{
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi.key);
if(result.conn.ssid.length)
FFWifiResult* item = (FFWifiResult*)ffListGet(&result, index);
uint8_t moduleIndex = result.length == 1 ? 0 : (uint8_t)(index + 1);
if(instance->config.wifi.outputFormat.length == 0)
{
printf("%s - %s", result.conn.ssid.chars, result.conn.phyType.chars);
if(!result.security.enabled)
puts(" - insecure");
ffPrintLogoAndKey(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi.key);
if(item->conn.ssid.length)
{
printf("%s - %s", item->conn.ssid.chars, item->conn.phyType.chars);
if(!item->security.enabled)
puts(" - insecure");
else
putchar('\n');
}
else
putchar('\n');
{
puts(item->inf.status.chars);
}
}
else
{
puts(result.inf.status.chars);
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, moduleIndex, &instance->config.wifi, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.description},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->inf.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.ssid},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.macAddress},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->conn.phyType},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.signalQuality},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.rxRate},
{FF_FORMAT_ARG_TYPE_DOUBLE, &item->conn.txRate},
{FF_FORMAT_ARG_TYPE_BOOL, &item->security.enabled},
{FF_FORMAT_ARG_TYPE_BOOL, &item->security.oneXEnabled},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->security.authAlgo},
{FF_FORMAT_ARG_TYPE_STRBUF, &item->security.cipherAlgo},
});
}
}
else
{
ffPrintFormat(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wifi, FF_WIFI_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result.inf.description},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.inf.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.conn.status},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.conn.ssid},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.conn.macAddress},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.conn.phyType},
{FF_FORMAT_ARG_TYPE_DOUBLE, &result.conn.signalQuality},
{FF_FORMAT_ARG_TYPE_DOUBLE, &result.conn.rxRate},
{FF_FORMAT_ARG_TYPE_DOUBLE, &result.conn.txRate},
{FF_FORMAT_ARG_TYPE_BOOL, &result.security.enabled},
{FF_FORMAT_ARG_TYPE_BOOL, &result.security.oneXEnabled},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.security.authAlgo},
{FF_FORMAT_ARG_TYPE_STRBUF, &result.security.cipherAlgo},
});
ffStrbufDestroy(&item->inf.description);
ffStrbufDestroy(&item->inf.status);
ffStrbufDestroy(&item->conn.status);
ffStrbufDestroy(&item->conn.ssid);
ffStrbufDestroy(&item->conn.macAddress);
ffStrbufDestroy(&item->conn.phyType);
ffStrbufDestroy(&item->security.authAlgo);
ffStrbufDestroy(&item->security.cipherAlgo);
}
}
else
{
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wmTheme, "%*s", result.error.length, result.error.chars);
ffPrintError(instance, FF_WIFI_MODULE_NAME, 0, &instance->config.wmTheme, "%s", error);
}
ffStrbufDestroy(&result.inf.description);
ffStrbufDestroy(&result.inf.status);
ffStrbufDestroy(&result.conn.status);
ffStrbufDestroy(&result.conn.ssid);
ffStrbufDestroy(&result.conn.macAddress);
ffStrbufDestroy(&result.conn.phyType);
ffStrbufDestroy(&result.security.authAlgo);
ffStrbufDestroy(&result.security.cipherAlgo);
ffStrbufDestroy(&result.error);
}