Merge pull request #5793 from ton31337/fix/formatting_show_bgp_summary_failed

[mirror_frr.git] / zebra / zebra_ptm.c

diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index 8640a4a72026151f5114d95705559961c86f5c12..681b4d1ab8af69c2b7b01b39772b8dd492b83174 100644 (file)
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -190,7 +190,7 @@ static int zebra_ptm_flush_messages(struct thread *thread)
                ptm_cb.t_timer = NULL;
                thread_add_timer(zrouter.master, zebra_ptm_connect, NULL,
                                 ptm_cb.reconnect_time, &ptm_cb.t_timer);
-               return (-1);
+               return -1;
        case BUFFER_PENDING:
                ptm_cb.t_write = NULL;
                thread_add_write(zrouter.master, zebra_ptm_flush_messages, NULL,
@@ -200,7 +200,7 @@ static int zebra_ptm_flush_messages(struct thread *thread)
                break;
        }
 
-       return (0);
+       return 0;
 }
 
 static int zebra_ptm_send_message(char *data, int size)
@@ -661,7 +661,7 @@ int zebra_ptm_sock_read(struct thread *thread)
                thread_add_timer(zrouter.master, zebra_ptm_connect, NULL,
                                 ptm_cb.reconnect_time,
                                 &ptm_cb.t_timer);
-               return (-1);
+               return -1;
        }
 
        ptm_cb.t_read = NULL;
@@ -1295,6 +1295,7 @@ static void zebra_ptm_send_bfdd(struct stream *msg)
        }
 
        stream_free(msgc);
+       stream_free(msg);
 }
 
 static void zebra_ptm_send_clients(struct stream *msg)
@@ -1326,6 +1327,7 @@ static void zebra_ptm_send_clients(struct stream *msg)
        }
 
        stream_free(msgc);
+       stream_free(msg);
 }
 
 static int _zebra_ptm_bfd_client_deregister(struct zserv *zs)
@@ -1400,39 +1402,28 @@ static void _zebra_ptm_reroute(struct zserv *zs, struct zebra_vrf *zvrf,
                               struct stream *msg, uint32_t command)
 {
        struct stream *msgc;
-       size_t zmsglen, zhdrlen;
+       char buf[ZEBRA_MAX_PACKET_SIZ];
        pid_t ppid;
 
-       /*
-        * Don't modify message in the zebra API. In order to do that we
-        * need to allocate a new message stream and copy the message
-        * provided by zebra.
-        */
+       /* Create BFD header */
        msgc = stream_new(ZEBRA_MAX_PACKET_SIZ);
-       if (msgc == NULL) {
-               zlog_debug("%s: not enough memory", __func__);
-               return;
-       }
-
-       /* Calculate our header size plus the message contents. */
-       zhdrlen = ZEBRA_HEADER_SIZE + sizeof(uint32_t);
-       zmsglen = msg->endp - msg->getp;
-       memcpy(msgc->data + zhdrlen, msg->data + msg->getp, zmsglen);
-
-       /*
-        * The message type will be BFD_DEST_REPLY so we can use only
-        * one callback at the `bfdd` side, however the real command
-        * number will be included right after the zebra header.
-        */
        zclient_create_header(msgc, ZEBRA_BFD_DEST_REPLAY, zvrf->vrf->vrf_id);
        stream_putl(msgc, command);
 
-       /* Update the data pointers. */
-       msgc->getp = 0;
-       msgc->endp = zhdrlen + zmsglen;
-       stream_putw_at(msgc, 0, stream_get_endp(msgc));
+       if (STREAM_READABLE(msg) > STREAM_WRITEABLE(msgc)) {
+               zlog_warn("Cannot fit extended BFD header plus original message contents into ZAPI packet; dropping message");
+               goto stream_failure;
+       }
+
+       /* Copy original message, excluding header, into new message */
+       stream_get_from(buf, msg, stream_get_getp(msg), STREAM_READABLE(msg));
+       stream_put(msgc, buf, STREAM_READABLE(msg));
+
+       /* Update length field */
+       stream_putw_at(msgc, 0, STREAM_READABLE(msgc));
 
        zebra_ptm_send_bfdd(msgc);
+       msgc = NULL;
 
        /* Registrate process PID for shutdown hook. */
        STREAM_GETL(msg, ppid);
@@ -1441,6 +1432,8 @@ static void _zebra_ptm_reroute(struct zserv *zs, struct zebra_vrf *zvrf,
        return;
 
 stream_failure:
+       if (msgc)
+               stream_free(msgc);
        zlog_err("%s:%d failed to registrate client pid", __FILE__, __LINE__);
 }