From mboxrd@z Thu Jan 1 00:00:00 1970 From: Serhey Popovych Subject: [PATCH iproute2 1/6] utils: Always specify family for address in get_addr_1() Date: Thu, 18 Jan 2018 20:13:42 +0200 Message-ID: <1516299227-26724-2-git-send-email-serhe.popovych@gmail.com> References: <1516299227-26724-1-git-send-email-serhe.popovych@gmail.com> To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f67.google.com ([209.85.215.67]:32988 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbeARSOQ (ORCPT ); Thu, 18 Jan 2018 13:14:16 -0500 Received: by mail-lf0-f67.google.com with SMTP id t139so13052985lff.0 for ; Thu, 18 Jan 2018 10:14:16 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id l187sm1319975lfg.12.2018.01.18.10.14.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 10:14:14 -0800 (PST) In-Reply-To: <1516299227-26724-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Set ->family correctly when string representing address is "default", "all" or "any": get_addr_1() might be called with AF_UNSPEC (e.g. get_addr() -> get_addr_1()). Extend support for zero address to all address families, not only AF_INET and AF_INET6 when one explicitly given as @family: use af_byte_len() to correctly set address length. Still assume AF_INET when @family is AF_UNSPEC. Signed-off-by: Serhey Popovych --- lib/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utils.c b/lib/utils.c index 9fa5220..a023e74 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -543,8 +543,8 @@ int get_addr_1(inet_prefix *addr, const char *name, int family) strcmp(name, "any") == 0) { if ((family == AF_DECnet) || (family == AF_MPLS)) return -1; - addr->family = family; - addr->bytelen = (family == AF_INET6 ? 16 : 4); + addr->family = (family != AF_UNSPEC) ? family : AF_INET; + addr->bytelen = af_byte_len(addr->family); addr->bitlen = -1; return 0; } -- 1.7.10.4