From b51146856e660bcec723f535c17dc1c38b2f6efc Mon Sep 17 00:00:00 2001
From: Vyacheslav Trushkin <me@dogonthesun.net>
Date: Fri, 25 Nov 2011 18:51:48 +0400
Subject: quagga: option "-z" ("--socket <path>") added

All daemons modified to support custom path to zserv
socket.

lib: generalize a zclient connection

zclient_socket_connect added. zclient_socket and
zclient_socket_un were hidden under static expression.
"zclient_serv_path_set" modified.
---
 bgpd/bgp_nexthop.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'bgpd/bgp_nexthop.c')

diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 719cb966..60efa195 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -1098,12 +1098,7 @@ zlookup_connect (struct thread *t)
   if (zlookup->sock != -1)
     return 0;
 
-#ifdef HAVE_TCP_ZEBRA
-  zlookup->sock = zclient_socket ();
-#else
-  zlookup->sock = zclient_socket_un (ZEBRA_SERV_PATH);
-#endif /* HAVE_TCP_ZEBRA */
-  if (zlookup->sock < 0)
+  if (zclient_socket_connect (zlookup) < 0)
     return -1;
 
   return 0;
-- 
cgit v1.2.1