defs: Add defs.h to hold certain global definitions
PATCH 1/5 defs: Add defs.h to hold certain global definitions
This will help to get rid of magic number use throughout the project. The definitions should be limited to global magic numbers that are used throughout the project, for example SSID length, MAC address length, etc.
--- Makefile.am | 3 ++- src/ap.c | 8 ++++---- src/crypto.c | 3 ++- src/defs.h | 13 +++++++++++++ src/dpp-util.h | 5 ++++- src/eap-wsc.c | 4 ++-- src/handshake.h | 2 +- src/ie.c | 2 +- src/ie.h | 3 ++- src/knownnetworks.h | 4 +++- src/network.c | 2 +- src/p2putil.h | 3 ++- src/rrm.c | 4 ++-- src/scan.c | 2 +- src/scan.h | 4 +++- src/station.c | 4 ++-- src/storage.c | 3 ++- src/util.c | 5 +++-- src/wsc.h | 2 +- src/wscutil.c | 2 +- src/wscutil.h | 4 +++- unit/test-util.c | 3 ++- 22 files changed, 57 insertions(+), 28 deletions(-) create mode 100644 src/defs.h
Makefile.am +2 -1
@@ -214,7 +214,8 @@ eap_sources = src/eap.c src/eap.h src/eap-private.h \ if DAEMON libexec_PROGRAMS += src/iwd -src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h src/missing.h \ +src_iwd_SOURCES = src/main.c linux/nl80211.h src/iwd.h \ + src/missing.h src/defs.h \ src/netdev.h src/netdev.c \ src/wiphy.h src/wiphy.c \ src/device.c \
src/ap.c +4 -4
@@ -67,7 +67,7 @@ struct ap_state {ap_stopped_func_t stopped_func;void *user_data; -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];char passphrase[64 ];uint8_t psk[32 ];enum band_freq band;
@@ -153,7 +153,7 @@ struct ap_wsc_pbc_probe_record { };struct ap_network { -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];int16_t signal;enum security security; };
@@ -181,7 +181,7 @@ static int network_signal_compare(const void *a, const void *b, void *user)static struct ap_network *ap_network_find (struct ap_state *ap,struct scan_bss *bss) { -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];memcpy (ssid, bss->ssid, bss->ssid_len); ssid[bss->ssid_len] ='\0' ;
@@ -3629,7 +3629,7 @@ static int ap_load_config(struct ap_state *ap, const struct l_settings *config,return -ENOMSG ; len =strlen (strval); -if (len <1 || len >32 ) { +if (len <1 || len >SSID_MAX_SIZE ) {l_error ("AP SSID length outside the [1, 32] range" );return -EINVAL ; }
src/crypto.c +2 -1
@@ -35,6 +35,7 @@#include "ell/useful.h" #include "src/missing.h" +#include "src/defs.h" #include "src/crypto.h" #define ARC4_MIN_KEY_SIZE 1
@@ -567,7 +568,7 @@ int crypto_psk_from_passphrase(const char *passphrase,if (!crypto_passphrase_is_valid (passphrase))return -ERANGE ; -if (ssid_len ==0 || ssid_len >32 ) +if (ssid_len ==0 || ssid_len >SSID_MAX_SIZE )return -ERANGE ; result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase,
src/defs.h new file +13 -0
@@ -0,0 +1,13 @@ +/* +* Wireless daemon for Linux +* Copyright (C) 2024 Cruise, LLC +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ + +#ifndef __DEFS_H__ +#define __DEFS_H__ + +#define SSID_MAX_SIZE 32 + +#endif
src/dpp-util.h +4 -1
@@ -19,6 +19,9 @@* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ + +#include "src/defs.h" +struct l_ecc_point ;struct l_ecc_scalar ;enum ie_rsn_akm_suite ;
@@ -112,7 +115,7 @@ enum dpp_attribute_type { };struct dpp_configuration { -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];size_t ssid_len;uint32_t akm_suites;char *passphrase;
src/eap-wsc.c +2 -2
@@ -2067,7 +2067,7 @@ static bool eap_wsc_r_load_settings(struct eap_state *eap, str =l_settings_get_string (settings,"WSC" ,"WPA2-SSID" );if (str) { -if (strlen (str) >32 ) +if (strlen (str) >SSID_MAX_SIZE ) goto bad_string; wsc->m2->auth_type_flags |=
@@ -2113,7 +2113,7 @@ static bool eap_wsc_r_load_settings(struct eap_state *eap, str =l_settings_get_string (settings,"WSC" ,"Open-SSID" );if (str) { -if (strlen (str) >32 ) +if (strlen (str) >SSID_MAX_SIZE ) goto bad_string; wsc->m2->auth_type_flags |=WSC_AUTHENTICATION_TYPE_OPEN ;
src/handshake.h +1 -1
@@ -141,7 +141,7 @@ struct handshake_state { bool supplicant_ocvc : 1; bool ext_key_id_capable : 1; bool force_default_ecc_group : 1; -uint8_t ssid[32 ]; +uint8_t ssid[SSID_MAX_SIZE ];size_t ssid_len;char *passphrase;char *password_identifier;
src/ie.c +1 -1
@@ -2642,7 +2642,7 @@ int ie_parse_owe_transition(const void *data, size_t len,return -ENOMSG ; slen =l_get_u8 (ie +12 ); -if (slen >32 ) +if (slen >SSID_MAX_SIZE )return -ENOMSG ;/*
src/ie.h +2 -1
@@ -23,6 +23,7 @@#include <stdbool.h> #include <stddef.h> #include <unistd.h> +#include "src/defs.h" /* * Information elements, IEEE Std 802.11-2012 ch. 8.4.2 and
@@ -565,7 +566,7 @@ struct ie_fils_ip_addr_response_info {struct ie_owe_transition_info {uint8_t bssid[6 ]; -uint8_t ssid[32 ]; +uint8_t ssid[SSID_MAX_SIZE ];size_t ssid_len;uint8_t oper_class;uint8_t channel;
src/knownnetworks.h +3 -1
@@ -20,6 +20,8 @@* */ +#include "src/defs.h" +#define SETTINGS "Settings"#define NET_HIDDEN SETTINGS, "Hidden"#define NET_AUTOCONNECT SETTINGS, "AutoConnect"
@@ -84,7 +86,7 @@ struct network_config {struct network_info {const struct network_info_ops *ops; -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];enum security type;struct l_queue *known_frequencies;int seen_count;/* Ref count for network.info */
src/network.c +1 -1
@@ -63,7 +63,7 @@ static uint32_t known_networks_watch;static uint32_t event_watch;struct network { -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];enum security security;char *object_path;struct station *station;
src/p2putil.h +2 -1
@@ -22,6 +22,7 @@#include <stdint.h> +#include "src/defs.h" #include "src/wscutil.h" struct l_queue ;
@@ -285,7 +286,7 @@ struct p2p_client_info_descriptor {struct p2p_group_id_attr {uint8_t device_addr[6 ]; -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ]; };struct p2p_interface_attr {
src/rrm.c +2 -2
@@ -108,8 +108,8 @@ struct rrm_beacon_req_info {uint8_t oper_class;uint8_t channel;/* The single channel provided in request */ uint16_t duration; -uint8_t bssid[6 ];/* Request filtered by BSSID */ -char ssid[33 ];/* Request filtered by SSID */ +uint8_t bssid[6 ];/* Request filtered by BSSID */ +char ssid[SSID_MAX_SIZE +1 ];/* Request filtered by SSID */ bool has_ssid;uint32_t scan_id;uint64_t scan_start_time;
src/scan.c +1 -1
@@ -1325,7 +1325,7 @@ static bool scan_parse_bss_information_elements(struct scan_bss *bss,switch (tag) {case IE_TYPE_SSID : -if (iter.len >32 ) +if (iter.len >SSID_MAX_SIZE )return false;memcpy (bss->ssid, iter.data, iter.len);
src/scan.h +3 -1
@@ -20,6 +20,8 @@* */ +#include "src/defs.h" +struct scan_freq_set ;struct ie_rsn_info ;struct ie_owe_transition_info ;
@@ -62,7 +64,7 @@ struct scan_bss { };struct ie_owe_transition_info *owe_trans;uint8_t mde[3 ]; -uint8_t ssid[32 ]; +uint8_t ssid[SSID_MAX_SIZE ];uint8_t ssid_len;uint8_t utilization;uint8_t cc[3 ];
src/station.c +2 -2
@@ -498,7 +498,7 @@ static struct network *station_add_seen_bss(struct station *station,struct network *network;enum security security;const char *path; -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];station_print_scan_bss (bss);
@@ -3916,7 +3916,7 @@ static struct l_dbus_message *station_dbus_connect_hidden_network(if (!l_dbus_message_get_arguments (message,"s" , &ssid))return dbus_error_invalid_args (message); -if (strlen (ssid) >32 ) +if (strlen (ssid) >SSID_MAX_SIZE )return dbus_error_invalid_args (message); if (known_networks_find(ssid, SECURITY_PSK) ||
src/storage.c +2 -1
@@ -45,6 +45,7 @@#include "ell/useful.h" #include "src/missing.h" +#include "src/defs.h" #include "src/common.h" #include "src/storage.h" #include "src/crypto.h"
@@ -315,7 +316,7 @@ const char *storage_network_ssid_from_path(const char *path,return NULL ;if (filename[0 ] !='=' ) { -if (end == filename || end - filename >32 ) +if (end == filename || end - filename >SSID_MAX_SIZE )return NULL ;for (c = filename; c < end; c++)
src/util.c +3 -2
@@ -34,6 +34,7 @@#include <ell/ell.h> #include "ell/useful.h" +#include "src/defs.h" #include "src/util.h" #include "src/band.h"
@@ -45,7 +46,7 @@ const char *util_ssid_to_utf8(size_t len, const uint8_t *ssid)memset (buf,0 ,sizeof (buf)); -if (len >32 ) +if (len >SSID_MAX_SIZE ) goto no_ssid;while (i < len && !ssid[i])
@@ -84,7 +85,7 @@ no_ssid:bool util_ssid_is_utf8 (size_t len,const uint8_t *ssid) { -if (len >32 ) +if (len >SSID_MAX_SIZE )return false;return l_utf8_validate ((const char *)ssid, len,NULL );
src/wsc.h +1 -1
@@ -21,7 +21,7 @@*/ struct wsc_credentials_info { -char ssid[33 ]; +char ssid[SSID_MAX_SIZE +1 ];enum security security;union {uint8_t psk[32 ];
src/wscutil.c +1 -1
@@ -500,7 +500,7 @@ static bool extract_ssid(struct wsc_attr_iter *iter, void *data)unsigned int len; len =wsc_attr_iter_get_length (iter); -if (len >32 ) +if (len >SSID_MAX_SIZE )return false; ssid->iov_len = len;
src/wscutil.h +3 -1
@@ -20,6 +20,8 @@* */ +#include "src/defs.h" +struct iovec ;/* Wi-Fi Simple Configuration Technical Specification v2.0.5, Section 12 */
@@ -330,7 +332,7 @@ static inline unsigned int wsc_attr_iter_get_pos(struct wsc_attr_iter *iter) }struct wsc_credential { -uint8_t ssid[32 ]; +uint8_t ssid[SSID_MAX_SIZE ];uint8_t ssid_len;uint16_t auth_type;uint16_t encryption_type;
unit/test-util.c +2 -1
@@ -31,11 +31,12 @@#include <arpa/inet.h> #include <ell/ell.h> +#include "src/defs.h" #include "src/util.h" struct ssid_test_data {size_t len; -uint8_t ssid[32 ]; +uint8_t ssid[SSID_MAX_SIZE ];const char *string;bool result; };
Signature · 1 line
2.45.2
PATCH 2/5 monitor: Don't dump survey results with noscan
Survey is used after each scan, creating quite a bit of spam. Silence survey results if noscan is set.
--- monitor/nlmon.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
monitor/nlmon.c +4 -2
@@ -7254,8 +7254,10 @@ static void print_message(struct nlmon *nlmon, const struct timeval *tv,if (nlmon->nowiphy && (cmd ==NL80211_CMD_NEW_WIPHY ))return ; -if (nlmon->noscan && ((cmd ==NL80211_CMD_NEW_SCAN_RESULTS ) || - (cmd ==NL80211_CMD_TRIGGER_SCAN ))) +if (nlmon->noscan &&L_IN_SET (cmd,NL80211_CMD_NEW_SCAN_RESULTS , +NL80211_CMD_NEW_SURVEY_RESULTS , +NL80211_CMD_TRIGGER_SCAN , +NL80211_CMD_GET_SURVEY ))return ;switch (type) {
Signature · 1 line
2.45.2
PATCH 3/5 monitor: Don't skip genl control Done,Error messages
In reply to Denis Kenzior--- monitor/nlmon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
monitor/nlmon.c +2 -1
@@ -8312,7 +8312,8 @@ void nlmon_print_genl(struct nlmon *nlmon, const struct timeval *tv,continue ; } -if (!nlmon->read && nlmsg->nlmsg_type != nlmon->id) +if (nlmsg->nlmsg_type >=NLMSG_MIN_TYPE && !nlmon->read && + nlmsg->nlmsg_type != nlmon->id)continue ;nlmon_message (nlmon, tv, nlmsg);
Signature · 1 line
2.45.2
PATCH 4/5 nl80211util: support attributes in CMD_EXTERNAL_AUTH
In reply to Denis Kenzior--- src/nl80211util.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
src/nl80211util.c +13 -0
@@ -132,6 +132,14 @@ static bool extract_iovec(const void *data, uint16_t len, void *o)return true; } +static bool extract_ssid (const void *data,uint16_t len,void *o) +{ +if (!len || len >SSID_MAX_SIZE ) +return false; + +return extract_iovec (data, len, o); +} +static bool extract_nested (const void *data,uint16_t len,void *o) {const struct l_genl_attr *outer = data;
@@ -170,6 +178,7 @@ static attr_handler handler_for_nl80211(int type)case NL80211_ATTR_REG_ALPHA2 :return extract_2_chars;case NL80211_ATTR_MAC : +case NL80211_ATTR_BSSID :return extract_mac;case NL80211_ATTR_ACK :return extract_flag;
@@ -179,9 +188,13 @@ static attr_handler handler_for_nl80211(int type)case NL80211_ATTR_CHANNEL_WIDTH :case NL80211_ATTR_CENTER_FREQ1 :case NL80211_ATTR_CENTER_FREQ2 : +case NL80211_ATTR_AKM_SUITES : +case NL80211_ATTR_EXTERNAL_AUTH_ACTION :return extract_uint32;case NL80211_ATTR_FRAME :return extract_iovec; +case NL80211_ATTR_SSID : +return extract_ssid;case NL80211_ATTR_WIPHY_BANDS :case NL80211_ATTR_SURVEY_INFO :case NL80211_ATTR_KEY :
Signature · 1 line
2.45.2
PATCH 5/5 nl80211util: Add builder for CMD_EXTERNAL_AUTH
In reply to Denis KenziorThis is for sending status from the STA to the driver
--- src/nl80211util.c | 15 +++++++++++++++ src/nl80211util.h | 5 +++++ 2 files changed, 20 insertions(+)
src/nl80211util.c +15 -0
@@ -654,6 +654,21 @@ struct l_genl_msg *nl80211_build_cmd_frame(uint32_t ifindex,return msg; } +struct l_genl_msg *nl80211_build_external_auth (uint32_t ifindex, +uint16_t status_code, +const uint8_t *ssid,size_t ssid_len, +const uint8_t bssid[static 6 ]) +{ +struct l_genl_msg *msg =l_genl_msg_new (NL80211_CMD_EXTERNAL_AUTH ); + +l_genl_msg_append_attr (msg,NL80211_ATTR_IFINDEX ,4 , &ifindex); +l_genl_msg_append_attr (msg,NL80211_ATTR_STATUS_CODE ,2 , &status_code); +l_genl_msg_append_attr (msg,NL80211_ATTR_SSID , ssid_len, ssid); +l_genl_msg_append_attr (msg,NL80211_ATTR_BSSID ,6 , bssid); + +return msg; +} +int nl80211_parse_chandef (struct l_genl_msg *msg,struct band_chandef *out) {struct band_chandef t;
src/nl80211util.h +5 -0
@@ -87,6 +87,11 @@ struct l_genl_msg *nl80211_build_cmd_frame(uint32_t ifindex,struct iovec *iov, size_t iov_len); +struct l_genl_msg *nl80211_build_external_auth (uint32_t ifindex, +uint16_t status_code, +const uint8_t *ssid,size_t ssid_len, +const uint8_t bssid[static 6 ]); +int nl80211_parse_chandef (struct l_genl_msg *msg,struct band_chandef *out); int nl80211_parse_supported_frequencies(struct l_genl_attr *band_freqs, struct scan_freq_set *supported_list,
Signature · 1 line
2.45.2
Hi Denis,
Quoted 28 lines · Denis Kenzior
This will help to get rid of magic number use throughout the project. The definitions should be limited to global magic numbers that are used throughout the project, for example SSID length, MAC address length, etc.
--- Makefile.am | 3 ++- src/ap.c | 8 ++++---- src/crypto.c | 3 ++- src/defs.h | 13 +++++++++++++ src/dpp-util.h | 5 ++++- src/eap-wsc.c | 4 ++-- src/handshake.h | 2 +- src/ie.c | 2 +- src/ie.h | 3 ++- src/knownnetworks.h | 4 +++- src/network.c | 2 +- src/p2putil.h | 3 ++- src/rrm.c | 4 ++-- src/scan.c | 2 +- src/scan.h | 4 +++- src/station.c | 4 ++-- src/storage.c | 3 ++- src/util.c | 5 +++-- src/wsc.h | 2 +- src/wscutil.c | 2 +- src/wscutil.h | 4 +++- unit/test-util.c | 3 ++- 22 files changed, 57 insertions(+), 28 deletions(-)
Quoted 2 lines
create mode 100644
src/defs.h
All 5 look good.
Quoted 28 lines · Denis Kenzior
This will help to get rid of magic number use throughout the project. The definitions should be limited to global magic numbers that are used throughout the project, for example SSID length, MAC address length, etc.
--- Makefile.am | 3 ++- src/ap.c | 8 ++++---- src/crypto.c | 3 ++- src/defs.h | 13 +++++++++++++ src/dpp-util.h | 5 ++++- src/eap-wsc.c | 4 ++-- src/handshake.h | 2 +- src/ie.c | 2 +- src/ie.h | 3 ++- src/knownnetworks.h | 4 +++- src/network.c | 2 +- src/p2putil.h | 3 ++- src/rrm.c | 4 ++-- src/scan.c | 2 +- src/scan.h | 4 +++- src/station.c | 4 ++-- src/storage.c | 3 ++- src/util.c | 5 +++-- src/wsc.h | 2 +- src/wscutil.c | 2 +- src/wscutil.h | 4 +++- unit/test-util.c | 3 ++- 22 files changed, 57 insertions(+), 28 deletions(-)
Quoted 2 lines
create mode 100644
src/defs.h
All applied