From: Alex Wang <alexw@nicira.com>
Date: Fri, 8 Aug 2014 22:50:14 +0000 (-0700)
Subject: bfd: Flip the default value of bfd ip source and destination.
X-Git-Tag: v2.3~3
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=4e3b1253e181089f4691c7f84d6a0beac32d239d

bfd: Flip the default value of bfd ip source and destination.

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 <alexw@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/lib/bfd.c b/lib/bfd.c
index 4cbe99969..6e2acee58 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 15ff66c51..d58098945 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -2023,12 +2023,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>