colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core/wifi: always set owe_transition_mode output in nm_wifi_utils_parse_ies()

Browse Source 
... and rename output variable.
This commit is contained in:
Thomas Haller
2020-03-22 11:04:28 +01:00
parent 37e7fa38c2
commit 7ccd2bb35e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nm-core-utils.c
View File

@@ -4355,13 +4355,14 @@ nm_wifi_utils_parse_ies (const guint8 *bytes,
gsize len, gsize len,
guint32 *out_max_rate, guint32 *out_max_rate,
gboolean *out_metered, gboolean *out_metered,
gboolean *owe_transition_mode) gboolean *out_owe_transition_mode)
{ {
guint8 id, elem_len; guint8 id, elem_len;
guint32 m; guint32 m;
NM_SET_OUT (out_max_rate, 0); NM_SET_OUT (out_max_rate, 0);
NM_SET_OUT (out_metered, FALSE); NM_SET_OUT (out_metered, FALSE);
NM_SET_OUT (out_owe_transition_mode, FALSE);
while (len) { while (len) {
if (len < 2) if (len < 2)
@@ -4396,13 +4397,13 @@ nm_wifi_utils_parse_ies (const guint8 *bytes,
&& bytes[3] == 0x11) /* OUI type: Network cost */ && bytes[3] == 0x11) /* OUI type: Network cost */
*out_metered = (bytes[7] > 1); /* Cost level > 1 */ *out_metered = (bytes[7] > 1); /* Cost level > 1 */
} }
if ( owe_transition_mode if ( out_owe_transition_mode
&& elem_len >= 10 && elem_len >= 10
&& bytes[0] == 0x50 /* OUI: WiFi Alliance */ && bytes[0] == 0x50 /* OUI: WiFi Alliance */
&& bytes[1] == 0x6f && bytes[1] == 0x6f
&& bytes[2] == 0x9a && bytes[2] == 0x9a
&& bytes[3] == 0x1c) /* OUI type: OWE Transition Mode */ && bytes[3] == 0x1c) /* OUI type: OWE Transition Mode */
*owe_transition_mode = TRUE; *out_owe_transition_mode = TRUE;
break; break;
} }

2
src/nm-core-utils.h
View File

@@ -477,7 +477,7 @@ void nm_wifi_utils_parse_ies (const guint8 *bytes,
gsize len, gsize len,
guint32 *out_max_rate, guint32 *out_max_rate,
gboolean *out_metered, gboolean *out_metered,
gboolean *owe_transition_mode); gboolean *out_owe_transition_mode);
guint8 nm_wifi_utils_level_to_quality (int val); guint8 nm_wifi_utils_level_to_quality (int val);