diff options
author | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-03-07 19:46:02 +0100 |
---|---|---|
committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2019-05-17 02:27:08 +0200 |
commit | 613b45b008bd473704b341ce4d8247ddceeba494 (patch) | |
tree | 2cd53b18fffbd25cb8bb8a2e45e91dfcf15cc25a /vrrpd/vrrp_ndisc.c | |
parent | Revert "vrrpd: use parent interface LLA for advert tx" (diff) | |
download | frr-613b45b008bd473704b341ce4d8247ddceeba494.tar.xz frr-613b45b008bd473704b341ce4d8247ddceeba494.zip |
vrrpd: clean up logging
* Always include address family when available
* Log advertisement decodes on one line
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'vrrpd/vrrp_ndisc.c')
-rw-r--r-- | vrrpd/vrrp_ndisc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vrrpd/vrrp_ndisc.c b/vrrpd/vrrp_ndisc.c index 0f59b2300..a9b15a1d1 100644 --- a/vrrpd/vrrp_ndisc.c +++ b/vrrpd/vrrp_ndisc.c @@ -170,9 +170,9 @@ int vrrp_ndisc_una_send(struct vrrp_router *r, struct ipaddr *ip) ipaddr2str(ip, ipbuf, sizeof(ipbuf)); DEBUGD(&vrrp_dbg_ndisc, - VRRP_LOGPFX VRRP_LOGPFX_VRID + VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM "Sending unsolicited Neighbor Advertisement on %s for %s", - r->vr->vrid, ifp->name, ipbuf); + r->vr->vrid, family2str(r->family), ifp->name, ipbuf); if (DEBUG_MODE_CHECK(&vrrp_dbg_ndisc, DEBUG_MODE_ALL) && DEBUG_MODE_CHECK(&vrrp_dbg_pkt, DEBUG_MODE_ALL)) @@ -183,9 +183,9 @@ int vrrp_ndisc_una_send(struct vrrp_router *r, struct ipaddr *ip) if (len < 0) { zlog_err( - VRRP_LOGPFX VRRP_LOGPFX_VRID + VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM "Error sending unsolicited Neighbor Advertisement on %s for %s", - r->vr->vrid, ifp->name, ipbuf); + r->vr->vrid, family2str(r->family), ifp->name, ipbuf); ret = -1; } else { ++r->stats.una_tx_cnt; |