Skip to content

Commit

Permalink
bfd: Flip the default value of bfd ip source and destination.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yew011 committed Aug 14, 2014
1 parent dc3a363 commit 4e3b125
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/bfd.c
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions vswitchd/vswitch.xml
Expand Up @@ -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>

Expand Down

0 comments on commit 4e3b125

Please sign in to comment.