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

iplink_vxlan: Get rid of inet_get_addr() 

Now we have additional information about address
class from get_addr() we can use it in place of
inet_get_addr().

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Serhey Popovych 2018-01-18 20:13:46 +02:00 committed by David Ahern
parent 6c4b672738
commit 1e9b8072de
1 changed files with 26 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ip/iplink_vxlan.c
View File

@ -74,11 +74,9 @@ static void check_duparg(__u64 *attrs, int type, const char *key,
static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
struct nlmsghdr *n) struct nlmsghdr *n)
{ {
inet_prefix saddr;
inet_prefix daddr;
__u32 vni = 0; __u32 vni = 0;
__u32 gaddr = 0;
__u32 daddr = 0;
struct in6_addr gaddr6 = IN6ADDR_ANY_INIT;
struct in6_addr daddr6 = IN6ADDR_ANY_INIT;
__u8 learning = 1; __u8 learning = 1;
__u16 dstport = 0; __u16 dstport = 0;
__u8 metadata = 0; __u8 metadata = 0;
@ -86,6 +84,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
bool set_op = (n->nlmsg_type == RTM_NEWLINK && bool set_op = (n->nlmsg_type == RTM_NEWLINK &&
!(n->nlmsg_flags & NLM_F_CREATE)); !(n->nlmsg_flags & NLM_F_CREATE));
saddr.family = daddr.family = AF_UNSPEC;
saddr.flags = daddr.flags = 0;
while (argc > 0) { while (argc > 0) {
if (!matches(*argv, "id") || if (!matches(*argv, "id") ||
!matches(*argv, "vni")) { !matches(*argv, "vni")) {
@ -98,54 +99,33 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
vni >= 1u << 24) vni >= 1u << 24)
invarg("invalid id", *argv); invarg("invalid id", *argv);
} else if (!matches(*argv, "group")) { } else if (!matches(*argv, "group")) {
if (daddr || !IN6_IS_ADDR_UNSPECIFIED(&daddr6)) { if (is_addrtype_inet_not_multi(&daddr)) {
fprintf(stderr, "vxlan: both group and remote"); fprintf(stderr, "vxlan: both group and remote");
fprintf(stderr, " cannot be specified\n"); fprintf(stderr, " cannot be specified\n");
return -1; return -1;
} }
NEXT_ARG(); NEXT_ARG();
check_duparg(&attrs, IFLA_VXLAN_GROUP, "group", *argv); check_duparg(&attrs, IFLA_VXLAN_GROUP, "group", *argv);
if (!inet_get_addr(*argv, &gaddr, &gaddr6)) { get_addr(&daddr, *argv, saddr.family);
fprintf(stderr, "Invalid address \"%s\"\n", *argv); if (!is_addrtype_inet_multi(&daddr))
return -1;
}
if (!IN6_IS_ADDR_MULTICAST(&gaddr6) && !IN_MULTICAST(ntohl(gaddr)))
invarg("invalid group address", *argv); invarg("invalid group address", *argv);
} else if (!matches(*argv, "remote")) { } else if (!matches(*argv, "remote")) {
if (gaddr || !IN6_IS_ADDR_UNSPECIFIED(&gaddr6)) { if (is_addrtype_inet_multi(&daddr)) {
fprintf(stderr, "vxlan: both group and remote"); fprintf(stderr, "vxlan: both group and remote");
fprintf(stderr, " cannot be specified\n"); fprintf(stderr, " cannot be specified\n");
return -1; return -1;
} }
NEXT_ARG(); NEXT_ARG();
check_duparg(&attrs, IFLA_VXLAN_GROUP, "remote", *argv); check_duparg(&attrs, IFLA_VXLAN_GROUP, "remote", *argv);
if (!inet_get_addr(*argv, &daddr, &daddr6)) { get_addr(&daddr, *argv, saddr.family);
fprintf(stderr, "Invalid address \"%s\"\n", *argv); if (!is_addrtype_inet_not_multi(&daddr))
return -1;
}
if (IN6_IS_ADDR_MULTICAST(&daddr6) || IN_MULTICAST(ntohl(daddr)))
invarg("invalid remote address", *argv); invarg("invalid remote address", *argv);
} else if (!matches(*argv, "local")) { } else if (!matches(*argv, "local")) {
__u32 saddr = 0;
struct in6_addr saddr6 = IN6ADDR_ANY_INIT;
NEXT_ARG(); NEXT_ARG();
check_duparg(&attrs, IFLA_VXLAN_LOCAL, "local", *argv); check_duparg(&attrs, IFLA_VXLAN_LOCAL, "local", *argv);
if (strcmp(*argv, "any")) { get_addr(&saddr, *argv, daddr.family);
if (!inet_get_addr(*argv, &saddr, &saddr6)) { if (!is_addrtype_inet_not_multi(&saddr))
fprintf(stderr, "Invalid address \"%s\"\n", *argv);
return -1;
}
}
if (IN_MULTICAST(ntohl(saddr)) || IN6_IS_ADDR_MULTICAST(&saddr6))
invarg("invalid local address", *argv); invarg("invalid local address", *argv);
if (saddr)
addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
else if (!IN6_IS_ADDR_UNSPECIFIED(&saddr6))
addattr_l(n, 1024, IFLA_VXLAN_LOCAL6, &saddr6,
sizeof(struct in6_addr));
} else if (!matches(*argv, "dev")) { } else if (!matches(*argv, "dev")) {
unsigned int link; unsigned int link;
@ -350,7 +330,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
return -1; return -1;
} }
if ((gaddr || !IN6_IS_ADDR_UNSPECIFIED(&gaddr6)) && if (is_addrtype_inet_multi(&daddr) &&
!VXLAN_ATTRSET(attrs, IFLA_VXLAN_LINK)) { !VXLAN_ATTRSET(attrs, IFLA_VXLAN_LINK)) {
fprintf(stderr, "vxlan: 'group' requires 'dev' to be specified\n"); fprintf(stderr, "vxlan: 'group' requires 'dev' to be specified\n");
return -1; return -1;
@ -369,18 +349,18 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
if (VXLAN_ATTRSET(attrs, IFLA_VXLAN_ID)) if (VXLAN_ATTRSET(attrs, IFLA_VXLAN_ID))
addattr32(n, 1024, IFLA_VXLAN_ID, vni); addattr32(n, 1024, IFLA_VXLAN_ID, vni);
if (gaddr)
addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4); if (is_addrtype_inet(&saddr)) {
else if (daddr) int type = (saddr.family == AF_INET) ? IFLA_VXLAN_LOCAL
addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4); : IFLA_VXLAN_LOCAL6;
else if (!IN6_IS_ADDR_UNSPECIFIED(&gaddr6)) addattr_l(n, 1024, type, saddr.data, saddr.bytelen);
addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &gaddr6, sizeof(struct in6_addr)); }
else if (!IN6_IS_ADDR_UNSPECIFIED(&daddr6))
addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr)); if (is_addrtype_inet(&daddr)) {
else if (preferred_family == AF_INET) int type = (daddr.family == AF_INET) ? IFLA_VXLAN_GROUP
addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4); : IFLA_VXLAN_GROUP6;
else if (preferred_family == AF_INET6) addattr_l(n, 1024, type, daddr.data, daddr.bytelen);
addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr)); }
if (!set_op || VXLAN_ATTRSET(attrs, IFLA_VXLAN_LEARNING)) if (!set_op || VXLAN_ATTRSET(attrs, IFLA_VXLAN_LEARNING))
addattr8(n, 1024, IFLA_VXLAN_LEARNING, learning); addattr8(n, 1024, IFLA_VXLAN_LEARNING, learning);