From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Aug 2016 12:20:38 +0000 (-0400)
Subject: pimd: Fix double close of socket.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~268
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6abb1fc25fc21382c511b93d0736d1e9425940db;p=mirror%2Ffrr.git

pimd: Fix double close of socket.

When a interface bounces fix the double close from happening

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index f58e326d16..4924acea74 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -90,7 +90,10 @@ static void sock_close(struct interface *ifp)
 	       pim_ifp->pim_sock_fd, ifp->name);
   }
 
-  if (close(pim_ifp->pim_sock_fd)) {
+  /*
+   * If the fd is already deleted no need to do anything here
+   */
+  if (pim_ifp->pim_sock_fd > 0 && close(pim_ifp->pim_sock_fd)) {
     zlog_warn("Failure closing PIM socket fd=%d on interface %s: errno=%d: %s",
 	      pim_ifp->pim_sock_fd, ifp->name,
 	      errno, safe_strerror(errno));
@@ -98,11 +101,6 @@ static void sock_close(struct interface *ifp)
   
   pim_ifp->pim_sock_fd = -1;
   pim_ifp->pim_sock_creation = 0;
-
-  zassert(pim_ifp->pim_sock_fd < 0);
-  zassert(!pim_ifp->t_pim_sock_read);
-  zassert(!pim_ifp->t_pim_hello_timer);
-  zassert(!pim_ifp->pim_sock_creation);
 }
 
 void pim_sock_delete(struct interface *ifp, const char *delete_message)