From patchwork Tue Mar 8 13:28:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 594200 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8207C140BAC for ; Wed, 9 Mar 2016 00:29:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=tieto.com header.i=@tieto.com header.b=00n/1btW; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1adHh3-0005zm-DC; Tue, 08 Mar 2016 13:28:57 +0000 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1adHgv-0005bI-TG for hostap@lists.infradead.org; Tue, 08 Mar 2016 13:28:54 +0000 Received: by mail-lb0-x22e.google.com with SMTP id k15so18022461lbg.0 for ; Tue, 08 Mar 2016 05:28:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id; bh=h+kn0QEfoVd73QOCzIi/n4hvizea+X66e4sEGeJpiKM=; b=00n/1btWkWwy5d9D6c1CkY7TiqPEXzDorAF7uIxget7rpbncBrHJAK13tzl22Wjhn/ q6DH6vgB/JbxY9UqrwK1EIRcyY6Stpy02sJAjvypD1QNtnaTlL5ZPkGOk6aMNyDH9tIL liLPloryxeYPhXG3e06WmHAMV3q3BGwdWpM6s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h+kn0QEfoVd73QOCzIi/n4hvizea+X66e4sEGeJpiKM=; b=CvQmxTAarzGzgcaCBL3iRAvlqE/3L+rAe3cZnbn/yCDPYPuGFh6dULZ9PiMfya9IR+ 3Itzy4hxv4S3pRHFvCMZGmaD7lyhBoN5sozkF/x/VwudhrQdjS5xdfhAmUtQ+HREyU/T Cyr33LVrIPRiqSgcC5/Hs92rTgzsvkH6Se0+Vr3wz3Dv1n9iupAex/ekAm+fLz/5II+q 7Odv7MC6fh+PmSKDztCanGf0WAUL1evrB9G9/KquOyCdBTXsXGyvP03AJLlFcwTkr1Up tlA3BjycRhotdlc1BHD7SQl3PoFmbYs8lYTEDqxeU7xuJjCornD/vw4QAKanECEBpeNA IFQg== X-Gm-Message-State: AD7BkJJ+nq+/LpeCmlrJb1OsIhcnXqVmed9UFyq2aU/UE/sW4Kmt4TcpD5E+Dwh6qpNCfAL2lUqE79pEV3v+vKeLyct56Yzn6svA1gtywZ9/YhDKNAIWv4KUxgRtqYnZBxmrue9i7RqW88z5Ezbx5aRm/VVUY7ZawI5vPiXxSKGayrKAmq77qM4xNm6crlLK6t2O X-Received: by 10.25.127.216 with SMTP id a207mr5301470lfd.116.1457443704499; Tue, 08 Mar 2016 05:28:24 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id r200sm468962lfr.47.2016.03.08.05.28.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Mar 2016 05:28:23 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH 1/4] wpa_supplicant: fix p2p_group_add when CTRL UDP used Date: Tue, 8 Mar 2016 14:28:02 +0100 Message-Id: <1457443685-854-1-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160308_052850_333916_1EFC060E X-CRM114-Status: GOOD ( 11.11 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c04:0:0:0:22e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 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 While p2p_group_add ctrl_interface name could be derived from main interface (simple p2p_group_add command), we failed to bind the same udp port. Fix this problem and also setup correct ctrl_interface name (port decrement). Signed-off-by: Janusz Dziedzic --- wpa_supplicant/ctrl_iface_udp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c index 503052a..5d50b48 100644 --- a/wpa_supplicant/ctrl_iface_udp.c +++ b/wpa_supplicant/ctrl_iface_udp.c @@ -378,6 +378,7 @@ struct ctrl_iface_priv * wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s) { struct ctrl_iface_priv *priv; + char port_str[40]; int port = WPA_CTRL_IFACE_PORT; char *pos; #ifdef CONFIG_CTRL_IFACE_UDP_IPV6 @@ -439,13 +440,21 @@ try_again: #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */ if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) { port--; - if ((WPA_CTRL_IFACE_PORT - port) < WPA_CTRL_IFACE_PORT_LIMIT && - !pos) + if ((WPA_CTRL_IFACE_PORT - port) < WPA_CTRL_IFACE_PORT_LIMIT) goto try_again; wpa_printf(MSG_ERROR, "bind(AF_INET): %s", strerror(errno)); goto fail; } + /* Setup correct ctrl_interface */ + os_snprintf(port_str, sizeof(port_str), "udp:%d", port); + os_free(wpa_s->conf->ctrl_interface); + wpa_s->conf->ctrl_interface = os_strdup(port_str); + if (!wpa_s->conf->ctrl_interface) { + wpa_msg(wpa_s, MSG_DEBUG, "failed to malloc ctrl_inteface"); + goto fail; + } + #ifdef CONFIG_CTRL_IFACE_UDP_REMOTE wpa_msg(wpa_s, MSG_DEBUG, "ctrl_iface_init UDP port: %d", port); #endif /* CONFIG_CTRL_IFACE_UDP_REMOTE */