proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 14:50:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vrrpd: use debugging knobs

Browse Source 
* Gate all debugging messages with the debugging system
* Simplify a bit of debugging where it was easy to do inline

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-02-12 20:39:55 +00:00
parent 78fb3dbe3f
commit b637bcd445
5 changed files with 183 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
vrrpd/vrrp.c
View File

@ -32,6 +32,7 @@
#include "vrrp.h" #include "vrrp.h"
#include "vrrp_arp.h" #include "vrrp_arp.h"
#include "vrrp_debug.h"
#include "vrrp_memory.h" #include "vrrp_memory.h"
#include "vrrp_ndisc.h" #include "vrrp_ndisc.h"
#include "vrrp_packet.h" #include "vrrp_packet.h"
@ -443,10 +444,8 @@ static void vrrp_send_advertisement(struct vrrp_router *r)
r->priority, r->vr->advertisement_interval, r->priority, r->vr->advertisement_interval,
r->addrs->count, (struct ipaddr **)&addrs); r->addrs->count, (struct ipaddr **)&addrs);
if (pktsz > 0) if (DEBUG_MODE_CHECK(&vrrp_dbg_pkt, DEBUG_MODE_ALL))
zlog_hexdump(pkt, (size_t) pktsz); zlog_hexdump(pkt, (size_t)pktsz);
else
zlog_warn("Could not build VRRP packet");
const char *group = const char *group =
r->family == AF_INET ? VRRP_MCASTV4_GROUP_STR : VRRP_MCASTV6_GROUP_STR; r->family == AF_INET ? VRRP_MCASTV4_GROUP_STR : VRRP_MCASTV6_GROUP_STR;
@ -499,26 +498,27 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
char dumpbuf[BUFSIZ]; char dumpbuf[BUFSIZ];
vrrp_pkt_adver_dump(dumpbuf, sizeof(dumpbuf), pkt); vrrp_pkt_adver_dump(dumpbuf, sizeof(dumpbuf), pkt);
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_proto,
"Received VRRP Advertisement from %s:\n%s", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, sipstr, dumpbuf); "Received VRRP Advertisement from %s:\n%s",
r->vr->vrid, sipstr, dumpbuf);
/* Check that VRID matches our configured VRID */ /* Check that VRID matches our configured VRID */
if (pkt->hdr.vrid != r->vr->vrid) { if (pkt->hdr.vrid != r->vr->vrid) {
zlog_warn( DEBUGD(&vrrp_dbg_proto,
VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX VRRP_LOGPFX_VRID
"%s datagram invalid: Advertisement contains VRID %" PRIu8 "%s datagram invalid: Advertisement contains VRID %" PRIu8
" which does not match our instance", " which does not match our instance",
r->vr->vrid, family2str(r->family), pkt->hdr.vrid); r->vr->vrid, family2str(r->family), pkt->hdr.vrid);
return -1; return -1;
} }
/* Verify that we are not the IPvX address owner */ /* Verify that we are not the IPvX address owner */
if (r->is_owner) { if (r->is_owner) {
zlog_warn( DEBUGD(&vrrp_dbg_proto,
VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX VRRP_LOGPFX_VRID
"%s datagram invalid: Received advertisement but we are the address owner", "%s datagram invalid: Received advertisement but we are the address owner",
r->vr->vrid, family2str(r->family)); r->vr->vrid, family2str(r->family));
return -1; return -1;
} }
@ -526,25 +526,25 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
bool adveq = (pkt->hdr.v2.adver_int bool adveq = (pkt->hdr.v2.adver_int
== MAX(r->vr->advertisement_interval / 100, 1)); == MAX(r->vr->advertisement_interval / 100, 1));
if (r->vr->version == 2 && !adveq) { if (r->vr->version == 2 && !adveq) {
zlog_warn( DEBUGD(&vrrp_dbg_proto,
VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX VRRP_LOGPFX_VRID
"%s datagram invalid: Received advertisement with advertisement interval %" PRIu8 "%s datagram invalid: Received advertisement with advertisement interval %" PRIu8
" unequal to our configured value %u", " unequal to our configured value %u",
r->vr->vrid, family2str(r->family), r->vr->vrid, family2str(r->family),
pkt->hdr.v2.adver_int, pkt->hdr.v2.adver_int,
MAX(r->vr->advertisement_interval / 100, 1)); MAX(r->vr->advertisement_interval / 100, 1));
return -1; return -1;
} }
/* Check that # IPs received matches our # configured IPs */ /* Check that # IPs received matches our # configured IPs */
if (pkt->hdr.naddr != r->addrs->count) { if (pkt->hdr.naddr != r->addrs->count)
zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_proto,
"%s datagram has %" PRIu8 VRRP_LOGPFX VRRP_LOGPFX_VRID
" addresses, but this VRRP instance has %u", "%s datagram has %" PRIu8
r->vr->vrid, family2str(r->family), pkt->hdr.naddr, " addresses, but this VRRP instance has %u",
r->addrs->count); r->vr->vrid, family2str(r->family), pkt->hdr.naddr,
} r->addrs->count);
int addrcmp; int addrcmp;
@ -580,9 +580,10 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
vrrp_change_state(r, VRRP_STATE_BACKUP); vrrp_change_state(r, VRRP_STATE_BACKUP);
} else { } else {
/* Discard advertisement */ /* Discard advertisement */
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_proto,
"Discarding advertisement from %s", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, sipstr); "Discarding advertisement from %s",
r->vr->vrid, sipstr);
} }
break; break;
case VRRP_STATE_BACKUP: case VRRP_STATE_BACKUP:
@ -606,9 +607,10 @@ static int vrrp_recv_advertisement(struct vrrp_router *r, struct ipaddr *src,
} else if (r->vr->preempt_mode == true } else if (r->vr->preempt_mode == true
&& pkt->hdr.priority < r->priority) { && pkt->hdr.priority < r->priority) {
/* Discard advertisement */ /* Discard advertisement */
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_proto,
"Discarding advertisement from %s", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, sipstr); "Discarding advertisement from %s",
r->vr->vrid, sipstr);
} }
break; break;
case VRRP_STATE_INITIALIZE: case VRRP_STATE_INITIALIZE:
@ -658,20 +660,24 @@ static int vrrp_read(struct thread *thread)
goto done; goto done;
} }
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID "Received %s datagram: ", if (DEBUG_MODE_CHECK(&vrrp_dbg_pkt, DEBUG_MODE_ALL)) {
r->vr->vrid, family2str(r->family)); DEBUGD(&vrrp_dbg_pkt,
zlog_hexdump(r->ibuf, nbytes); VRRP_LOGPFX VRRP_LOGPFX_VRID "Received %s datagram: ",
r->vr->vrid, family2str(r->family));
zlog_hexdump(r->ibuf, nbytes);
}
pktsize = vrrp_pkt_parse_datagram(r->family, r->vr->version, &m, nbytes, pktsize = vrrp_pkt_parse_datagram(r->family, r->vr->version, &m, nbytes,
&src, &pkt, errbuf, sizeof(errbuf)); &src, &pkt, errbuf, sizeof(errbuf));
if (pktsize < 0) { if (pktsize < 0) {
zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_pkt,
"%s datagram invalid: %s", VRRP_LOGPFX VRRP_LOGPFX_VRID "%s datagram invalid: %s",
r->vr->vrid, family2str(r->family), errbuf); r->vr->vrid, family2str(r->family), errbuf);
} else { } else {
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID "Packet looks good", DEBUGD(&vrrp_dbg_pkt,
r->vr->vrid); VRRP_LOGPFX VRRP_LOGPFX_VRID "Packet looks good",
r->vr->vrid);
vrrp_recv_advertisement(r, &src, pkt, pktsize); vrrp_recv_advertisement(r, &src, pkt, pktsize);
} }
@ -755,12 +761,12 @@ static int vrrp_bind_to_primary_connected(struct vrrp_router *r)
safe_strerror(errno)); safe_strerror(errno));
return -1; return -1;
} else { } else {
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Bound Tx socket to primary IP address %s", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, "Bound Tx socket to primary IP address %s",
inet_ntop(r->family, r->vr->vrid,
(const void *)&c->address->u.prefix, ipstr, inet_ntop(r->family, (const void *)&c->address->u.prefix,
sizeof(ipstr))); ipstr, sizeof(ipstr)));
} }
return 0; return 0;
@ -843,8 +849,9 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID "Bound Rx socket to %s", DEBUGD(&vrrp_dbg_sock,
r->vr->vrid, r->vr->ifp->name); VRRP_LOGPFX VRRP_LOGPFX_VRID "Bound Rx socket to %s",
r->vr->vrid, r->vr->ifp->name);
/* Bind Rx socket to v4 multicast address */ /* Bind Rx socket to v4 multicast address */
struct sockaddr_in sa = {0}; struct sockaddr_in sa = {0};
@ -859,9 +866,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Bound Rx socket to VRRP %s multicast group", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, family2str(r->family)); "Bound Rx socket to VRRP %s multicast group",
r->vr->vrid, family2str(r->family));
/* Join Rx socket to VRRP IPv4 multicast group */ /* Join Rx socket to VRRP IPv4 multicast group */
struct connected *c = listhead(r->vr->ifp->connected)->data; struct connected *c = listhead(r->vr->ifp->connected)->data;
@ -876,9 +884,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Joined %s VRRP multicast group", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, family2str(r->family)); "Joined %s VRRP multicast group",
r->vr->vrid, family2str(r->family));
/* Set outgoing interface for advertisements */ /* Set outgoing interface for advertisements */
struct ip_mreqn mreqn = {}; struct ip_mreqn mreqn = {};
@ -893,9 +902,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Set %s as outgoing multicast interface", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, r->mvl_ifp->name); "Set %s as outgoing multicast interface",
r->vr->vrid, r->mvl_ifp->name);
} else if (r->family == AF_INET6) { } else if (r->family == AF_INET6) {
/* Always transmit IPv6 packets with hop limit set to 255 */ /* Always transmit IPv6 packets with hop limit set to 255 */
ret = setsockopt_ipv6_multicast_hops(r->sock_tx, 255); ret = setsockopt_ipv6_multicast_hops(r->sock_tx, 255);
@ -935,8 +945,9 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID "Bound Rx socket to %s", DEBUGD(&vrrp_dbg_sock,
r->vr->vrid, r->vr->ifp->name); VRRP_LOGPFX VRRP_LOGPFX_VRID "Bound Rx socket to %s",
r->vr->vrid, r->vr->ifp->name);
/* Bind Rx socket to v6 multicast address */ /* Bind Rx socket to v6 multicast address */
struct sockaddr_in6 sa = {0}; struct sockaddr_in6 sa = {0};
@ -951,9 +962,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Bound Rx socket to VRRP %s multicast group", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, family2str(r->family)); "Bound Rx socket to VRRP %s multicast group",
r->vr->vrid, family2str(r->family));
/* Join VRRP IPv6 multicast group */ /* Join VRRP IPv6 multicast group */
struct ipv6_mreq mreq; struct ipv6_mreq mreq;
@ -969,9 +981,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Joined %s VRRP multicast group", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, family2str(r->family)); "Joined %s VRRP multicast group",
r->vr->vrid, family2str(r->family));
/* Set outgoing interface for advertisements */ /* Set outgoing interface for advertisements */
ret = setsockopt(r->sock_tx, IPPROTO_IPV6, IPV6_MULTICAST_IF, ret = setsockopt(r->sock_tx, IPPROTO_IPV6, IPV6_MULTICAST_IF,
@ -984,9 +997,10 @@ static int vrrp_socket(struct vrrp_router *r)
failed = true; failed = true;
goto done; goto done;
} }
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_sock,
"Set %s as outgoing multicast interface", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, r->mvl_ifp->name); "Set %s as outgoing multicast interface",
r->vr->vrid, r->mvl_ifp->name);
} }
/* Bind Tx socket to link-local address */ /* Bind Tx socket to link-local address */
@ -1106,8 +1120,8 @@ static int vrrp_adver_timer_expire(struct thread *thread)
{ {
struct vrrp_router *r = thread->arg; struct vrrp_router *r = thread->arg;
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID "Adver_Timer expired", DEBUGD(&vrrp_dbg_proto,
r->vr->vrid); VRRP_LOGPFX VRRP_LOGPFX_VRID "Adver_Timer expired", r->vr->vrid);
if (r->fsm.state == VRRP_STATE_MASTER) { if (r->fsm.state == VRRP_STATE_MASTER) {
/* Send an ADVERTISEMENT */ /* Send an ADVERTISEMENT */
@ -1118,9 +1132,9 @@ static int vrrp_adver_timer_expire(struct thread *thread)
r->vr->advertisement_interval * 10, r->vr->advertisement_interval * 10,
&r->t_adver_timer); &r->t_adver_timer);
} else { } else {
zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID zlog_err(VRRP_LOGPFX VRRP_LOGPFX_VRID
"Adver_Timer expired in state '%s'; this is a bug", "Adver_Timer expired in state '%s'; this is a bug",
r->vr->vrid, vrrp_state_names[r->fsm.state]); r->vr->vrid, vrrp_state_names[r->fsm.state]);
} }
return 0; return 0;
@ -1261,10 +1275,11 @@ static int vrrp_shutdown(struct vrrp_router *r)
THREAD_OFF(r->t_master_down_timer); THREAD_OFF(r->t_master_down_timer);
break; break;
case VRRP_STATE_INITIALIZE: case VRRP_STATE_INITIALIZE:
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_proto,
"Received '%s' event in '%s' state; ignoring", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, vrrp_event_names[VRRP_EVENT_SHUTDOWN], "Received '%s' event in '%s' state; ignoring",
vrrp_state_names[VRRP_STATE_INITIALIZE]); r->vr->vrid, vrrp_event_names[VRRP_EVENT_SHUTDOWN],
vrrp_state_names[VRRP_STATE_INITIALIZE]);
break; break;
} }
@ -1319,23 +1334,43 @@ static void vrrp_autoconfig_autoaddrupdate(struct vrrp_vrouter *vr)
struct listnode *ln; struct listnode *ln;
struct connected *c = NULL; struct connected *c = NULL;
if (vr->v4->mvl_ifp) if (vr->v4->mvl_ifp) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"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)) for (ALL_LIST_ELEMENTS_RO(vr->v4->mvl_ifp->connected, ln, c))
if (c->address->family == AF_INET) if (c->address->family == AF_INET)
vrrp_add_ipv4(vr, c->address->u.prefix4, true); vrrp_add_ipv4(vr, c->address->u.prefix4, true);
}
if (vr->v6->mvl_ifp) if (vr->v6->mvl_ifp) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"Setting IPv6 Virtual IP list to match IPv6 addresses on %s",
vr->vrid, vr->v6->mvl_ifp->name);
for (ALL_LIST_ELEMENTS_RO(vr->v6->mvl_ifp->connected, ln, c)) for (ALL_LIST_ELEMENTS_RO(vr->v6->mvl_ifp->connected, ln, c))
if (c->address->family == AF_INET6 if (c->address->family == AF_INET6
&& !IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6)) && !IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6))
vrrp_add_ipv6(vr, c->address->u.prefix6, true); vrrp_add_ipv6(vr, c->address->u.prefix6, true);
}
if (vr->v4->addrs->count == 0 if (vr->v4->addrs->count == 0
&& vr->v4->fsm.state != VRRP_STATE_INITIALIZE) && vr->v4->fsm.state != VRRP_STATE_INITIALIZE) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"IPv4 Virtual IP list is empty; shutting down",
vr->vrid);
vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN); vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN);
}
if (vr->v6->addrs->count == 0 if (vr->v6->addrs->count == 0
&& vr->v6->fsm.state != VRRP_STATE_INITIALIZE) && vr->v6->fsm.state != VRRP_STATE_INITIALIZE) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"IPv6 Virtual IP list is empty; shutting down",
vr->vrid);
vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN); vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN);
}
} }
static struct vrrp_vrouter * static struct vrrp_vrouter *
@ -1351,7 +1386,8 @@ vrrp_autoconfig_autocreate(struct interface *mvl_ifp)
uint8_t vrid = mvl_ifp->hw_addr[5]; uint8_t vrid = mvl_ifp->hw_addr[5];
zlog_info(VRRP_LOGPFX "Autoconfiguring VRRP on %s", p->name); DEBUGD(&vrrp_dbg_auto, VRRP_LOGPFX "Autoconfiguring VRRP on %s",
p->name);
vr = vrrp_vrouter_create(p, vrid, vrrp_autoconfig_version); vr = vrrp_vrouter_create(p, vrid, vrrp_autoconfig_version);
@ -1438,17 +1474,31 @@ int vrrp_autoconfig_if_del(struct interface *ifp)
return 0; return 0;
if (vr && vr->v4->mvl_ifp == ifp) { if (vr && vr->v4->mvl_ifp == ifp) {
if (vr->v4->fsm.state != VRRP_STATE_INITIALIZE) if (vr->v4->fsm.state != VRRP_STATE_INITIALIZE) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"Interface %s deleted; shutting down IPv4 VRRP router",
vr->vrid, ifp->name);
vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN); vrrp_event(vr->v4, VRRP_EVENT_SHUTDOWN);
}
vr->v4->mvl_ifp = NULL; vr->v4->mvl_ifp = NULL;
} }
if (vr && vr->v6->mvl_ifp == ifp) { if (vr && vr->v6->mvl_ifp == ifp) {
if (vr->v6->fsm.state != VRRP_STATE_INITIALIZE) if (vr->v6->fsm.state != VRRP_STATE_INITIALIZE) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"Interface %s deleted; shutting down IPv6 VRRP router",
vr->vrid, ifp->name);
vrrp_event(vr->v6, VRRP_EVENT_SHUTDOWN); vrrp_event(vr->v6, VRRP_EVENT_SHUTDOWN);
}
vr->v6->mvl_ifp = NULL; vr->v6->mvl_ifp = NULL;
} }
if (vr->v4->mvl_ifp == NULL && vr->v6->mvl_ifp == NULL) { if (vr->v4->mvl_ifp == NULL && vr->v6->mvl_ifp == NULL) {
DEBUGD(&vrrp_dbg_auto,
VRRP_LOGPFX VRRP_LOGPFX_VRID
"All VRRP interfaces for instance deleted; destroying autoconfigured VRRP router",
vr->vrid);
vrrp_vrouter_destroy(vr); vrrp_vrouter_destroy(vr);
vr = NULL; vr = NULL;
} }

