Merge tag '2.4'

Release 2.4

Author: illiliti

AUTHORS

@@ -39,3 +39,4 @@ Emmanuel VAUTRIN <Emmanuel.VAUTRIN@cpexterne.org>
 Jesse Lentz <jesse@twosheds.org>
 Pinghao Wu <xdavidwuph@gmail.com>
 Neehar Vijay <env252525@gmail.com>
+Jiajie Chen <c@jia.je>

ChangeLog

@@ -1,3 +1,9 @@
+ver 2.4:
+	Fix issue with FT-over-Air and same channel operation.
+	Fix issue with AP mode and missing support for GTK.
+	Fix issue with AP mode and channel switch event.
+	Fix issue with SSID string conversion handling.
+
 ver 2.3:
 	Fix issue with length calculation for WMM IE.
 	Fix issue with channel number allocation off-by-one.

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([iwd],[2.3])
+AC_INIT([iwd],[2.4])
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_AUX_DIR(build-aux)

monitor/nlmon.c

@@ -5068,6 +5068,16 @@ static void print_probe_response(unsigned int level,
 			(const uint8_t *) mmpdu + len - resp->ies);
 }
 
+static void print_beacon(unsigned int level,
+				const struct mmpdu_header *mmpdu, size_t len)
+{
+	const struct mmpdu_beacon *beacon = mmpdu_body(mmpdu);
+
+	print_attr(level, "Subtype: Beacon");
+	print_ie(level + 1, "Beacon IEs", beacon->ies,
+			(const uint8_t *) mmpdu + len - beacon->ies);
+}
+
 static void print_frame_type(unsigned int level, const char *label,
 					const void *data, uint16_t size)
 {
@@ -5122,7 +5132,10 @@ static void print_frame_type(unsigned int level, const char *label,
 		str = "Timing Advertisement";
 		break;
 	case 0x08:
-		str = "Beacon";
+		if (mpdu)
+			print_beacon(level + 1, mpdu, size);
+		else
+			str = "Beacon";
 		break;
 	case 0x09:
 		str = "ATIM";
@@ -6240,9 +6253,10 @@ static const struct attr_entry attr_table[] = {
 	{ NL80211_ATTR_DTIM_PERIOD,
 			"DTIM Period", ATTR_U32 },
 	{ NL80211_ATTR_BEACON_HEAD,
-			"Beacon Head", ATTR_BINARY },
+			"Beacon Head",  ATTR_CUSTOM, { .function = print_frame } },
 	{ NL80211_ATTR_BEACON_TAIL,
-			"Beacon Tail", ATTR_BINARY },
+			"Beacon Tail", ATTR_CUSTOM,
+				{ .function = print_management_ies } },
 	{ NL80211_ATTR_STA_AID,
 			"Station AID", ATTR_U16 },
 	{ NL80211_ATTR_STA_FLAGS,
@@ -6520,7 +6534,8 @@ static const struct attr_entry attr_table[] = {
 	{ NL80211_ATTR_PROBE_RESP_OFFLOAD,
 			"Probe Response Offload" },
 	{ NL80211_ATTR_PROBE_RESP,
-			"Probe Response" },
+			"Probe Response", ATTR_CUSTOM,
+					{ .function = print_frame} },
 	{ NL80211_ATTR_DFS_REGION,
 			"DFS Region", ATTR_U8 },
 	{ NL80211_ATTR_DISABLE_HT,

src/ap.c

@@ -1499,14 +1499,19 @@ static void ap_gtk_query_cb(struct l_genl_msg *msg, void *user_data)
 	struct sta_state *sta = user_data;
 	const void *gtk_rsc;
 	uint8_t zero_gtk_rsc[6];
+	int err;
 
 	sta->gtk_query_cmd_id = 0;
 
-	if (l_genl_msg_get_error(msg) < 0)
+	err = l_genl_msg_get_error(msg);
+	if (err == -ENOTSUP)
+		goto zero_rsc;
+	else if (err < 0)
 		goto error;
 
 	gtk_rsc = nl80211_parse_get_key_seq(msg);
 	if (!gtk_rsc) {
+zero_rsc:
 		memset(zero_gtk_rsc, 0, 6);
 		gtk_rsc = zero_gtk_rsc;
 	}
@@ -1643,19 +1648,22 @@ static struct l_genl_msg *ap_build_cmd_new_station(struct sta_state *sta)
 {
 	struct l_genl_msg *msg;
 	uint32_t ifindex = netdev_get_ifindex(sta->ap->netdev);
-	/*
-	 * This should hopefully work both with and without
-	 * NL80211_FEATURE_FULL_AP_CLIENT_STATE.
-	 */
 	struct nl80211_sta_flag_update flags = {
-		.mask = (1 << NL80211_STA_FLAG_AUTHENTICATED) |
-			(1 << NL80211_STA_FLAG_ASSOCIATED) |
-			(1 << NL80211_STA_FLAG_AUTHORIZED) |
+		.mask = (1 << NL80211_STA_FLAG_AUTHORIZED) |
 			(1 << NL80211_STA_FLAG_MFP),
 		.set = (1 << NL80211_STA_FLAG_AUTHENTICATED) |
 			(1 << NL80211_STA_FLAG_ASSOCIATED),
 	};
 
+	/*
+	 * Without this feature nl80211 rejects NEW_STATION if the mask contains
+	 * auth/assoc flags
+	 */
+	if (wiphy_has_feature(netdev_get_wiphy(sta->ap->netdev),
+				NL80211_FEATURE_FULL_AP_CLIENT_STATE))
+		flags.mask |= (1 << NL80211_STA_FLAG_ASSOCIATED) |
+				(1 << NL80211_STA_FLAG_AUTHENTICATED);
+
 	msg = l_genl_msg_new_sized(NL80211_CMD_NEW_STATION, 300);
 
 	l_genl_msg_append_attr(msg, NL80211_ATTR_IFINDEX, 4, &ifindex);
@@ -3660,7 +3668,18 @@ static int ap_load_config(struct ap_state *ap, const struct l_settings *config,
 		ap->band = BAND_FREQ_2_4_GHZ;
 	}
 
-	ap->supports_ht = wiphy_get_ht_capabilities(wiphy, ap->band,
+	if (l_settings_has_key(config, "General", "DisableHT")) {
+		bool boolval;
+
+		if (!l_settings_get_bool(config, "General", "DisableHT",
+						&boolval)) {
+			l_error("AP [General].DisableHT not a valid boolean");
+			return -EINVAL;
+		}
+
+		ap->supports_ht = !boolval;
+	} else
+		ap->supports_ht = wiphy_get_ht_capabilities(wiphy, ap->band,
 							NULL) != NULL;
 
 	if (!ap_validate_band_channel(ap)) {

src/eapol.c

@@ -2783,6 +2783,8 @@ void eapol_register(struct eapol_sm *sm)
 
 bool eapol_start(struct eapol_sm *sm)
 {
+	l_debug("");
+
 	if (sm->handshake->settings_8021x) {
 		_auto_(l_free) char *network_id = NULL;
 

src/ft.c

@@ -40,6 +40,8 @@
 #include "src/offchannel.h"
 #include "src/wiphy.h"
 
+static const unsigned int FT_ONCHANNEL_TIME = 300u; /* ms */
+
 static ft_tx_frame_func_t tx_frame = NULL;
 static ft_tx_associate_func_t tx_assoc = NULL;
 static struct l_queue *info_list = NULL;
@@ -63,6 +65,7 @@ struct ft_info {
 	struct ie_ft_info ft_info;
 
 	bool parsed : 1;
+	bool onchannel : 1;
 };
 
 /*
@@ -1009,8 +1012,17 @@ void __ft_rx_authenticate(uint32_t ifindex, const uint8_t *frame,
 	info->parsed = true;
 
 cancel:
-	/* Verified to be expected target, offchannel can be canceled */
-	offchannel_cancel(netdev_get_wdev_id(netdev), info->offchannel_id);
+	/*
+	 * Verified to be expected target, offchannel or onchannel work can
+	 * now be canceled
+	 */
+	if (info->onchannel) {
+		l_timeout_remove(info->timeout);
+		info->timeout = NULL;
+		wiphy_radio_work_done(netdev_get_wiphy(netdev), info->work.id);
+	} else
+		offchannel_cancel(netdev_get_wdev_id(netdev),
+							info->offchannel_id);
 }
 
 static void ft_send_authenticate(void *user_data)
@@ -1023,6 +1035,8 @@ static void ft_send_authenticate(void *user_data)
 	struct iovec iov[2];
 	struct mmpdu_authentication auth;
 
+	l_debug("");
+
 	/* Authentication body */
 	auth.algorithm = L_CPU_TO_LE16(MMPDU_AUTH_ALGO_FT);
 	auth.transaction_sequence = L_CPU_TO_LE16(1);
@@ -1079,6 +1093,45 @@ int ft_authenticate(uint32_t ifindex, const struct scan_bss *target)
 	return 0;
 }
 
+static void ft_onchannel_timeout(struct l_timeout *timeout, void *user_data)
+{
+	struct ft_info *info = user_data;
+	struct netdev *netdev = netdev_find(info->ifindex);
+
+	wiphy_radio_work_done(netdev_get_wiphy(netdev), info->work.id);
+}
+
+static bool ft_send_authenticate_onchannel(struct wiphy_radio_work_item *work)
+{
+	struct ft_info *info = l_container_of(work, struct ft_info, work);
+
+	ft_send_authenticate(info);
+
+	info->timeout = l_timeout_create_ms(FT_ONCHANNEL_TIME,
+						ft_onchannel_timeout,
+						info, NULL);
+	return false;
+}
+
+struct wiphy_radio_work_item_ops ft_onchannel_ops = {
+	.do_work = ft_send_authenticate_onchannel,
+};
+
+int ft_authenticate_onchannel(uint32_t ifindex, const struct scan_bss *target)
+{
+	struct netdev *netdev = netdev_find(ifindex);
+	struct handshake_state *hs = netdev_get_handshake(netdev);
+	struct ft_info *info = ft_info_new(hs, target);
+
+	info->onchannel = true;
+
+	wiphy_radio_work_insert(netdev_get_wiphy(netdev), &info->work,
+				WIPHY_WORK_PRIORITY_FT, &ft_onchannel_ops);
+	l_queue_push_tail(info_list, info);
+
+	return 0;
+}
+
 int ft_associate(uint32_t ifindex, const uint8_t *addr)
 {
 	struct netdev *netdev = netdev_find(ifindex);

src/ft.h

@@ -43,3 +43,4 @@ void ft_clear_authentications(uint32_t ifindex);
 int ft_action(uint32_t ifindex, uint32_t freq, const struct scan_bss *target);
 int ft_associate(uint32_t ifindex, const uint8_t *addr);
 int ft_authenticate(uint32_t ifindex, const struct scan_bss *target);
+int ft_authenticate_onchannel(uint32_t ifindex, const struct scan_bss *target);

src/iwd.ap.rst

@@ -73,6 +73,11 @@ The group ``[General]`` contains general AP configuration.
        The time interval at which the AP starts a rekey for a given station. If
        not provided a default value of 0 is used (rekeying is disabled).
 
+   * - DisableHT
+     - Boolean value
+
+       Explicitly disable HT capabilities for this AP.
+
 Network Authentication Settings
 -------------------------------
 

src/knownnetworks.c

@@ -174,9 +174,10 @@ static const char *known_network_get_path(const struct network_info *network)
 
 	for (i = 0; network->ssid[i] && pos < sizeof(path); i++)
 		pos += snprintf(path + pos, sizeof(path) - pos, "%02x",
-				network->ssid[i]);
+				(unsigned char)network->ssid[i]);
 
-	snprintf(path + pos, sizeof(path) - pos, "_%s",
+	if (pos < sizeof(path))
+		snprintf(path + pos, sizeof(path) - pos, "_%s",
 			security_to_str(network->type));
 	path[sizeof(path) - 1] = '\0';