Revert "zebra: clean up client routes when client goes away"
This reverts commit af56d404cd56d94ad3b2ec3f159650eb72baef0a,
which was accidentally duplicating functionality from commit
2ea1ab1 "zebra: ZEBRA_HELLO and mopping up routes (BZ#448)"
Conflicts:
zebra/zebra_rib.c
Signed-off-by: David Lamparter <equinox@diac24.net>
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 2fa439c..154e8d5 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -2920,62 +2920,6 @@
rib_sweep_table (vrf_table (AFI_IP, SAFI_UNICAST, 0));
rib_sweep_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0));
}
-
-/* Delete routes learned from a given client. */
-/* TODO(wsun) May need to split the sweep process into multiple batches,
- * so that the process won't take too long if the table is large. */
-static void
-rib_sweep_client_table (struct route_table *table, int rib_type)
-{
- struct route_node *rn;
- struct rib *rib;
- struct rib *next;
- int ret = 0;
-
- if (table)
- for (rn = route_top (table); rn; rn = route_next (rn))
- for (rib = rn->info; rib; rib = next)
- {
- next = rib->next;
-
- if (CHECK_FLAG (rib->status, RIB_ENTRY_REMOVED))
- continue;
-
- if (rib->type == rib_type)
- if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))
- {
- /* TODO(wsun) Is this mandatory? What about graceful restart/
- * non-stop forwarding */
- ret = rib_uninstall_kernel (rn, rib);
- if (! ret)
- rib_delnode (rn, rib);
- else
- zlog_err ("%s: could not delete routes from kernel!",
- __func__);
- }
- else
- {
- /* Always delete the node. */
- rib_delnode (rn, rib);
- }
- }
-}
-
-/* Sweep all routes learned from a given client from RIB tables. */
-void
-rib_sweep_client_route (struct zserv *client)
-{
- assert(client);
- int route_type = client->route_type;
- if (route_type != ZEBRA_ROUTE_MAX)
- {
- zlog_debug ("%s: Removing existing routes from client type %d",
- __func__, route_type);
- rib_sweep_client_table (vrf_table (AFI_IP, SAFI_UNICAST, 0), route_type);
- rib_sweep_client_table (vrf_table (AFI_IP6, SAFI_UNICAST, 0), route_type);
- }
-}
-
/* Remove specific by protocol routes from 'table'. */
static unsigned long
diff --git a/zebra/zserv.c b/zebra/zserv.c
index b1f539d..0915217 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -741,13 +741,6 @@
/* Type, flags, message. */
rib->type = stream_getc (s);
- /* Update client's route type if it is not done yet. */
- /* It is done here since only zread_ipv4/6_add() and
- * zread_ipv4/6_delete() decode Zebra messages and retrieve
- * route types. */
- if (client->route_type == ZEBRA_ROUTE_MAX)
- client->route_type = rib->type;
-
rib->flags = stream_getc (s);
message = stream_getc (s);
safi = stream_getw (s);
@@ -924,11 +917,6 @@
/* Type, flags, message. */
api.type = stream_getc (s);
- /* Update the route type of the client.
- * Same as in zread_ipv4_add(). */
- if (client->route_type == ZEBRA_ROUTE_MAX)
- client->route_type = api.type;
-
api.flags = stream_getc (s);
api.message = stream_getc (s);
api.safi = stream_getw (s);
@@ -1127,14 +1115,6 @@
static void
zebra_client_close (struct zserv *client)
{
- struct stream *s;
-
- /* Sweep all routes learned from the client first. */
- rib_sweep_client_route(client);
- /* Reset the route type. It may not be necessary since the
- * whole client will be freed. */
- client->route_type = ZEBRA_ROUTE_MAX;
-
/* Close file descriptor. */
if (client->sock)
{
@@ -1174,9 +1154,6 @@
/* Make client input/output buffer. */
client->sock = sock;
- /* Set the default route type to ZEBRA_ROUTE_MAX; it will be updated
- * once new routes are received. */
- client->route_type = ZEBRA_ROUTE_MAX;
client->ibuf = stream_new (ZEBRA_MAX_PACKET_SIZ);
client->obuf = stream_new (ZEBRA_MAX_PACKET_SIZ);
client->wb = buffer_new(0);
diff --git a/zebra/zserv.h b/zebra/zserv.h
index 3d7ebbc..5e8bcca 100644
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -38,10 +38,6 @@
/* Client file descriptor. */
int sock;
- /* Client route type. */
- /* Assuming each client contains only one type of route. */
- int route_type;
-
/* Input/output buffer to the client. */
struct stream *ibuf;
struct stream *obuf;