Fix compilation for VPP 19.01

[govpp.git] / adapter / vppapiclient / stat_client.go

diff --git a/adapter/vppapiclient/stat_client.go b/adapter/vppapiclient/stat_client.go
index ac47339..2615b65 100644 (file)
--- a/adapter/vppapiclient/stat_client.go
+++ b/adapter/vppapiclient/stat_client.go
@@ -20,146 +20,10 @@ package vppapiclient
 #cgo CFLAGS: -DPNG_DEBUG=1
 #cgo LDFLAGS: -lvppapiclient
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <arpa/inet.h>
-#include <vpp-api/client/vppapiclient.h> // VPP has to be installed!
-#include <vpp-api/client/stat_client.h>
-
-static int
-govpp_stat_connect(char *socket_name)
-{
-       return stat_segment_connect(socket_name);
-}
-
-static void
-govpp_stat_disconnect()
-{
-    stat_segment_disconnect();
-}
-
-static uint32_t*
-govpp_stat_segment_ls(uint8_t **pattern)
-{
-       return stat_segment_ls(pattern);
-}
-
-static int
-govpp_stat_segment_vec_len(void *vec)
-{
-       return stat_segment_vec_len(vec);
-}
-
-static void
-govpp_stat_segment_vec_free(void *vec)
-{
-       stat_segment_vec_free(vec);
-}
-
-static char*
-govpp_stat_segment_dir_index_to_name(uint32_t *dir, uint32_t index)
-{
-       return stat_segment_index_to_name(dir[index]);
-}
-
-static stat_segment_data_t*
-govpp_stat_segment_dump(uint32_t *counter_vec)
-{
-       return stat_segment_dump(counter_vec);
-}
-
-static stat_segment_data_t
-govpp_stat_segment_dump_index(stat_segment_data_t *data, int index)
-{
-       return data[index];
-}
-
-static int
-govpp_stat_segment_data_type(stat_segment_data_t *data)
-{
-       return data->type;
-}
-
-static double
-govpp_stat_segment_data_get_scalar_value(stat_segment_data_t *data)
-{
-       return data->scalar_value;
-}
-
-static double
-govpp_stat_segment_data_get_error_value(stat_segment_data_t *data)
-{
-       return data->error_value;
-}
-
-static uint64_t**
-govpp_stat_segment_data_get_simple_counter(stat_segment_data_t *data)
-{
-       return data->simple_counter_vec;
-}
-
-static uint64_t*
-govpp_stat_segment_data_get_simple_counter_index(stat_segment_data_t *data, int index)
-{
-       return data->simple_counter_vec[index];
-}
-
-static uint64_t
-govpp_stat_segment_data_get_simple_counter_index_value(stat_segment_data_t *data, int index, int index2)
-{
-       return data->simple_counter_vec[index][index2];
-}
-
-static vlib_counter_t**
-govpp_stat_segment_data_get_combined_counter(stat_segment_data_t *data)
-{
-       return data->combined_counter_vec;
-}
-
-static vlib_counter_t*
-govpp_stat_segment_data_get_combined_counter_index(stat_segment_data_t *data, int index)
-{
-       return data->combined_counter_vec[index];
-}
-
-static uint64_t
-govpp_stat_segment_data_get_combined_counter_index_packets(stat_segment_data_t *data, int index, int index2)
-{
-       return data->combined_counter_vec[index][index2].packets;
-}
-
-static uint64_t
-govpp_stat_segment_data_get_combined_counter_index_bytes(stat_segment_data_t *data, int index, int index2)
-{
-       return data->combined_counter_vec[index][index2].bytes;
-}
-
-static uint8_t**
-govpp_stat_segment_data_get_name_vector(stat_segment_data_t *data)
-{
-       return data->name_vector; // VPP 19.04 is required!
-}
-
-static char*
-govpp_stat_segment_data_get_name_vector_index(stat_segment_data_t *data, int index)
-{
-       return data->name_vector[index]; // VPP 19.04 is required!
-}
-
-static void
-govpp_stat_segment_data_free(stat_segment_data_t *data)
-{
-       stat_segment_data_free(data);
-}
-
-static uint8_t**
-govpp_stat_segment_string_vector(uint8_t ** string_vector, char *string)
-{
-       return stat_segment_string_vector(string_vector, string);
-}
+#include "stat_client_wrapper.h"
 */
 import "C"
+
 import (
        "errors"
        "fmt"