From patchwork Fri Mar 4 09:20:26 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: 591849 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 9EC6C14032B for ; Fri, 4 Mar 2016 20:21:43 +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=XzimGCjP; 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 1ablvU-00021F-Qh; Fri, 04 Mar 2016 09:21:36 +0000 Received: from mail-lb0-x231.google.com ([2a00:1450:4010:c04::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ablvI-0001mX-5v for hostap@lists.infradead.org; Fri, 04 Mar 2016 09:21:27 +0000 Received: by mail-lb0-x231.google.com with SMTP id cf7so37753770lbb.1 for ; Fri, 04 Mar 2016 01:21:03 -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:in-reply-to:references; bh=pAh45Gqo7EO67Ycr69YT/xuD5bTbxbfFuPWJY77Mfsw=; b=XzimGCjPzJe+FkMVU2w4dg6y2MbFOMNTXaMndkldRtx+09oAvsHpkj4KCP/vBJhj5B H84/HnfbH5PLYAy4AaEMHyM42ZPA7h9Pa9nHIPahbcSjTWBdzXac4M/BfVVjexWHtBkz rCgO05m/fTfhkuZELYdfR93b1QrFNZcHqvNs0= 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:in-reply-to :references; bh=pAh45Gqo7EO67Ycr69YT/xuD5bTbxbfFuPWJY77Mfsw=; b=R/85bRr8+JxF18XXzxsH5WQ8jAKtwB3huxoyAu0gBPe4qaF0BUR9elZToSjq/krMSj FQSimHP94tO/HXn8dZBdk494KK1Xy5hqEcDBbWtBVYr3ccb+F0tGTx/6MpUhsQVIBrOO O15ieeWiC8T1kO9eG9frbwq2n56076pkjrxg3CEZqahM83vQkqBVtA4tIQsX+7c3inkN oGeSHiNTpiAhKc44uOClpf9obi2lVq251ePy1YDAFYORUzxiMbmqFyoW58UIyptkytDp wSQitgz+6hsZpioL5LOYl4X11/y9/6iDZfBu60KwLk9vrEekBy6Xkp6cKTQ2Z/fQdnZR ETOw== X-Gm-Message-State: AD7BkJL7u1RX2PJAB3AH+Dz3jw3HhwS66bjfPNu/yhZ85tV+0RZ6Ez7b9Fvy54Z5cTaApMhwCMWy8TBB1EC+Xl1RhbaDCGiM29ZeTFC5IDBP4p1sZeOTQ+clclwKzTTXEy2Hqt/6EFFehVaXG+u+HiqOUgAb7A8I3MdX+w/cNocg7SeeDNm2/S/wNOYq9n+s9B8f X-Received: by 10.112.128.225 with SMTP id nr1mr2569440lbb.101.1457083262440; Fri, 04 Mar 2016 01:21:02 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id r191sm437001lfe.28.2016.03.04.01.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 01:21:01 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v5 10/25] wpa_supplicant: udp ctrl setup ctrl_interface Date: Fri, 4 Mar 2016 10:20:26 +0100 Message-Id: <1457083241-7492-11-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1457083241-7492-1-git-send-email-janusz.dziedzic@tieto.com> References: <1457083241-7492-1-git-send-email-janusz.dziedzic@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160304_012124_666250_C4B63E0B X-CRM114-Status: GOOD ( 11.26 ) 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:231 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 Setup ctrl_interface name. This should be used to check interface <-> udp port assigment. Signed-off-by: Janusz Dziedzic --- wpa_supplicant/ctrl_iface_udp.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c index 8ab8ee8..f13ba4a 100644 --- a/wpa_supplicant/ctrl_iface_udp.c +++ b/wpa_supplicant/ctrl_iface_udp.c @@ -363,8 +363,9 @@ 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; + char *pos = NULL; #ifdef CONFIG_CTRL_IFACE_UDP_IPV6 struct sockaddr_in6 addr; int domain = PF_INET6; @@ -380,10 +381,8 @@ wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s) priv->sock = -1; os_get_random(priv->cookie, COOKIE_LEN); - if (wpa_s->conf->ctrl_interface == NULL) - return priv; - - pos = os_strstr(wpa_s->conf->ctrl_interface, "udp:"); + if (wpa_s->conf->ctrl_interface) + pos = os_strstr(wpa_s->conf->ctrl_interface, "udp:"); if (pos) { pos += 4; port = atoi(pos); @@ -424,12 +423,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 */