commit bad4766763d5ad80b1296c1455666b2589272044
author Paul Vinciguerra <pvinci@vinciconsulting.com> Thu Dec 19 18:26:29 2019 -0500
committer Ole Tr�an <otroan@employees.org> Tue Feb 16 00:12:45 2021 +0000
tree b5a64e0ab1bd7436f6e1cadf73a7a3bc311f0038
parent f9db7f0ff51e3c212f70d38c5e4fa68e07b82a96

vapi: add dedicated return code for client timeout

Type: refactor

Change-Id: I1fbabb743f20e21557c69bdaf97eda6f63584903
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

src/vpp-api/client/client.c

diff --git a/src/vpp-api/client/client.c b/src/vpp-api/client/client.c
index 20adc95..2de880d 100644
--- a/src/vpp-api/client/client.c
+++ b/src/vpp-api/client/client.c
@@ -423,12 +423,14 @@
   vl_shmem_hdr_t *shmem_hdr;
 
   /* svm_queue_sub(below) returns {-1, -2} */
-  if (!pm->connected_to_vlib) return -3;
+  if (!pm->connected_to_vlib)
+    return VAC_NOT_CONNECTED;
 
   *l = 0;
 
   /* svm_queue_sub(below) returns {-1, -2} */
-  if (am->our_pid == 0) return (-4);
+  if (am->our_pid == 0)
+    return (VAC_SHM_NOT_READY);
 
   /* Poke timeout thread */
   if (timeout)
@@ -492,7 +494,7 @@
   vl_msg_api_free((void *) msg);
   /* Client might forget to resume RX thread on failure */
   vac_rx_resume ();
-  return -1;
+  return VAC_TIMEOUT;
 }
 
 /*
@@ -518,7 +520,8 @@
   svm_queue_t *q;
   vac_main_t *pm = &vac_main;
 
-  if (!pm->connected_to_vlib) return -1;
+  if (!pm->connected_to_vlib)
+    return VAC_NOT_CONNECTED;
   if (!mp) return (-1);
 
   memcpy(mp, p, l);