summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2019-02-13 21:40:54 +0000
committerQuentin Young <qlyoung@cumulusnetworks.com>2019-05-17 00:27:08 +0000
commit00984df75ad2cb581d3acffac4aa2d1eb58b648d (patch)
treecaf3a182d0ab7aa8665953c2ffb05c421e9ab795
parentdfed4e22bf82ca8827f12887ab5349196afa2538 (diff)
vrrpd: log addresses for autoconfig
When adding and removing addreses. log them. Also include a VRID tag when autoconfiguring new instances. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
-rw-r--r--vrrpd/vrrp.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/vrrpd/vrrp.c b/vrrpd/vrrp.c
index 8071944d99..5dde98a082 100644
--- a/vrrpd/vrrp.c
+++ b/vrrpd/vrrp.c
@@ -1341,6 +1341,7 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_vrouter *vr)
struct listnode *ln;
struct connected *c = NULL;
+ char ipbuf[INET6_ADDRSTRLEN];
if (vr->v4->mvl_ifp) {
DEBUGD(&vrrp_dbg_auto,
@@ -1348,8 +1349,14 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_vrouter *vr)
"Setting IPv4 Virtual IP list to match IPv4 addresses on %s",
vr->vrid, vr->v4->mvl_ifp->name);
for (ALL_LIST_ELEMENTS_RO(vr->v4->mvl_ifp->connected, ln, c))
- if (c->address->family == AF_INET)
+ if (c->address->family == AF_INET) {
+ inet_ntop(AF_INET, &c->address->u.prefix4, ipbuf,
+ sizeof(ipbuf));
+ DEBUGD(&vrrp_dbg_auto,
+ VRRP_LOGPFX VRRP_LOGPFX_VRID "Adding %s",
+ vr->vrid, ipbuf);
vrrp_add_ipv4(vr, c->address->u.prefix4, true);
+ }
}
if (vr->v6->mvl_ifp) {
@@ -1359,8 +1366,14 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_vrouter *vr)
vr->vrid, vr->v6->mvl_ifp->name);
for (ALL_LIST_ELEMENTS_RO(vr->v6->mvl_ifp->connected, ln, c))
if (c->address->family == AF_INET6
- && !IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6))
+ && !IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6)) {
+ inet_ntop(AF_INET6, &c->address->u.prefix6,
+ ipbuf, sizeof(ipbuf));
+ DEBUGD(&vrrp_dbg_auto,
+ VRRP_LOGPFX VRRP_LOGPFX_VRID "Adding %s",
+ vr->vrid, ipbuf);
vrrp_add_ipv6(vr, c->address->u.prefix6, true);
+ }
}
if (vr->v4->addrs->count == 0
@@ -1394,7 +1407,8 @@ vrrp_autoconfig_autocreate(struct interface *mvl_ifp)
uint8_t vrid = mvl_ifp->hw_addr[5];
- DEBUGD(&vrrp_dbg_auto, VRRP_LOGPFX "Autoconfiguring VRRP on %s",
+ DEBUGD(&vrrp_dbg_auto,
+ VRRP_LOGPFX VRRP_LOGPFX_VRID "Autoconfiguring VRRP on %s", vrid,
p->name);
vr = vrrp_vrouter_create(p, vrid, vrrp_autoconfig_version);