X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fclient%2Fstat_client.h;h=d9671c69ff27deb2f247253f93820ee27e5dfe2a;hb=04853c67e4f06b8b33005b7c2ccaca5a2d015760;hp=c5fa559775852f8e2b9116327980e62b0275ee54;hpb=765008670bec75cab679c4f549c5dac744842887;p=vpp.git

diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h
index c5fa5597758..d9671c69ff2 100644
--- a/src/vpp-api/client/stat_client.h
+++ b/src/vpp-api/client/stat_client.h
@@ -25,7 +25,7 @@
 #include <vlib/counter_types.h>
 #include <time.h>
 #include <stdbool.h>
-#include <vpp/stats/stat_segment_shared.h>
+#include <vlib/stats/shared.h>
 
 /* Default socket to exchange segment fd */
 /* TODO: Get from runtime directory */
@@ -36,6 +36,7 @@ typedef struct
 {
   char *name;
   stat_directory_type_t type;
+  bool via_symlink;
   union
   {
     double scalar_value;
@@ -49,8 +50,8 @@ typedef struct
 typedef struct
 {
   uint64_t current_epoch;
-  stat_segment_shared_header_t *shared_header;
-  stat_segment_directory_entry_t *directory_vector;
+  vlib_stats_shared_header_t *shared_header;
+  vlib_stats_entry_t *directory_vector;
   ssize_t memory_size;
   uint64_t timeout;
 } stat_client_main_t;
@@ -101,8 +102,11 @@ _time_now_nsec (void)
 static inline void *
 stat_segment_adjust (stat_client_main_t * sm, void *data)
 {
-  return (void *) ((char *) sm->shared_header +
-		   ((char *) data - (char *) sm->shared_header->base));
+  char *csh = (char *) sm->shared_header;
+  char *p = csh + ((char *) data - (char *) sm->shared_header->base);
+  if (p > csh && p + sizeof (p) < csh + sm->memory_size)
+    return (void *) p;
+  return 0;
 }
 
 /*
@@ -112,7 +116,7 @@ static inline int
 stat_segment_access_start (stat_segment_access_t * sa,
 			   stat_client_main_t * sm)
 {
-  stat_segment_shared_header_t *shared_header = sm->shared_header;
+  vlib_stats_shared_header_t *shared_header = sm->shared_header;
   uint64_t max_time;
 
   sa->epoch = shared_header->epoch;
@@ -127,10 +131,8 @@ stat_segment_access_start (stat_segment_access_t * sa,
       while (shared_header->in_progress != 0)
 	;
     }
-  sm->directory_vector =
-    (stat_segment_directory_entry_t *) stat_segment_adjust (sm,
-							    (void *)
-							    sm->shared_header->directory_vector);
+  sm->directory_vector = (vlib_stats_entry_t *) stat_segment_adjust (
+    sm, (void *) sm->shared_header->directory_vector);
   if (sm->timeout)
     return _time_now_nsec () < max_time ? 0 : -1;
   return 0;
@@ -161,7 +163,7 @@ stat_segment_set_timeout (uint64_t timeout)
 static inline bool
 stat_segment_access_end (stat_segment_access_t * sa, stat_client_main_t * sm)
 {
-  stat_segment_shared_header_t *shared_header = sm->shared_header;
+  vlib_stats_shared_header_t *shared_header = sm->shared_header;
 
   if (shared_header->epoch != sa->epoch || shared_header->in_progress)
     return false;