Merge pull request #9471 from pguibert6WIND/table_manager_alloc2

[mirror_frr.git] / zebra / zapi_msg.c

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 496849251a4a394aa1e4d7a5c7593bf6882eab4f..ecfc7da8837cda6ef2ce31375b3ccaffb1c7b3e5 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -2853,7 +2853,7 @@ static void zread_label_manager_request(ZAPI_HANDLER_ARGS)
 }
 
 static void zread_get_table_chunk(struct zserv *client, struct stream *msg,
-                                 vrf_id_t vrf_id)
+                                 struct zebra_vrf *zvrf)
 {
        struct stream *s;
        uint32_t size;
@@ -2865,7 +2865,7 @@ static void zread_get_table_chunk(struct zserv *client, struct stream *msg,
        /* Get data. */
        STREAM_GETL(s, size);
 
-       tmc = assign_table_chunk(client->proto, client->instance, size);
+       tmc = assign_table_chunk(client->proto, client->instance, size, zvrf);
        if (!tmc)
                flog_err(EC_ZEBRA_TM_CANNOT_ASSIGN_CHUNK,
                         "%s: Unable to assign Table Chunk of size %u",
@@ -2874,13 +2874,14 @@ static void zread_get_table_chunk(struct zserv *client, struct stream *msg,
                zlog_debug("Assigned Table Chunk %u - %u", tmc->start,
                           tmc->end);
        /* send response back */
-       zsend_assign_table_chunk_response(client, vrf_id, tmc);
+       zsend_assign_table_chunk_response(client, zvrf_id(zvrf), tmc);
 
 stream_failure:
        return;
 }
 
-static void zread_release_table_chunk(struct zserv *client, struct stream *msg)
+static void zread_release_table_chunk(struct zserv *client, struct stream *msg,
+                                     struct zebra_vrf *zvrf)
 {
        struct stream *s;
        uint32_t start, end;
@@ -2892,7 +2893,7 @@ static void zread_release_table_chunk(struct zserv *client, struct stream *msg)
        STREAM_GETL(s, start);
        STREAM_GETL(s, end);
 
-       release_table_chunk(client->proto, client->instance, start, end);
+       release_table_chunk(client->proto, client->instance, start, end, zvrf);
 
 stream_failure:
        return;
@@ -2912,9 +2913,9 @@ static void zread_table_manager_request(ZAPI_HANDLER_ARGS)
                        return;
                }
                if (hdr->command == ZEBRA_GET_TABLE_CHUNK)
-                       zread_get_table_chunk(client, msg, zvrf_id(zvrf));
+                       zread_get_table_chunk(client, msg, zvrf);
                else if (hdr->command == ZEBRA_RELEASE_TABLE_CHUNK)
-                       zread_release_table_chunk(client, msg);
+                       zread_release_table_chunk(client, msg, zvrf);
        }
 }