From: Florin Coras <fcoras@cisco.com>
Date: Fri, 4 Jun 2021 23:28:18 +0000 (-0700)
Subject: vcl: avoid multiple reads on peek
X-Git-Tag: v22.02-rc0~339
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=233683180638d1c7f517b713722cbbeb3b4be86e;hp=778b3186fc911af2aabbbfbf56bc1df5e2373061;p=vpp.git

vcl: avoid multiple reads on peek

Only try once and return what was found.

Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I50b1d26babf1b7431d36f6b7472a1fb01475bb35
---

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index e98f9b7c84a..4c77b0bc43b 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -1987,6 +1987,10 @@ read_again:
     rv = app_recv_stream_raw (rx_fifo, buf, n, 0, peek);
 
   ASSERT (rv >= 0);
+
+  if (peek)
+    return rv;
+
   n_read += rv;
 
   if (svm_fifo_is_empty_cons (rx_fifo))