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

iplink_geneve: 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:45 +02:00 committed by David Ahern
parent 7bf5e876d0
commit 6c4b672738
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ip/iplink_geneve.c
View File

@ -57,9 +57,8 @@ static void check_duparg(__u64 *attrs, int type, const char *key,
static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
struct nlmsghdr *n) struct nlmsghdr *n)
{ {
inet_prefix daddr;
__u32 vni = 0; __u32 vni = 0;
__u32 daddr = 0;
struct in6_addr daddr6 = IN6ADDR_ANY_INIT;
__u32 label = 0; __u32 label = 0;
__u8 ttl = 0; __u8 ttl = 0;
__u8 tos = 0; __u8 tos = 0;
@ -72,6 +71,8 @@ static int geneve_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));
daddr.flags = 0;
while (argc > 0) { while (argc > 0) {
if (!matches(*argv, "id") || if (!matches(*argv, "id") ||
!matches(*argv, "vni")) { !matches(*argv, "vni")) {
@ -84,11 +85,8 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
NEXT_ARG(); NEXT_ARG();
check_duparg(&attrs, IFLA_GENEVE_REMOTE, "remote", check_duparg(&attrs, IFLA_GENEVE_REMOTE, "remote",
*argv); *argv);
if (!inet_get_addr(*argv, &daddr, &daddr6)) { get_addr(&daddr, *argv, AF_UNSPEC);
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, "ttl") || } else if (!matches(*argv, "ttl") ||
!matches(*argv, "hoplimit")) { !matches(*argv, "hoplimit")) {
@ -191,18 +189,17 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
* ID (VNI) to identify the geneve device, and we do not need * ID (VNI) to identify the geneve device, and we do not need
* the remote IP. * the remote IP.
*/ */
if (!set_op && !daddr && IN6_IS_ADDR_UNSPECIFIED(&daddr6)) { if (!set_op && !is_addrtype_inet(&daddr)) {
fprintf(stderr, "geneve: remote link partner not specified\n"); fprintf(stderr, "geneve: remote link partner not specified\n");
return -1; return -1;
} }
} }
addattr32(n, 1024, IFLA_GENEVE_ID, vni); addattr32(n, 1024, IFLA_GENEVE_ID, vni);
if (daddr) if (is_addrtype_inet(&daddr)) {
addattr_l(n, 1024, IFLA_GENEVE_REMOTE, &daddr, 4); int type = (daddr.family == AF_INET) ? IFLA_GENEVE_REMOTE :
if (!IN6_IS_ADDR_UNSPECIFIED(&daddr6)) { IFLA_GENEVE_REMOTE6;
addattr_l(n, 1024, IFLA_GENEVE_REMOTE6, &daddr6, addattr_l(n, sizeof(1024), type, daddr.data, daddr.bytelen);
sizeof(struct in6_addr));
} }
if (!set_op || GENEVE_ATTRSET(attrs, IFLA_GENEVE_LABEL)) if (!set_op || GENEVE_ATTRSET(attrs, IFLA_GENEVE_LABEL))
addattr32(n, 1024, IFLA_GENEVE_LABEL, label); addattr32(n, 1024, IFLA_GENEVE_LABEL, label);