From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mahesh Bandewar Subject: [PATCHv2 iproute2 1/3] ipmaddr: use preferred_family when given Date: Tue, 21 Aug 2018 10:48:51 -0700 Message-ID: <20180821174851.208490-1-mahesh@bandewar.net> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: netdev , Mahesh Bandewar To: Stephen Hemminger Return-path: Received: from mail-pf1-f195.google.com ([209.85.210.195]:38378 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbeHUVKB (ORCPT ); Tue, 21 Aug 2018 17:10:01 -0400 Received: by mail-pf1-f195.google.com with SMTP id x17-v6so8847197pfh.5 for ; Tue, 21 Aug 2018 10:48:54 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: From: Mahesh Bandewar When creating socket() AF_INET is used irrespective of the family that is given at the command-line (with -4, -6, or -0). This change will open the socket with the preferred family. Signed-off-by: Mahesh Bandewar --- ip/ipmaddr.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c index a48499029e17..abf83784d0df 100644 --- a/ip/ipmaddr.c +++ b/ip/ipmaddr.c @@ -289,6 +289,7 @@ static int multiaddr_list(int argc, char **argv) static int multiaddr_modify(int cmd, int argc, char **argv) { struct ifreq ifr = {}; + int family; int fd; if (cmd == RTM_NEWADDR) @@ -324,7 +325,17 @@ static int multiaddr_modify(int cmd, int argc, char **argv) exit(-1); } - fd = socket(AF_INET, SOCK_DGRAM, 0); + switch (preferred_family) { + case AF_INET6: + case AF_PACKET: + case AF_INET: + family = preferred_family; + break; + default: + family = AF_INET; + } + + fd = socket(family, SOCK_DGRAM, 0); if (fd < 0) { perror("Cannot create socket"); exit(1); -- 2.18.0.865.gffc8e1a3cd6-goog