From mboxrd@z Thu Jan 1 00:00:00 1970 From: Atzm Watanabe Subject: [PATCH iproute2 v5] vxlan: Allow setting destination to unicast address. Date: Wed, 17 Jul 2013 18:40:52 +0900 Message-ID: <877ggpy15n.wl%atzm@stratosphere.co.jp> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: Stephen Hemminger , David Miller , Ben Hutchings , David Stevens , Mike Rapoport To: netdev@vger.kernel.org Return-path: Received: from mail-pd0-f182.google.com ([209.85.192.182]:39948 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753222Ab3GQJjl (ORCPT ); Wed, 17 Jul 2013 05:39:41 -0400 Received: by mail-pd0-f182.google.com with SMTP id r10so1653857pdi.13 for ; Wed, 17 Jul 2013 02:39:41 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: This patch allows setting VXLAN destination to unicast address. It allows that VXLAN can be used as peer-to-peer tunnel without multicast. v5: rebase on the latest. 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 --- ip/iplink_vxlan.c | 17 +++++++---------- man/man8/ip-link.8.in | 11 ++++++++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c index 1025326..0f9cccf 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_GROUP, &daddr, 4); if (saddr) addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4); if (link) @@ -209,7 +206,7 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) if (tb[IFLA_VXLAN_GROUP]) { __be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]); if (addr) - fprintf(f, "group %s ", + fprintf(f, "remote %s ", format_host(AF_INET, 4, &addr, s1, sizeof(s1))); } diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 86e0bc9..25e2f31 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -207,7 +207,7 @@ the following additional arguments are supported: .R " [ " .BI dev " PHYS_DEV " .R " ] [ " -.BI group " IPADDR " +.BI remote " IPADDR " .R " ] [ " .BI local " IPADDR " .R " ] [ " @@ -238,8 +238,13 @@ Identifier) to use. - specifies the physical device to use for tunnel endpoint communication. .sp -.BI group " IPADDR" -- specifies the multicast IP address to join. +.BI remote " IPADDR" +- specifies the destination IP address to use in outgoing packets when +the destination link layer address is not known in the VXLAN device +forwarding database. +.I IPADDR +will also be used to join the group if a multicast IP address is +specified. .sp .BI local " IPADDR" -- 1.8.1.5