zebra: reduce memory usage by streams when redistributing routes

This commit undo 8c9b007a0c7efb2e9afc2eac936ba9dd971c6707
stream lib has been modified to expand the stream if needed
Now for zapi route encode, we use expandable stream

Signed-off-by: Soumya Roy <souroy@nvidia.com>

diff --git a/lib/zclient.c b/lib/zclient.c
index f0476867be64c0b8941b61f02b92d6281645b5fb..532771cb934df0b025b5752633a2d49da9be1580 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1326,24 +1326,6 @@ enum zclient_send_status zclient_nhg_send(struct zclient *zclient, int cmd,
        return zclient_send_message(zclient);
 }
 
-/* size needed by a stream for redistributing a route */
-int zapi_redistribute_stream_size(struct zapi_route *api)
-{
-       size_t msg_size = 0;
-       size_t nh_size = sizeof(struct zapi_nexthop);
-
-       msg_size = sizeof(struct zapi_route);
-       /* remove unused nexthop structures */
-       msg_size -= (MULTIPATH_NUM - api->nexthop_num) * nh_size;
-       /* remove unused backup nexthop structures */
-       msg_size -= (MULTIPATH_NUM - api->backup_nexthop_num) * nh_size;
-       /* remove unused opaque values */
-       msg_size -= ZAPI_MESSAGE_OPAQUE_LENGTH - api->opaque.length;
-
-       return msg_size;
-}
-
-
 int zapi_route_encode(uint8_t cmd, struct stream *s, struct zapi_route *api)
 {
        struct zapi_nexthop *api_nh;

diff --git a/lib/zclient.h b/lib/zclient.h
index 43521d6e2e3ee46eea5d8b08e0c47d0c6e5b6ecc..afd84acce27dcdb113d4fae2f6a7f2bbacda320c 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -1158,7 +1158,6 @@ zclient_send_rnh(struct zclient *zclient, int command, const struct prefix *p,
                 vrf_id_t vrf_id);
 int zapi_nexthop_encode(struct stream *s, const struct zapi_nexthop *api_nh,
                        uint32_t api_flags, uint32_t api_message);
-extern int zapi_redistribute_stream_size(struct zapi_route *api);
 extern int zapi_route_encode(uint8_t, struct stream *, struct zapi_route *);
 extern int zapi_route_decode(struct stream *s, struct zapi_route *api);
 extern int zapi_nexthop_decode(struct stream *s, struct zapi_nexthop *api_nh,

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index 066859d380da30f6839d8140abe7da932338f60f..9c8ef19a9db89be861430a352015c91f3b335714 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -518,7 +518,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n
        const struct prefix *p, *src_p;
        uint16_t count = 0;
        afi_t afi;
-       size_t stream_size = 0;
 
        srcdest_rnode_prefixes(rn, &p, &src_p);
        memset(&api, 0, sizeof(api));
@@ -610,8 +609,7 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n
        SET_FLAG(api.message, ZAPI_MESSAGE_MTU);
        api.mtu = re->mtu;
 
-       stream_size = zapi_redistribute_stream_size(&api);
-       struct stream *s = stream_new(stream_size);
+       struct stream *s = stream_new_expandable(ZEBRA_MAX_PACKET_SIZ);
 
        /* Encode route and send. */
        if (zapi_route_encode(cmd, s, &api) < 0) {