Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / vrrpd / vrrp_arp.c

diff --git a/vrrpd/vrrp_arp.c b/vrrpd/vrrp_arp.c
index 006f31a95bac946c95396b4abcd9844275e92d17..750050e8c33bd414921112101c121045d7711732 100644 (file)
--- a/vrrpd/vrrp_arp.c
+++ b/vrrpd/vrrp_arp.c
@@ -50,7 +50,8 @@
 static int garp_fd = -1;
 
 /* Send the gratuitous ARP message */
-static ssize_t vrrp_send_garp(struct interface *ifp, uint8_t *buf, ssize_t pack_len)
+static ssize_t vrrp_send_garp(struct interface *ifp, uint8_t *buf,
+                             ssize_t pack_len)
 {
        struct sockaddr_ll sll;
        ssize_t len;
@@ -59,7 +60,7 @@ static ssize_t vrrp_send_garp(struct interface *ifp, uint8_t *buf, ssize_t pack_
        memset(&sll, 0, sizeof(sll));
        sll.sll_family = AF_PACKET;
        sll.sll_protocol = ETH_P_ARP;
-       sll.sll_ifindex = (int) ifp->ifindex;
+       sll.sll_ifindex = (int)ifp->ifindex;
        sll.sll_halen = ifp->hw_addr_len;
        memset(sll.sll_addr, 0xFF, ETH_ALEN);
 
@@ -80,14 +81,14 @@ static ssize_t vrrp_build_garp(uint8_t *buf, struct interface *ifp,
                return -1;
 
        /* Build Ethernet header */
-       struct ether_header *eth = (struct ether_header *) buf;
+       struct ether_header *eth = (struct ether_header *)buf;
 
        memset(eth->ether_dhost, 0xFF, ETH_ALEN);
        memcpy(eth->ether_shost, ifp->hw_addr, ETH_ALEN);
        eth->ether_type = htons(ETHERTYPE_ARP);
 
        /* Build ARP payload */
-       struct arphdr *arph = (struct arphdr *) (buf + ETHER_HDR_LEN);
+       struct arphdr *arph = (struct arphdr *)(buf + ETHER_HDR_LEN);
 
        arph->ar_hrd = htons(HWTYPE_ETHER);
        arph->ar_pro = htons(ETHERTYPE_IP);
@@ -122,31 +123,39 @@ void vrrp_garp_send(struct vrrp_router *r, struct in_addr *v4)
        /* If the interface doesn't support ARP, don't try sending */
        if (ifp->flags & IFF_NOARP) {
                zlog_warn(
-                       VRRP_LOGPFX VRRP_LOGPFX_VRID
-                       "Unable to send gratuitous ARP on %s; has IFF_NOARP\n",
-                       r->vr->vrid, ifp->name);
+                       VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM
+                       "Unable to send gratuitous ARP on %s; has IFF_NOARP",
+                       r->vr->vrid, family2str(r->family), ifp->name);
                return;
        }
 
        /* Build garp */
        garpbuf_len = vrrp_build_garp(garpbuf, ifp, v4);
 
+       if (garpbuf_len < 0) {
+               zlog_warn(
+                       VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM
+                       "Unable to send gratuitous ARP on %s; MAC address unknown",
+                       r->vr->vrid, family2str(r->family), ifp->name);
+               return;
+       };
+
        /* Send garp */
        inet_ntop(AF_INET, v4, astr, sizeof(astr));
 
        DEBUGD(&vrrp_dbg_arp,
-              VRRP_LOGPFX VRRP_LOGPFX_VRID
+              VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM
               "Sending gratuitous ARP on %s for %s",
-              r->vr->vrid, ifp->name, astr);
+              r->vr->vrid, family2str(r->family), 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);
 
        if (sent_len < 0)
-               zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID
+               zlog_warn(VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM
                          "Error sending gratuitous ARP on %s for %s",
-                         r->vr->vrid, ifp->name, astr);
+                         r->vr->vrid, family2str(r->family), ifp->name, astr);
        else
                ++r->stats.garp_tx_cnt;
 }
@@ -160,9 +169,9 @@ void vrrp_garp_send_all(struct vrrp_router *r)
        /* If the interface doesn't support ARP, don't try sending */
        if (ifp->flags & IFF_NOARP) {
                zlog_warn(
-                       VRRP_LOGPFX VRRP_LOGPFX_VRID
+                       VRRP_LOGPFX VRRP_LOGPFX_VRID VRRP_LOGPFX_FAM
                        "Unable to send gratuitous ARP on %s; has IFF_NOARP\n",
-                       r->vr->vrid, ifp->name);
+                       r->vr->vrid, family2str(r->family), ifp->name);
                return;
        }
 
@@ -179,7 +188,7 @@ void vrrp_garp_init(void)
        /* Create the socket descriptor */
        /* FIXME: why ETH_P_RARP? */
        errno = 0;
-       frr_elevate_privs(&vrrp_privs) {
+       frr_with_privs(&vrrp_privs) {
                garp_fd = socket(PF_PACKET, SOCK_RAW | SOCK_CLOEXEC,
                                 htons(ETH_P_RARP));
        }