| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 16 Apr 2013 21:57:15 +0900
From: Atzm Watanabe <atzm@...atosphere.co.jp>
To: netdev@...r.kernel.org
Cc: Stephen Hemminger <stephen@...workplumber.org>,
David Miller <davem@...emloft.net>,
Ben Hutchings <bhutchings@...arflare.com>,
David Stevens <dlstevens@...ibm.com>,
Mike Rapoport <mike.rapoport@...ellosystems.com>
Subject: [PATCH iproute2 v4] vxlan: Allow setting destination to unicast address.
This patch allows setting VXLAN destination to unicast address.
It allows that VXLAN can be used as peer-to-peer tunnel without
multicast.
v4: replace "group" with "remote" based by David Stevens's comments.
v3: move a new attribute REMOTE into the last of an enum list
based by Stephen Hemminger's comments.
fix the usage to show explicitly that both "remote" and "group"
cannot be specified, based by Ben Hutchings's comments.
v2: use a new argument "remote" instead of "group" based by
Stephen Hemminger's comments.
Signed-off-by: Atzm Watanabe <atzm@...atosphere.co.jp>
---
include/linux/if_link.h | 2 +-
ip/iplink_vxlan.c | 21 +++++++++------------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 40167af..7064f27 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -293,7 +293,7 @@ enum macvlan_mode {
enum {
IFLA_VXLAN_UNSPEC,
IFLA_VXLAN_ID,
- IFLA_VXLAN_GROUP,
+ IFLA_VXLAN_REMOTE,
IFLA_VXLAN_LINK,
IFLA_VXLAN_LOCAL,
IFLA_VXLAN_TTL,
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index 1025326..371731e 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -23,7 +23,7 @@
static void explain(void)
{
- fprintf(stderr, "Usage: ... vxlan id VNI [ group ADDR ] [ local ADDR ]\n");
+ fprintf(stderr, "Usage: ... vxlan id VNI [ remote ADDR ] [ local ADDR ]\n");
fprintf(stderr, " [ ttl TTL ] [ tos TOS ] [ dev PHYS_DEV ]\n");
fprintf(stderr, " [ port MIN MAX ] [ [no]learning ]\n");
fprintf(stderr, " [ [no]proxy ] [ [no]rsc ]\n");
@@ -41,7 +41,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
__u32 vni = 0;
int vni_set = 0;
__u32 saddr = 0;
- __u32 gaddr = 0;
+ __u32 daddr = 0;
unsigned link = 0;
__u8 tos = 0;
__u8 ttl = 0;
@@ -63,12 +63,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
vni >= 1u << 24)
invarg("invalid id", *argv);
vni_set = 1;
- } else if (!matches(*argv, "group")) {
+ } else if (!matches(*argv, "remote")) {
NEXT_ARG();
- gaddr = get_addr32(*argv);
-
- if (!IN_MULTICAST(ntohl(gaddr)))
- invarg("invald group address", *argv);
+ daddr = get_addr32(*argv);
} else if (!matches(*argv, "local")) {
NEXT_ARG();
if (strcmp(*argv, "any"))
@@ -161,8 +158,8 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
return -1;
}
addattr32(n, 1024, IFLA_VXLAN_ID, vni);
- if (gaddr)
- addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
+ if (daddr)
+ addattr_l(n, 1024, IFLA_VXLAN_REMOTE, &daddr, 4);
if (saddr)
addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
if (link)
@@ -206,10 +203,10 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
vni = rta_getattr_u32(tb[IFLA_VXLAN_ID]);
fprintf(f, "id %u ", vni);
- if (tb[IFLA_VXLAN_GROUP]) {
- __be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]);
+ if (tb[IFLA_VXLAN_REMOTE]) {
+ __be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_REMOTE]);
if (addr)
- fprintf(f, "group %s ",
+ fprintf(f, "remote %s ",
format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
}
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists