From patchwork Fri Mar 4 09:20:20 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: 591845 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 2FD8E140BCC for ; Fri, 4 Mar 2016 20:21:38 +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=GK6DjAuN; 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 1ablvK-0001tt-JW; Fri, 04 Mar 2016 09:21:26 +0000 Received: from mail-lb0-x22c.google.com ([2a00:1450:4010:c04::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ablvB-0001lX-7Y for hostap@lists.infradead.org; Fri, 04 Mar 2016 09:21:20 +0000 Received: by mail-lb0-x22c.google.com with SMTP id x1so53997869lbj.3 for ; Fri, 04 Mar 2016 01:20:56 -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=TQxfdlJ8BrrvKSPcdHzxSgo3THIXGbUMV8D4rvzT4Zk=; b=GK6DjAuN7PG6nxUYiMmd8h3NkUQL6jAIYBkVLsYdxniyWb5p6qj7LoSbRT2eIzZPVH 52/nIf6zcZ/cu5J8jbf2WZkK5EIbQ6dYadOuS6DP3+zPBEMe8dHi+Lq9yPtGAKonqXlM M8BeOVV92BMEXld4f/HdiUAO6bXrJ6mptWpwE= 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=TQxfdlJ8BrrvKSPcdHzxSgo3THIXGbUMV8D4rvzT4Zk=; b=I0Jxv+WNWfbgQ+aroOWYaLcTulgffAVZGYoDoD89o19h/+Qt7HAzkpgtb2zBk4CODx i6sNWGy38DRTudgKav65/VWy90t3Tvc3so9f8ijOUnAApvs2WeA1cXmqFPeJ7kEdR8qv co66f4gNg24dXoe9GmOnUw9SEjEMufSPDWtNGVf9k1MoKtdkIQAbcCmLpI9E7br0BHg1 xViXBi10TsVgALAXB4jmgO1i8xKUptLJbQlMlxFr2xFW9vh/XvvmRsZ5D2MQgBK4266g JC4eZNJ3PdDHgrHI4lfLmpObJHBj5NBvwX52Qj0ym76QEx7ou4GNrkGdIqcA5tUEdvT7 ULJA== X-Gm-Message-State: AD7BkJKjxjhWNec1D1p/t2+eesbQL99k/CoHsU6/5iaKO4SSv7pIIKfwLapVnXMC3bvjPgv6DlIDaA4lxHEw7DorawnDUgHvwRZ1AQuL6C5sQSHXGxa1tw3CDj8sbq948QRWwwuTgGJNmi3imD7Put9ElO5CGc7qGxTrr/3Dk2PU1M+TrOvvekIIFKp3zQcpcAEf X-Received: by 10.112.205.38 with SMTP id ld6mr2799562lbc.55.1457083255476; Fri, 04 Mar 2016 01:20:55 -0800 (PST) Received: from dell6430.guest.wifi ([91.198.246.8]) by smtp.gmail.com with ESMTPSA id r191sm437001lfe.28.2016.03.04.01.20.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 01:20:54 -0800 (PST) From: Janusz Dziedzic To: hostap@lists.infradead.org Subject: [PATCH v5 04/25] wpa_supplicant: add common ctrl iface files Date: Fri, 4 Mar 2016 10:20:20 +0100 Message-Id: <1457083241-7492-5-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_012117_822243_55D118AA X-CRM114-Status: GOOD ( 13.90 ) 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:22c 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 This is preparation for share same code for ctrl iface for wpa_supplicant and hostapd. Signed-off-by: Janusz Dziedzic --- src/common/ctrl_iface_common.c | 141 +++++++++++++++++++++++++++++++++++++++++ src/common/ctrl_iface_common.h | 36 +++++++++++ 2 files changed, 177 insertions(+) create mode 100644 src/common/ctrl_iface_common.c create mode 100644 src/common/ctrl_iface_common.h diff --git a/src/common/ctrl_iface_common.c b/src/common/ctrl_iface_common.c new file mode 100644 index 0000000..82ff276 --- /dev/null +++ b/src/common/ctrl_iface_common.c @@ -0,0 +1,141 @@ +/* + * Common hostapd/wpa_supplicant ctrl iface code. + * Copyright (c) 2002-2013, Jouni Malinen + * Copyright (c) 2015, Qualcomm Atheros, Inc. + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ + +#include "includes.h" +#include "common.h" +#include +#include +#include "ctrl_iface_common.h" + +int sockaddr_compare(struct sockaddr_storage *a, struct sockaddr_storage *b) +{ + struct sockaddr_in *in_a, *in_b; + struct sockaddr_in6 *in6_a, *in6_b; + struct sockaddr_un *u_a, *u_b; + + if (a->ss_family != b->ss_family) + return 1; + + switch (a->ss_family) { + case AF_INET: + in_a = (struct sockaddr_in *) a; + in_b = (struct sockaddr_in *) b; + + if (in_a->sin_port != in_b->sin_port) + return 1; + if (in_a->sin_addr.s_addr != in_b->sin_addr.s_addr) + return 1; + break; + case AF_INET6: + in6_a = (struct sockaddr_in6 *) a; + in6_b = (struct sockaddr_in6 *) b; + + if (in6_a->sin6_port != in6_b->sin6_port) + return 1; + if (os_memcmp(&in6_a->sin6_addr, &in6_b->sin6_addr, sizeof(in6_a->sin6_addr))) + return 1; + break; + case AF_UNIX: + u_a = (struct sockaddr_un *) a; + u_b = (struct sockaddr_un *) b; + + if (os_strncmp(u_a->sun_path, u_b->sun_path, sizeof(u_a->sun_path))) + return 1; + break; + default: + return 1; + } + + return 0; +} + +void sockaddr_print(int level, char *msg, struct sockaddr_storage *sock, socklen_t socklen) +{ + char host[NI_MAXHOST] = {0}; + char service[NI_MAXSERV] = {0}; + char addr_txt[200]; + + switch (sock->ss_family) { + case AF_INET: + case AF_INET6: + getnameinfo((struct sockaddr *) sock, socklen, + host, sizeof(host), + service, sizeof(service), + NI_NUMERICHOST); + + wpa_printf(level, "%s %s:%s", msg, host, service); + break; + case AF_UNIX: + printf_encode(addr_txt, sizeof(addr_txt), + (u8 *) ((struct sockaddr_un *) sock)->sun_path, + socklen - offsetof(struct sockaddr_un, sun_path)); + wpa_printf(level, "%s %s", msg, addr_txt); + break; + default: + wpa_printf(level, "%s", msg); + break; + } +} + +int ctrl_iface_attach(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen) +{ + struct wpa_ctrl_dst *dst; + + dst = os_zalloc(sizeof(*dst)); + if (dst == NULL) + return -1; + os_memcpy(&dst->addr, from, fromlen); + dst->addrlen = fromlen; + dst->debug_level = MSG_INFO; + dl_list_add(ctrl_dst, &dst->list); + + sockaddr_print(MSG_DEBUG, "CTRL_IFACE monitor attached", (struct sockaddr_storage *)from, fromlen); + return 0; +} + + +int ctrl_iface_detach(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen) +{ + struct wpa_ctrl_dst *dst; + + dl_list_for_each(dst, ctrl_dst, struct wpa_ctrl_dst, list) { + if (!sockaddr_compare((struct sockaddr_storage *)from, (struct sockaddr_storage *)&dst->addr)) { + sockaddr_print(MSG_DEBUG, "CTRL_IFACE monitor detached", (struct sockaddr_storage *)from, fromlen); + dl_list_del(&dst->list); + os_free(dst); + return 0; + } + } + + return -1; +} + +int ctrl_iface_level(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen, + char *level) +{ + struct wpa_ctrl_dst *dst; + + wpa_printf(MSG_DEBUG, "CTRL_IFACE LEVEL %s", level); + + dl_list_for_each(dst, ctrl_dst, struct wpa_ctrl_dst, list) { + if (!sockaddr_compare((struct sockaddr_storage *)from, (struct sockaddr_storage *)&dst->addr)) { + sockaddr_print(MSG_DEBUG, "CTRL_IFACE changed monitor level", (struct sockaddr_storage *)from, fromlen); + dst->debug_level = atoi(level); + return 0; + } + } + + return -1; +} diff --git a/src/common/ctrl_iface_common.h b/src/common/ctrl_iface_common.h new file mode 100644 index 0000000..b693847 --- /dev/null +++ b/src/common/ctrl_iface_common.h @@ -0,0 +1,36 @@ +/* + * Common hostapd/wpa_supplicant ctrl iface code. + * Copyright (c) 2002-2013, Jouni Malinen + * Copyright (c) 2015, Qualcomm Atheros, Inc. + * + * This software may be distributed under the terms of the BSD license. + * See README for more details. + */ +#ifndef CONTROL_IFACE_COMMON_H +#define CONTROL_IFACE_COMMON_H + +#include "utils/list.h" + +struct wpa_ctrl_dst { + struct dl_list list; + struct sockaddr_un addr; + socklen_t addrlen; + int debug_level; + int errors; +}; + +int sockaddr_compare(struct sockaddr_storage *a, struct sockaddr_storage *b); +void sockaddr_print(int level, char *msg, struct sockaddr_storage *sock, socklen_t socklen); + +int ctrl_iface_attach(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen); +int ctrl_iface_detach(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen); +int ctrl_iface_level(struct dl_list *ctrl_dst, + struct sockaddr_un *from, + socklen_t fromlen, + char *level); + +#endif /* CONTROL_IFACE_COMMON_H */