From patchwork Fri Feb 26 09:38:25 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: 588707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::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 8EEC31402A1 for ; Fri, 26 Feb 2016 20:39:45 +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=WnXbGA8w; 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 1aZEs6-0004GO-CY; Fri, 26 Feb 2016 09:39:38 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZErw-00048K-6G for hostap@lists.infradead.org; Fri, 26 Feb 2016 09:39:29 +0000 Received: by mail-wm0-x229.google.com with SMTP id c200so64318343wme.0 for ; Fri, 26 Feb 2016 01:39:11 -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=WnXbGA8wUAOL8iLEzX+OwK8algbtJfKKghD+p7/ohd6u0L/B/G/UEy8gFELx2SOlWH UOILwrNpdUWOYHSmv9MFE8q8tb1dsbI6RcyCYtuzr0jjETISOpAqXwxQzjNI6oSsRHFw 49WkQgnAL7mRya93URcZGmlLhc8gnU3TQ7Ohk= 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=E0JUK67PC77LsaBfyqNkmRRVCXZ5LY5XE/HEy3/a2+aOyxX3VThFEZtxqJg4vODPya 0IVk9piBOtLS2bwgx9V5sg593p2h5hpgxk1yCoo+bEqo3EgFsJvvvbOzgNvrsa9mT71d PM/LgkwI/7763jLUsvujwDlQG94WqpRtlVJqOJSYcAjbPudcqU76PbG7VboHhr7h2spm doDmFh3pDpCxeaKN/+16qFvP+SRMQZUjTX7TCm3XFZAiuhldfd44y2If/PXFvYyzN6Bc 7p6ppjXcR8WYAYrx7i+CN3AXxVv1dpUH+TL60AQo1wcOhcWk6hAO2Howxq7mzUXunJb0 0e1w== X-Gm-Message-State: AD7BkJJzAmvqT4s7Ay9/WLALnV6mn0ovGghQtQ279wU9Tg/ESo4SLojkm6R0LZY7gQkmU3LS5xYH8+j/LG5d81JLHBqbbnUbZi8MNtTOuFKriOAvJGBLTEN27l7yrJmqGbpxJIeYiyenPTL+wEIaZ5q1od0JbRNHDyZ8HKIY/TzmqjDzemkzgcSxBSc2S4sXSI0z X-Received: by 10.194.123.102 with SMTP id lz6mr775701wjb.2.1456479550484; Fri, 26 Feb 2016 01:39:10 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id z65sm1915950wmg.1.2016.02.26.01.39.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 01:39:09 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v4 10/29] wpa_supplicant: udp ctrl setup ctrl_interface Date: Fri, 26 Feb 2016 10:38:25 +0100 Message-Id: <1456479524-14185-11-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456479524-14185-1-git-send-email-janusz.dziedzic@tieto.com> References: <1456479524-14185-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-20160226_013928_452872_4F134723 X-CRM114-Status: GOOD ( 11.12 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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 Message has at least one valid DKIM or DK signature -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 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 */