2 files changed, 34 insertions, 5 deletions

diff --git a/src/plugins/hs_apps/vcl/vcl_test.h b/src/plugins/hs_apps/vcl/vcl_test.h
index 0ce27ef84e2..2b45339099e 100644
--- a/src/plugins/hs_apps/vcl/vcl_test.h
+++ b/src/plugins/hs_apps/vcl/vcl_test.h
@@ -420,6 +420,39 @@ vcl_test_write (vcl_test_session_t *ts, void *buf, uint32_t nbytes)
   return (tx_bytes);
 }
 
+static inline int
+vcl_test_write_ds (vcl_test_session_t *ts)
+{
+  vcl_test_stats_t *stats = &ts->stats;
+  int tx_bytes;
+
+  do
+    {
+      stats->tx_xacts++;
+      if (ts->ds[1].len)
+	tx_bytes = vppcom_session_write_segments (ts->fd, ts->ds, 2);
+      else
+	tx_bytes = vppcom_session_write_segments (ts->fd, ts->ds, 1);
+
+      if (tx_bytes < 0)
+	errno = -tx_bytes;
+      if ((tx_bytes == 0) ||
+	  ((tx_bytes < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))))
+	stats->rx_eagain++;
+    }
+  while ((tx_bytes == 0) ||
+	 ((tx_bytes < 0) && ((errno == EAGAIN) || (errno == EWOULDBLOCK))));
+
+  if (tx_bytes < 0)
+    {
+      vterr ("vppcom_session_write_segments()", -errno);
+    }
+  else
+    stats->tx_bytes += tx_bytes;
+
+  return (tx_bytes);
+}
+
 static inline void
 dump_help (void)
 {
diff --git a/src/plugins/hs_apps/vcl/vcl_test_server.c b/src/plugins/hs_apps/vcl/vcl_test_server.c
index d17a2089ba7..5de53173784 100644
--- a/src/plugins/hs_apps/vcl/vcl_test_server.c
+++ b/src/plugins/hs_apps/vcl/vcl_test_server.c
@@ -282,11 +282,7 @@ vts_server_process_rx (vcl_test_session_t *conn, int rx_bytes)
   if (conn->cfg.test == HS_TEST_TYPE_BI)
     {
       if (vsm->use_ds)
-	{
-	  (void) vcl_test_write (conn, conn->ds[0].data, conn->ds[0].len);
-	  if (conn->ds[1].len)
-	    (void) vcl_test_write (conn, conn->ds[1].data, conn->ds[1].len);
-	}
+	(void) vcl_test_write_ds (conn);
       else
 	(void) vcl_test_write (conn, conn->rxbuf, rx_bytes);
     }