netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: "Марк Коренберг" <socketpair@gmail.com>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH] ip link get dev if%u" now works
Date: Wed, 9 Jun 2021 17:07:50 -0700	[thread overview]
Message-ID: <20210609170743.7dd68f9a@hermes.local> (raw)
In-Reply-To: <CAEmTpZHK7OoWxpGXKc0_=yYhW0YxQVZUYU3_Gkpf2VeA9xBMXw@mail.gmail.com>

> commit c71a164fb3abbce177cb2692e25ebc54e0156d5a (refs/remotes/origin/getindex)
> Author: Коренберг ☢️  Марк <mark@ideco.ru>
> Date:   Thu May 13 15:43:14 2021 +0500
> 
>     ip: "ip link get dev if%u" now works

Patch is missing Signed-off-by

> 
> diff --git a/ip/ip_common.h b/ip/ip_common.h
> index 9a31e837..1eb40a1e 100644
> --- a/ip/ip_common.h
> +++ b/ip/ip_common.h
> @@ -89,7 +89,7 @@ int do_seg6(int argc, char **argv);
>  int do_ipnh(int argc, char **argv);
>  int do_mptcp(int argc, char **argv);
>  
> -int iplink_get(char *name, __u32 filt_mask);
> +int iplink_get(unsigned ifindex, __u32 filt_mask);

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
#94: FILE: ip/ip_common.h:92:
+int iplink_get(unsigned ifindex, __u32 filt_mask);

>  int iplink_ifla_xstats(int argc, char **argv);
>  
>  int ip_link_list(req_filter_fn_t filter_fn, struct nlmsg_chain *linfo);
> diff --git a/ip/ipaddress.c b/ip/ipaddress.c
> index 0bbcee2b..9be6ea4d 100644
> --- a/ip/ipaddress.c
> +++ b/ip/ipaddress.c
> @@ -10,6 +10,7 @@
>   *
>   */
>  
> +#include <assert.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>  #include <unistd.h>
> @@ -2111,7 +2112,8 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
>  	 * the link device
>  	 */
>  	if (filter_dev && filter.group == -1 && do_link == 1) {
> -		if (iplink_get(filter_dev, RTEXT_FILTER_VF) < 0) {
> +		assert(filter.ifindex);

No assert() please do more complete error message and handling.

> +		if (iplink_get(filter.ifindex, RTEXT_FILTER_VF) < 0) {
>  			perror("Cannot send link get request");
>  			delete_json_obj();
>  			exit(1);
> diff --git a/ip/iplink.c b/ip/iplink.c
> index 27c9be44..43272c6b 100644
> --- a/ip/iplink.c
> +++ b/ip/iplink.c
> @@ -1101,21 +1101,17 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
>  	return 0;
>  }
>  
> -int iplink_get(char *name, __u32 filt_mask)
> +int iplink_get(unsigned ifindex, __u32 filt_mask)
>  {
>  	struct iplink_req req = {
>  		.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
>  		.n.nlmsg_flags = NLM_F_REQUEST,
>  		.n.nlmsg_type = RTM_GETLINK,
>  		.i.ifi_family = preferred_family,
> +		.i.ifi_index = ifindex,
>  	};
>  	struct nlmsghdr *answer;
>  
> -	if (name) {
> -		addattr_l(&req.n, sizeof(req),
> -			  !check_ifname(name) ? IFLA_IFNAME : IFLA_ALT_IFNAME,
> -			  name, strlen(name) + 1);
> -	}

The old code supported matching by alter name, it looks like with your
change it no longer does.

>  	addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
>  
>  	if (rtnl_talk(&rth, &req.n, &answer) < 0)

      parent reply	other threads:[~2021-06-10  0:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-04  4:24 [PATCH] ip link get dev if%u" now works Марк Коренберг
2021-06-06  3:51 ` Stephen Hemminger
2021-06-10  0:07 ` Stephen Hemminger [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210609170743.7dd68f9a@hermes.local \
    --to=stephen@networkplumber.org \
    --cc=netdev@vger.kernel.org \
    --cc=socketpair@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).