diff options
| author | Vyacheslav Trushkin <me@dogonthesun.net> | 2011-11-25 15:51:48 +0100 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2011-12-13 11:26:28 +0100 |
| commit | b51146856e660bcec723f535c17dc1c38b2f6efc (patch) | |
| tree | 8f501c98b3714e1d5ed381bd4d82fece4106aa8c /bgpd/bgp_nexthop.c | |
| parent | isisd: indent longopts array (diff) | |
| download | frr-b51146856e660bcec723f535c17dc1c38b2f6efc.tar.xz frr-b51146856e660bcec723f535c17dc1c38b2f6efc.zip | |
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.
Diffstat (limited to 'bgpd/bgp_nexthop.c')
| -rw-r--r-- | bgpd/bgp_nexthop.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c index 719cb966c..60efa1953 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; |