Changeset dc5c303 in mainline for uspace/app/wifi_supplicant/wifi_supplicant.c

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• uspace/app/wifi_supplicant/wifi_supplicant.c (modified) (2 diffs)

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -75 +75 @@
 }
 
-static char *nic_addr_format(nic_address_t *addr)
-{
-        char *str;
-        int rc = asprintf(&str, "%02x:%02x:%02x:%02x:%02x:%02x",
+static void nic_addr_format(nic_address_t *addr, char *out, size_t out_size)
+{
+        snprintf(out, out_size, "%02x:%02x:%02x:%02x:%02x:%02x",
             addr->address[0], addr->address[1], addr->address[2],
             addr->address[3], addr->address[4], addr->address[5]);
-
-        if (rc < 0)
-                return NULL;
-
-        return str;
 }
 
@@ -263 +257 @@
         for (uint8_t i = 0; i < scan_results.length; i++) {
                 ieee80211_scan_result_t result = scan_results.results[i];
+                char mac_addr_hex[18];
+                nic_addr_format(&result.bssid, mac_addr_hex, 18);
 
                 printf("%16.16s %17s %4d %5s %5s %7s %7s\n",
-                    result.ssid, nic_addr_format(&result.bssid),
+                    result.ssid, mac_addr_hex,
                     result.channel,
                     enum_name(ieee80211_security_type_strs, result.security.type),