From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 9 Jun 2017 05:52:05 +0000 (-0700)
Subject: Add support for HS20 and fix disable_dgaf bug in hostapd
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d39a8edc24baee2504d28c05777709225862de0f;p=lede.git

Add support for HS20 and fix disable_dgaf bug in hostapd
---

diff --git a/package/network/services/hostapd/files/800-hostapd_disable_dgaf_multicast_fix.patch b/package/network/services/hostapd/files/800-hostapd_disable_dgaf_multicast_fix.patch
new file mode 100644
index 0000000000..9528f6d015
--- /dev/null
+++ b/package/network/services/hostapd/files/800-hostapd_disable_dgaf_multicast_fix.patch
@@ -0,0 +1,34 @@
+--- a/src/ap/dhcp_snoop.c
++++ b/src/ap/dhcp_snoop.c
+@@ -110,6 +110,15 @@ static void handle_dhcp(void *ctx, const u8 *src_addr, const u8 *buf,
+ 		}
+ 	}
+ 
++	if (hapd->conf->disable_dgaf && is_broadcast_ether_addr(buf)) {
++		for (sta = hapd->sta_list; sta; sta = sta->next) {
++			if (!(sta->flags & WLAN_STA_AUTHORIZED))
++				continue;
++			x_snoop_mcast_to_ucast_convert_send(hapd, sta,
++							    (u8 *) buf, len);
++		}
++	}
++
+ 	if (msgtype == DHCPACK) {
+ 		if (b->your_ip == 0)
+ 			return;
+@@ -146,15 +155,6 @@ static void handle_dhcp(void *ctx, const u8 *src_addr, const u8 *buf,
+ 		}
+ 		sta->ipaddr = b->your_ip;
+ 	}
+-
+-	if (hapd->conf->disable_dgaf && is_broadcast_ether_addr(buf)) {
+-		for (sta = hapd->sta_list; sta; sta = sta->next) {
+-			if (!(sta->flags & WLAN_STA_AUTHORIZED))
+-				continue;
+-			x_snoop_mcast_to_ucast_convert_send(hapd, sta,
+-							    (u8 *) buf, len);
+-		}
+-	}
+ }
+ 
+ 
diff --git a/package/network/services/hostapd/files/hostapd-full.config b/package/network/services/hostapd/files/hostapd-full.config
index 4a2e87c2eb..1f509cee8e 100644
--- a/package/network/services/hostapd/files/hostapd-full.config
+++ b/package/network/services/hostapd/files/hostapd-full.config
@@ -15,6 +15,9 @@
 # Driver interface for wired authenticator
 CONFIG_DRIVER_WIRED=y
 
+# Turn on HS20 support
+CONFIG_HS20=y
+
 # Driver interface for Prism54 driver
 #CONFIG_DRIVER_PRISM54=y
 
diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
index 18c3f9a5c1..4113cad63c 100644
--- a/package/network/services/hostapd/files/wpa_supplicant-full.config
+++ b/package/network/services/hostapd/files/wpa_supplicant-full.config
@@ -15,6 +15,9 @@
 #CFLAGS += -I/usr/local/openssl/include
 #LIBS += -L/usr/local/openssl/lib
 
+# Turn on HS20 support
+CONFIG_HS20=y
+
 # Some Red Hat versions seem to include kerberos header files from OpenSSL, but
 # the kerberos files are not in the default include path. Following line can be
 # used to fix build issues on such systems (krb5.h not found).