27
vrrpd/vrrp_arp.c
View File

@ -33,6 +33,7 @@
#include "vrrp.h" #include "vrrp.h"
#include "vrrp_arp.h" #include "vrrp_arp.h"
#include "vrrp_debug.h"
#define VRRP_LOGPFX "[ARP] " #define VRRP_LOGPFX "[ARP] "
@ -132,9 +133,14 @@ void vrrp_garp_send(struct vrrp_router *r, struct in_addr *v4)
/* Send garp */ /* Send garp */
inet_ntop(AF_INET, v4, astr, sizeof(astr)); inet_ntop(AF_INET, v4, astr, sizeof(astr));
zlog_info(VRRP_LOGPFX VRRP_LOGPFX_VRID
"Sending gratuitous ARP on %s for %s", DEBUGD(&vrrp_dbg_arp,
r->vr->vrid, ifp->name, astr); VRRP_LOGPFX VRRP_LOGPFX_VRID
"Sending gratuitous ARP on %s for %s",
r->vr->vrid, ifp->name, astr);
if (DEBUG_MODE_CHECK(&vrrp_dbg_arp, DEBUG_MODE_ALL))
zlog_hexdump(garpbuf, garpbuf_len);
sent_len = vrrp_send_garp(ifp, garpbuf, garpbuf_len); sent_len = vrrp_send_garp(ifp, garpbuf, garpbuf_len);
if (sent_len < 0) if (sent_len < 0)
@ -176,12 +182,14 @@ void vrrp_garp_init(void)
htons(ETH_P_RARP)); htons(ETH_P_RARP));
} }
if (garp_fd > 0) if (garp_fd > 0) {
zlog_info(VRRP_LOGPFX "Initialized gratuitous ARP socket"); DEBUGD(&vrrp_dbg_sock,
else { VRRP_LOGPFX "Initialized gratuitous ARP socket");
DEBUGD(&vrrp_dbg_arp,
VRRP_LOGPFX "Initialized gratuitous ARP subsystem");
} else {
zlog_err(VRRP_LOGPFX zlog_err(VRRP_LOGPFX
"Error initializing gratuitous ARP socket"); "Error initializing gratuitous ARP subsystem");
return;
} }
} }
@ -189,6 +197,9 @@ void vrrp_garp_fini(void)
{ {
close(garp_fd); close(garp_fd);
garp_fd = -1; garp_fd = -1;
DEBUGD(&vrrp_dbg_arp,
VRRP_LOGPFX "Deinitialized gratuitous ARP subsystem");
} }
bool vrrp_garp_is_init(void) bool vrrp_garp_is_init(void)

