commit bb7feff0af6c8519df45a4f40f06cdd819fe70d0
author David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:40:25 2015 +0100
committer David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:48:06 2015 +0100
tree f0d3d4cc743f0eccf8c2a8e7b738d108324952d4
parent 5d5af78a1b9310c0c2290f81ee8abc12d5376500

Revert "pimd: clear zclient-update: Reset zclient update connection to zebra daemon"

This reverts commit 3456a80f5f8e6e44c30453bd92eabf5faf7ab25b.

Conflicts:
	pimd/pim_zebra.c

This depends on the zebra reconnect changes, which we're not picking up
at this point.  This revert is partial, only bumping out the
reconnect-related changes.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

pimd/COMMANDS

diff --git a/pimd/COMMANDS b/pimd/COMMANDS
index 2dedea0..425ac82 100644
--- a/pimd/COMMANDS
+++ b/pimd/COMMANDS
@@ -60,7 +60,6 @@
        clear ip mroute                  Reset multicast routes
        clear ip pim interfaces		Reset PIM interfaces
        clear ip pim oil			Rescan PIM OIL (output interface list)
-       clear zclient-update		Reset zclient update connection to zebra daemon
        debug igmp			IGMP protocol activity
        debug mroute			PIM interaction with kernel MFC cache
        debug pim			PIM protocol activity

pimd/pim_cmd.c

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 6176fe5..6b2ac66 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1563,17 +1563,6 @@
   return CMD_SUCCESS;
 }
 
-DEFUN (clear_zclient_update,
-       clear_zclient_update_cmd,
-       "clear zclient-update",
-       CLEAR_STR
-       "Reset zclient update connection to zebra daemon\n")
-{
-  zclient_reset(qpim_zclient_update);
-
-  return CMD_SUCCESS;
-}
-
 DEFUN (clear_ip_interfaces,
        clear_ip_interfaces_cmd,
        "clear ip interfaces",
@@ -4391,7 +4380,6 @@
   install_element (ENABLE_NODE, &clear_ip_mroute_cmd);
   install_element (ENABLE_NODE, &clear_ip_pim_interfaces_cmd);
   install_element (ENABLE_NODE, &clear_ip_pim_oil_cmd);
-  install_element (ENABLE_NODE, &clear_zclient_update_cmd);
 
   install_element (ENABLE_NODE, &show_ip_igmp_interface_cmd);
   install_element (ENABLE_NODE, &show_ip_igmp_join_cmd);

pimd/pim_zebra.c

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 43c80c8..6f241d5 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -664,7 +664,6 @@
   /* Socket for receiving updates from Zebra daemon */
   qpim_zclient_update = zclient_new();
 
-  qpim_zclient_update->zclient_broken           = zclient_broken;
   qpim_zclient_update->router_id_update         = pim_router_id_update_zebra;
   qpim_zclient_update->interface_add            = pim_zebra_if_add;
   qpim_zclient_update->interface_delete         = pim_zebra_if_del;