Acked-by: Ethan Jackson <et...@nicira.com>
On Fri, Aug 8, 2014 at 5:02 PM, Alex Wang <al...@nicira.com> wrote:
> This commit flips the default value of bfd ip source and destination,
> so that they match the default value of ip destination and source
> of vtep schema.
>
> Signed-off-by: Alex Wang <al...@nicira.com>
> ---
> lib/bfd.c | 4 ++--
> vswitchd/vswitch.xml | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/bfd.c b/lib/bfd.c
> index 892dfe8..9069582 100644
> --- a/lib/bfd.c
> +++ b/lib/bfd.c
> @@ -453,14 +453,14 @@ bfd_configure(struct bfd *bfd, const char *name, const
> struct smap *cfg,
> if (ip_src && bfd_lookup_ip(ip_src, &in_addr)) {
> memcpy(&bfd->ip_src, &in_addr, sizeof in_addr);
> } else {
> - bfd->ip_src = htonl(0xA9FE0100); /* 169.254.1.0. */
> + bfd->ip_src = htonl(0xA9FE0101); /* 169.254.1.1. */
> }
>
> ip_dst = smap_get(cfg, "bfd_dst_ip");
> if (ip_dst && bfd_lookup_ip(ip_dst, &in_addr)) {
> memcpy(&bfd->ip_dst, &in_addr, sizeof in_addr);
> } else {
> - bfd->ip_dst = htonl(0xA9FE0101); /* 169.254.1.1. */
> + bfd->ip_dst = htonl(0xA9FE0100); /* 169.254.1.0. */
> }
>
> forwarding_if_rx = smap_get_bool(cfg, "forwarding_if_rx", false);
> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> index d47fc1a..bff8fb6 100644
> --- a/vswitchd/vswitch.xml
> +++ b/vswitchd/vswitch.xml
> @@ -2091,12 +2091,12 @@
>
> <column name="bfd" key="bfd_src_ip">
> Set to an IPv4 address to set the IP address used as source for
> - transmitted BFD packets. The default is <code>169.254.1.0</code>.
> + transmitted BFD packets. The default is <code>169.254.1.1</code>.
> </column>
>
> <column name="bfd" key="bfd_dst_ip">
> Set to an IPv4 address to set the IP address used as destination
> - for transmitted BFD packets. The default is
> <code>169.254.1.1</code>.
> + for transmitted BFD packets. The default is
> <code>169.254.1.0</code>.
> </column>
> </group>
>
> --
> 1.7.9.5
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
