From patchwork Tue Jan 23 19:19:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 864962 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="caExu8DS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zQymG05wzz9s9Y for ; Wed, 24 Jan 2018 06:19:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752044AbeAWTTk (ORCPT ); Tue, 23 Jan 2018 14:19:40 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33022 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751774AbeAWTTi (ORCPT ); Tue, 23 Jan 2018 14:19:38 -0500 Received: by mail-lf0-f67.google.com with SMTP id t139so2044405lff.0 for ; Tue, 23 Jan 2018 11:19:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=76X53dY0a+XHyUfkAPpfZ1G4avbUz7ZBaNPgs6CdjVk=; b=caExu8DSGV+5CJUwxrXlTdX/Ig3y20pRWKqUAud5mOef8rrEpI5xx8jrYEVqWTig3L Yh3ez7aHyj+ORUDd9PTQkBqxyPCrMsbfIOmau4YPp1l0KMaXCAVgmebjixmJBq8DXyBs dtxgdMiZlAckMgGvJcdp1Ibwc1PTGxtpXYew32kfRQLkBWEv+8Jn6qxQk8dOjYUbIzfU 6oeUDkUz8fiLSgKHzlhG1Nqkkk06L2EndoOS6ZQoenWh5sasoMLjS78yRoQWHWkwfsdX 7DCRQO08xXtIP8us7sfFGNoTvgpkb7A/dGsrE4H9K4/91FM5kZHGxCnwIlSwp6AjfNBj SllQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=76X53dY0a+XHyUfkAPpfZ1G4avbUz7ZBaNPgs6CdjVk=; b=f9W3tjKWs/n/clXhzuVTJiOAJRfZbafhUxK6x29FQJRtdVcNc94XUyzFNND96Er3p0 coGK4SELcmHXpHKkE1kwPbnv46UJKE/LFHz4GAOMmz/8mqCT0uzYhhkE0yOu0CFPwNbZ +6+93BnsVB4oEwL2MCtxJ7pz3NwXNfdINJXQbPPh3uV3J1NIKy3mQgKvA1Eq9fhN+vJn +BCTDit7w4OLxQDOMYMdpYOWH/oXqViuDU0l0Xee+fdOaTc5geiKXnXowSKpVTq+nenv D6KZPt9QBP43EWtAz5Y/SW7N2oPOAw6BggUt3+MaHpip8rCPraOv1JSgW0/Ie5E4F+fE Mosg== X-Gm-Message-State: AKwxytfSdS09P5Uw0Sqnr7Y0Z+KnuF/EDmOm8KvNGetTBw3lTLnMuMDg 1vR9oC8VP6freI3Ab8BlMdprIQ== X-Google-Smtp-Source: AH8x2254y9NBJtmVgv67tbguo9dPaDRMny9DsAnl3znkgVANHhb85ndeVWt9mNARIlvFx8hW+7ecZg== X-Received: by 10.46.43.71 with SMTP id q68mr1747804lje.92.1516735176738; Tue, 23 Jan 2018 11:19:36 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id u87sm162394lfk.8.2018.01.23.11.19.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 11:19:35 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v2 1/8] utils: Introduce get_addr_rta() and inet_addr_match_rta() Date: Tue, 23 Jan 2018 21:19:23 +0200 Message-Id: <1516735170-20921-2-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1516735170-20921-1-git-send-email-serhe.popovych@gmail.com> References: <1516735170-20921-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org First is used to get address from netlink attribute to inet_prefix data structure. Use memcpy() with constant value to let complier optimize by replacing a call by inlining load/store instructions. Second is used to match address in given netlink attribute with one given as reference. It matches successfully if no attribute is given (@rta is NULL), reference address family is AF_UNSPEC or it's length isn't given; fails if get_attr_rta() can't get attribute or it's family does not match reference; calls inet_addr_match() to get final verdict. Signed-off-by: Serhey Popovych --- include/utils.h | 2 ++ lib/utils.c | 95 ++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 19 deletions(-) diff --git a/include/utils.h b/include/utils.h index f562547..0394268 100644 --- a/include/utils.h +++ b/include/utils.h @@ -120,6 +120,7 @@ int get_prefix_1(inet_prefix *dst, char *arg, int family); int get_addr(inet_prefix *dst, const char *arg, int family); int get_prefix(inet_prefix *dst, char *arg, int family); int mask2bits(__u32 netmask); +int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family); int get_addr_ila(__u64 *val, const char *arg); int read_prop(const char *dev, char *prop, long *value); @@ -174,6 +175,7 @@ int check_ifname(const char *); int get_ifname(char *, const char *); int matches(const char *arg, const char *pattern); int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits); +int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta); const char *dnet_ntop(int af, const void *addr, char *str, size_t len); int dnet_pton(int af, const char *src, void *addr); diff --git a/lib/utils.c b/lib/utils.c index e20b60e..8e15625 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -534,6 +534,28 @@ int get_addr64(__u64 *ap, const char *cp) return 1; } +static void set_address_type(inet_prefix *addr) +{ + switch (addr->family) { + case AF_INET: + if (!addr->data[0]) + addr->flags |= ADDRTYPE_INET_UNSPEC; + else if (IN_MULTICAST(ntohl(addr->data[0]))) + addr->flags |= ADDRTYPE_INET_MULTI; + else + addr->flags |= ADDRTYPE_INET; + break; + case AF_INET6: + if (IN6_IS_ADDR_UNSPECIFIED(addr->data)) + addr->flags |= ADDRTYPE_INET_UNSPEC; + else if (IN6_IS_ADDR_MULTICAST(addr->data)) + addr->flags |= ADDRTYPE_INET_MULTI; + else + addr->flags |= ADDRTYPE_INET; + break; + } +} + static int __get_addr_1(inet_prefix *addr, const char *name, int family) { memset(addr, 0, sizeof(*addr)); @@ -627,25 +649,7 @@ int get_addr_1(inet_prefix *addr, const char *name, int family) if (ret) return ret; - switch (addr->family) { - case AF_INET: - if (!addr->data[0]) - addr->flags |= ADDRTYPE_INET_UNSPEC; - else if (IN_MULTICAST(ntohl(addr->data[0]))) - addr->flags |= ADDRTYPE_INET_MULTI; - else - addr->flags |= ADDRTYPE_INET; - break; - case AF_INET6: - if (IN6_IS_ADDR_UNSPECIFIED(addr->data)) - addr->flags |= ADDRTYPE_INET_UNSPEC; - else if (IN6_IS_ADDR_MULTICAST(addr->data)) - addr->flags |= ADDRTYPE_INET_MULTI; - else - addr->flags |= ADDRTYPE_INET; - break; - } - + set_address_type(addr); return 0; } @@ -734,6 +738,46 @@ int get_addr(inet_prefix *dst, const char *arg, int family) return 0; } +int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family) +{ + const int len = RTA_PAYLOAD(rta); + const void *data = RTA_DATA(rta); + + switch (len) { + case 4: + dst->family = AF_INET; + dst->bytelen = 4; + memcpy(dst->data, data, 4); + break; + case 16: + dst->family = AF_INET6; + dst->bytelen = 16; + memcpy(dst->data, data, 16); + break; + case 2: + dst->family = AF_DECnet; + dst->bytelen = 2; + memcpy(dst->data, data, 2); + break; + case 10: + dst->family = AF_IPX; + dst->bytelen = 10; + memcpy(dst->data, data, 10); + break; + default: + return -1; + } + + if (family != AF_UNSPEC && family != dst->family) + return -2; + + dst->bitlen = -1; + dst->flags = 0; + + set_address_type(dst); + return 0; +} + int get_prefix(inet_prefix *dst, char *arg, int family) { if (family == AF_PACKET) { @@ -864,6 +908,19 @@ int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits) return 0; } +int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta) +{ + inet_prefix dst; + + if (!rta || m->family == AF_UNSPEC || m->bitlen <= 0) + return 0; + + if (get_addr_rta(&dst, rta, m->family)) + return -1; + + return inet_addr_match(&dst, m, m->bitlen); +} + int __iproute2_hz_internal; int __get_hz(void)