From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Thu, 27 Nov 2014 12:02:18 +0000 (+0200)
Subject: hostapd: Allow DATA_TEST_CONFIG to configure ifname
X-Git-Tag: hostap_2_4~1022
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=527d2378aca7cf0cc9d712f7a1994efec1b3b46f;p=thirdparty%2Fhostap.git

hostapd: Allow DATA_TEST_CONFIG to configure ifname

This allows the device-based data connectivity tests to be extended for
bridge and VLAN interface cases.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index fa0e81fa0..33cb8bc34 100644
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1543,6 +1543,8 @@ static int hostapd_ctrl_iface_data_test_config(struct hostapd_data *hapd,
 					       char *cmd)
 {
 	int enabled = atoi(cmd);
+	char *pos;
+	const char *ifname;
 
 	if (!enabled) {
 		if (hapd->l2_test) {
@@ -1557,7 +1559,13 @@ static int hostapd_ctrl_iface_data_test_config(struct hostapd_data *hapd,
 	if (hapd->l2_test)
 		return 0;
 
-	hapd->l2_test = l2_packet_init(hapd->conf->iface, hapd->own_addr,
+	pos = os_strstr(cmd, " ifname=");
+	if (pos)
+		ifname = pos + 8;
+	else
+		ifname = hapd->conf->iface;
+
+	hapd->l2_test = l2_packet_init(ifname, hapd->own_addr,
 					ETHERTYPE_IP, hostapd_data_test_rx,
 					hapd, 1);
 	if (hapd->l2_test == NULL)