From patchwork Sun Jan 12 22:02:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Dziedzic X-Patchwork-Id: 1221878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=e004Pjo4; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DUsqtDAV; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47wrMP5SPQz9sPW for ; Mon, 13 Jan 2020 09:03:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=+rMbbDyn05vhwMNyRWex1TkIqCDxBqUKscUAiA4nO6g=; b=e004Pjo4zYzrjL/JcqwdMSECI2 J+wEkzRm9L66sXKgVJHIqTbZoMSDp24iQvwDSllC1beolCypa08TsgFACl+ZTYaQXnMPM2Eujx4lj OElMSNFw469ct0OuHJlMmSdxl/mWfinVt6SaogfE2AVBr2VTcYAuy1SagPp5KuGmY3Yy1DGHmxhAW ruFBle9Aaqtdq7zOE/OYz/eefdZXSYvb8IQ9yI2bp5b+ijIpEEUcvLjE3+xsD6qB6DZFTtL7AsnP5 kb5lFbNqLS/tJ+A4/8hZ4u2HJNgZKEU0Z8SDEsasJfBVOJSczpPlAMgra7M3jjiq7tuTSGLZ+O2Fr vedxZINw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iqlKQ-00033O-3n; Sun, 12 Jan 2020 22:03:26 +0000 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iqlJi-00027j-B6 for hostap@lists.infradead.org; Sun, 12 Jan 2020 22:02:43 +0000 Received: by mail-lf1-x12e.google.com with SMTP id b15so5423611lfc.4 for ; Sun, 12 Jan 2020 14:02:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=L1Vx1pISyxMi37acX1X2FRU8U7EVutgjHBNWjwY9gjQ=; b=DUsqtDAVv5Xexff4wM3K3KIVNiuSV2SdErbeV9mqqr5rWOGY/0MEygvcYD5V4JO9Q9 H99GmtHRVKNkf6mabHas5148Pi4sLil/at12Hm4JjZJ7KajOYtynmxK69gpoMX22G8eE bMwDBA1BHCxYgrFyfTmjAiuethSRPJ+xM16pLgd7WtxBer7FhnjedWL2gA3XFgSs8GZ8 SABJ+ckQGFWKRIRRhT/QwBT7BA2FrCrMF/LlZNCKL9vnOFtCm88Jgi3v66JblCVw0Wh7 0FMLu8Zu9UTBk3g2/07Bnu9jhaFdM8JO1bhGGM0TqqYPR4jueUvJBEw/iYM2nmiNax4x hHdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L1Vx1pISyxMi37acX1X2FRU8U7EVutgjHBNWjwY9gjQ=; b=k/xAt093Ny/R3klGBCJxJEY/2aFwIBAieCgj1LB0yOkgU4x8MyAMfVbe5QLMYDV296 xlU/oMxTG/lECxkb091u0va05Z8pEvqNU6qlrHTd7GUwOAHcH8vUfRew0rb3p7wT96rm M5HeOHF5HbMZzsoYMsG+Amaq181L84pTm2snh9YuUyu/RPry5rvPMRQ33LUe/bC5ZS4z a1FF080GAEnjDxtghJry1DEHHszEmo1omrbP66h2r6rSMDDRLxRoPJB6bb9l7shYOVlk H4Fp2YOQjJbBFkpn/c3v62BMmEraefcV2nMKNMdevyPIMsd5MIZJWazIDUb/n0BmPQ5C mVCA== X-Gm-Message-State: APjAAAUh99whIByoRn6y3pJqlHghc9S8J89MJv6WRdwZpREhCZkPARsc huBrXnlpu1V7XwpaQyvLIKhrM2C2 X-Google-Smtp-Source: APXvYqx3Xia3hQe8z8e8MxWstNeQ0iTR1yuNPNfWCswJO/8E9grJtWWadxaUQCYJCZiGT3GQvuqU1Q== X-Received: by 2002:a19:ca0f:: with SMTP id a15mr6019610lfg.198.1578866559587; Sun, 12 Jan 2020 14:02:39 -0800 (PST) Received: from e4300.lan ([62.141.210.6]) by smtp.gmail.com with ESMTPSA id u18sm4831325lje.69.2020.01.12.14.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 14:02:39 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH 06/12] ctrl: use IFNAME for global iface Date: Sun, 12 Jan 2020 23:02:20 +0100 Message-Id: <20200112220226.5056-6-janusz.dziedzic@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200112220226.5056-1-janusz.dziedzic@gmail.com> References: <20200112220226.5056-1-janusz.dziedzic@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200112_140242_387682_091BE9FF X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:12e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (janusz.dziedzic[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Janusz Dziedzic MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Seems for some reason for UDP case we send IFACE instead of IFNAME. This fix problem when at least one test case fail (hapd_ctrl_sta) when remote/udp used. This also fix test_connectivity. Signed-off-by: Janusz Dziedzic --- hostapd/ctrl_iface.c | 5 ----- wpa_supplicant/ctrl_iface_udp.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index 9758881bb..0ef38e9f7 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -4616,13 +4616,8 @@ static void hostapd_ctrl_iface_send_internal(int sock, struct dl_list *ctrl_dst, return; idx = 0; if (ifname) { -#ifdef CONFIG_CTRL_IFACE_UDP - io[idx].iov_base = "IFACE="; - io[idx].iov_len = 6; -#else /* CONFIG_CTRL_IFACE_UDP */ io[idx].iov_base = "IFNAME="; io[idx].iov_len = 7; -#endif /* CONFIG_CTRL_IFACE_UDP */ idx++; io[idx].iov_base = (char *) ifname; io[idx].iov_len = os_strlen(ifname); diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c index 8a6057a82..1e92b9752 100644 --- a/wpa_supplicant/ctrl_iface_udp.c +++ b/wpa_supplicant/ctrl_iface_udp.c @@ -516,7 +516,7 @@ static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s, return; if (ifname) - os_snprintf(levelstr, sizeof(levelstr), "IFACE=%s <%d>", + os_snprintf(levelstr, sizeof(levelstr), "IFNAME=%s <%d>", ifname, level); else os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);