matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change name_is_vrf to return index 

index of 0 means name is not a valid vrf.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
This commit is contained in:
David Ahern 2016-12-11 16:53:13 -08:00 committed by Stephen Hemminger
parent 1dafceb1c9
commit 2330490f0e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ip_common.h
View File

@ -91,7 +91,7 @@ struct link_util *get_link_kind(const char *kind);
void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len); void br_dump_bridge_id(const struct ifla_bridge_id *id, char *buf, size_t len);
__u32 ipvrf_get_table(const char *name); __u32 ipvrf_get_table(const char *name);
bool name_is_vrf(const char *name); int name_is_vrf(const char *name);
#ifndef INFINITY_LIFE_TIME #ifndef INFINITY_LIFE_TIME
#define INFINITY_LIFE_TIME 0xFFFFFFFFU #define INFINITY_LIFE_TIME 0xFFFFFFFFU

15
ip/iplink_vrf.c
View File

@ -159,7 +159,7 @@ __u32 ipvrf_get_table(const char *name)
return tb_id; return tb_id;
} }
bool name_is_vrf(const char *name) int name_is_vrf(const char *name)
{ {
struct { struct {
struct nlmsghdr n; struct nlmsghdr n;
@ -187,24 +187,27 @@ bool name_is_vrf(const char *name)
addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, strlen(name) + 1); addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, strlen(name) + 1);
if (rtnl_talk(&rth, &req.n, &answer.n, sizeof(answer)) < 0) if (rtnl_talk(&rth, &req.n, &answer.n, sizeof(answer)) < 0)
return false; return 0;
ifi = NLMSG_DATA(&answer.n); ifi = NLMSG_DATA(&answer.n);
len = answer.n.nlmsg_len - NLMSG_LENGTH(sizeof(*ifi)); len = answer.n.nlmsg_len - NLMSG_LENGTH(sizeof(*ifi));
if (len < 0) { if (len < 0) {
fprintf(stderr, "BUG: Invalid response to link query.\n"); fprintf(stderr, "BUG: Invalid response to link query.\n");
return false; return 0;
} }
parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len); parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi), len);
if (!tb[IFLA_LINKINFO]) if (!tb[IFLA_LINKINFO])
return false; return 0;
parse_rtattr_nested(li, IFLA_INFO_MAX, tb[IFLA_LINKINFO]); parse_rtattr_nested(li, IFLA_INFO_MAX, tb[IFLA_LINKINFO]);
if (!li[IFLA_INFO_KIND]) if (!li[IFLA_INFO_KIND])
return false; return 0;
return strcmp(RTA_DATA(li[IFLA_INFO_KIND]), "vrf") == 0; if (strcmp(RTA_DATA(li[IFLA_INFO_KIND]), "vrf"))
return 0;
return ifi->ifi_index;
} }