From patchwork Tue Nov 10 17:24:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petko Bordjukov X-Patchwork-Id: 542534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6A7DC1413F8 for ; Wed, 11 Nov 2015 04:24:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CXRXkei4; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1F7BB28C03C; Tue, 10 Nov 2015 18:22:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1C3F128BFBA for ; Tue, 10 Nov 2015 18:22:36 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 10 Nov 2015 18:22:36 +0100 (CET) Received: by wmvv187 with SMTP id v187so19184664wmv.1 for ; Tue, 10 Nov 2015 09:24:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=mp+3dGI39/VVGi8Pl7+UyhBo+mk43WLfdjUUOH/jsUs=; b=CXRXkei43UCFIB/lDE6rfVkEKY5RrCzjsWaTZDD/xKpkuu/780scc2xXr8V8CccTkN aKtk+cignp9hIZneUq4zMZVFoie9o8ZbVHh8RLmU5vR53DEDNZZlTZ+zjHjK5ioq3XMN /KTkMuIRreOYSFDqM1jDMri23dnPQ5FKkWtFfRa7+Bq95/hAKXSi4ljCpcAYuzr2b5Uj px7uLLqqOn4YorzLyYrHO5oxZOknfbKtm2BfMvcD9F3x3cuwF8HK1olOWlIUi2NSG2Ej sVxZfuVCO3V13gXmeLalWcjgQPcZS3TQASH6qpPRxxenlvUn0EIFrdlIb3dTLU1bTrVe riQQ== X-Received: by 10.28.170.18 with SMTP id t18mr6484458wme.73.1447176269418; Tue, 10 Nov 2015 09:24:29 -0800 (PST) Received: from clarity.localdomain (78-83-77-239.spectrumnet.bg. [78.83.77.239]) by smtp.gmail.com with ESMTPSA id bo7sm4544710wjb.46.2015.11.10.09.24.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Nov 2015 09:24:28 -0800 (PST) From: Petko Bordjukov To: openwrt-devel@lists.openwrt.org Date: Tue, 10 Nov 2015 19:24:15 +0200 Message-Id: <1447176255-13299-1-git-send-email-bordjukov@gmail.com> X-Mailer: git-send-email 2.6.2 Subject: [OpenWrt-Devel] [PATCH] hostapd: Use network_get_device instead of uci_get_state X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" This fixes the IAPP functionality. Signed-off-by: Petko Bordjukov --- package/network/services/hostapd/Makefile | 2 +- package/network/services/hostapd/files/hostapd.sh | 9 +++++++-- package/network/services/hostapd/files/netifd.sh | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index edcfd1b..8a7fad6 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd PKG_VERSION:=2015-03-25 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_REV:=8278138e679174b1ec8af7f169c2810a8888e202 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 7aec7ad..393233b 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -1,3 +1,5 @@ +. /lib/functions/network.sh + hostapd_set_bss_options() { local var="$1" local vif="$2" @@ -213,7 +215,11 @@ hostapd_set_bss_options() { append "$var" "ssid=$ssid" "$N" [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N" [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" - [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" + [ -n "$iapp_interface" ] && { + local ifname + network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface" + append bss_conf "iapp_interface=$ifname" "$N" + } if [ "$wpa" -ge "1" ] then @@ -391,4 +397,3 @@ $hostapd_cfg EOF hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf } - diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh index 9b40a23..1c91bbf 100644 --- a/package/network/services/hostapd/files/netifd.sh +++ b/package/network/services/hostapd/files/netifd.sh @@ -1,3 +1,5 @@ +. /lib/functions/network.sh + wpa_supplicant_add_rate() { local var="$1" local val="$(($2 / 1000))" @@ -351,8 +353,9 @@ hostapd_set_bss_options() { append bss_conf "ssid=$ssid" "$N" [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N" [ -n "$iapp_interface" ] && { - iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")" - [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N" + local ifname + network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface" + append bss_conf "iapp_interface=$ifname" "$N" } if [ "$wpa" -ge "1" ]; then