32
vrrpd/vrrp_ndisc.c
View File

@ -32,6 +32,7 @@
#include "lib/ipaddr.h" #include "lib/ipaddr.h"
#include "lib/log.h" #include "lib/log.h"
#include "vrrp_debug.h"
#include "vrrp_ndisc.h" #include "vrrp_ndisc.h"
#define VRRP_LOGPFX "[NDISC] " #define VRRP_LOGPFX "[NDISC] "
@ -168,9 +169,14 @@ int vrrp_ndisc_una_send(struct vrrp_router *r, struct ipaddr *ip)
char ipbuf[INET6_ADDRSTRLEN]; char ipbuf[INET6_ADDRSTRLEN];
ipaddr2str(ip, ipbuf, sizeof(ipbuf)); ipaddr2str(ip, ipbuf, sizeof(ipbuf));
zlog_debug(VRRP_LOGPFX VRRP_LOGPFX_VRID DEBUGD(&vrrp_dbg_ndisc,
"Sending unsolicited Neighbor Advertisement on %s for %s", VRRP_LOGPFX VRRP_LOGPFX_VRID
r->vr->vrid, ifp->name, ipbuf); "Sending unsolicited Neighbor Advertisement on %s for %s",
r->vr->vrid, ifp->name, ipbuf);
if (DEBUG_MODE_CHECK(&vrrp_dbg_ndisc, DEBUG_MODE_ALL)
&& DEBUG_MODE_CHECK(&vrrp_dbg_pkt, DEBUG_MODE_ALL))
zlog_hexdump(buf, VRRP_NDISC_SIZE);
len = sendto(ndisc_fd, buf, VRRP_NDISC_SIZE, 0, (struct sockaddr *)&sll, len = sendto(ndisc_fd, buf, VRRP_NDISC_SIZE, 0, (struct sockaddr *)&sll,
sizeof(sll)); sizeof(sll));
@ -207,20 +213,24 @@ void vrrp_ndisc_init(void)
} }
vrrp_privs.change(ZPRIVS_LOWER); vrrp_privs.change(ZPRIVS_LOWER);
if (ndisc_fd > 0) if (ndisc_fd > 0) {
zlog_info( DEBUGD(&vrrp_dbg_sock,
VRRP_LOGPFX VRRP_LOGPFX "Initialized Neighbor Discovery socket");
"Initialized unsolicited neighbor advertisement socket"); DEBUGD(&vrrp_dbg_ndisc,
else VRRP_LOGPFX "Initialized Neighbor Discovery subsystem");
zlog_err( } else {
VRRP_LOGPFX zlog_err(VRRP_LOGPFX
"Error initializing unsolicited neighbor advertisement socket"); "Error initializing Neighbor Discovery socket");
}
} }
void vrrp_ndisc_fini(void) void vrrp_ndisc_fini(void)
{ {
close(ndisc_fd); close(ndisc_fd);
ndisc_fd = -1; ndisc_fd = -1;
DEBUGD(&vrrp_dbg_ndisc,
VRRP_LOGPFX "Deinitialized Neighbor Discovery subsystem");
} }
bool vrrp_ndisc_is_init(void) bool vrrp_ndisc_is_init(void)

1
vrrpd/vrrp_packet.c
View File

@ -27,6 +27,7 @@
#include "lib/memory.h" #include "lib/memory.h"
#include "vrrp.h" #include "vrrp.h"
#include "vrrp_debug.h"
#include "vrrp_memory.h" #include "vrrp_memory.h"
#include "vrrp_packet.h" #include "vrrp_packet.h"

4
vrrpd/vrrp_vty.c
View File

@ -53,6 +53,8 @@
} \ } \
} while (0); } while (0);
/* clang-format off */
DEFPY(vrrp_vrid, DEFPY(vrrp_vrid,
vrrp_vrid_cmd, vrrp_vrid_cmd,
"[no] vrrp (1-255)$vrid [version (2-3)]", "[no] vrrp (1-255)$vrid [version (2-3)]",
@ -412,6 +414,8 @@ DEFUN_NOSH (show_debugging_vrrp,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* clang-format on */
static struct cmd_node interface_node = { static struct cmd_node interface_node = {
INTERFACE_NODE, INTERFACE_NODE,
"%s(config-if)# ", 1 "%s(config-if)# ", 1