commit ea537be5278398cd8c32f8046e4789e613420916
author Everton Marques <everton.marques@gmail.com> Tue Sep 23 14:30:10 2014 -0300
committer David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:08:00 2015 +0100
tree 79fa838b4f6e1b7ba169f68eccac00b42aa61536
parent bbb8a18bb5570ff59cf71b46793465828af1fcf3

pimd: Remove debuggging for zclient TCP/UNIX sockets.

pimd/pim_zlookup.c

diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index ed47e67..7433f1b 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -51,48 +51,11 @@
     return 0;
   }
 
-#ifdef PIM_ZCLIENT_DEBUG
-
-#ifdef HAVE_TCP_ZEBRA
-  zlog_debug("%s: FIXME blocking connect: zclient_socket()",
-	     __PRETTY_FUNCTION__);
-  zlookup->sock = zclient_socket();
-  if (zlookup->sock < 0) {
-    zlog_warn("%s: failure connecting TCP socket %s,%d",
-	      __PRETTY_FUNCTION__, "127.0.0.1", ZEBRA_PORT);
-  }
-  else if (zclient_debug) {
-    zlog_notice("%s: connected TCP socket %s,%d",
-		__PRETTY_FUNCTION__, "127.0.0.1", ZEBRA_PORT);
-  }
-#else
-  {
-    const char *const path = zclient_serv_path_get();
-    zlog_debug("%s: FIXME blocking connect: zclient_socket_un()",
-	       __PRETTY_FUNCTION__);
-    zlookup->sock = zclient_socket_un(path);
-    if (zlookup->sock < 0) {
-      zlog_warn("%s: failure connecting UNIX socket %s",
-		__PRETTY_FUNCTION__, path);
-    }
-    else if (zclient_debug) { 
-      zlog_notice("%s: connected UNIX socket %s",
-		  __PRETTY_FUNCTION__, path);
-    }
-  }
-#endif /* HAVE_TCP_ZEBRA */
-
-#else
-
-  zlog_debug("%s: FIXME blocking connect: zclient_socket_connect()",
-	     __PRETTY_FUNCTION__);
   if (zclient_socket_connect(zlookup) < 0) {
     zlog_warn("%s: failure connecting zclient socket",
 	      __PRETTY_FUNCTION__);
   }
 
-#endif /* PIM_ZCLIENT_DEBUG */
-
   zassert(!zlookup->t_connect);
   if (zlookup->sock < 0) {
     /* Since last connect failed, retry within 10 secs */