diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2015-02-04 06:33:26 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2015-02-04 06:33:26 +0100 |
| commit | a2805de2b25383695f38a3ebbefe75e26a5e9aba (patch) | |
| tree | 500c1331137ed45c38776baa5132910f50e8405d | |
| parent | b3c6afe9fdc8c65d71abde3a2f26525b87189297 (diff) | |
| download | quagga-a2805de2b25383695f38a3ebbefe75e26a5e9aba.tar.bz2 quagga-a2805de2b25383695f38a3ebbefe75e26a5e9aba.tar.xz | |
Revert "pimd: Explicitly restart zclient update connection."
This reverts commit 8150beed9a4f50a72696a65c1f40889ab65ad7ff.
This depends on the zebra reconnect changes, which we're not picking up
at this point.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
| -rw-r--r-- | pimd/pim_zebra.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 63d029b2..8d015737 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -66,8 +66,6 @@ static void zclient_broken(struct zclient *zclient) /* discard connected addresses because zclient lib will reassign them upon reconnection */ if_connected_reset_all(); - - zclient_init(qpim_zclient_update, ZEBRA_ROUTE_PIM); /* reconnect */ } /* Router-id update message from zebra. */ @@ -679,12 +677,11 @@ void pim_zebra_init(char *zebra_sock_path) qpim_zclient_update->ipv4_route_add = redist_read_ipv4_route; qpim_zclient_update->ipv4_route_delete = redist_read_ipv4_route; + zclient_init(qpim_zclient_update, ZEBRA_ROUTE_PIM); if (PIM_DEBUG_PIM_TRACE) { zlog_info("zclient_init cleared redistribution request"); } - zclient_init(qpim_zclient_update, ZEBRA_ROUTE_PIM); - zassert(qpim_zclient_update->redist_default == ZEBRA_ROUTE_PIM); /* Request all redistribution */ |