aboutsummaryrefslogtreecommitdiffstats
path: root/ctrl/libhicnctrl/includes
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2019-11-19 17:57:20 +0000
committerAlberto Compagno <acompagn+fdio@cisco.com>2019-11-26 10:46:53 +0000
commit3e949f72778dd076fffecd7da2fb83cbb1ccb428 (patch)
treeeb5e437c0bc4be54fc57ae46ae964be7567c43bc /ctrl/libhicnctrl/includes
parentb3ee2ed8602c909f8d5096e9d8d44aa345093566 (diff)
[HICN-398] Added face create/delete/list and listener list on libctrl for hicn-plugin
Listener list returns the list of interfaces and their ip addresses Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com> Change-Id: I2582cf29d4f1f60964766d47ad8d6dc64504fd62
Diffstat (limited to 'ctrl/libhicnctrl/includes')
-rw-r--r--ctrl/libhicnctrl/includes/hicn/ctrl/api.h8
-rw-r--r--ctrl/libhicnctrl/includes/hicn/ctrl/face.h4
2 files changed, 8 insertions, 4 deletions
diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
index eba80bdb3..068b3eb08 100644
--- a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
+++ b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
@@ -139,7 +139,7 @@ typedef struct hc_data_s {
* Create a structure holding the results of an hICN control request.
* \result The newly create data structure.
*/
-hc_data_t *hc_data_create(size_t in_element_size, size_t out_element_size);
+hc_data_t *hc_data_create(size_t in_element_size, size_t out_element_size, data_callback_t complete_cb);
/**
* Free a structure holding the results of an hICN control request.
@@ -382,7 +382,11 @@ int hc_sock_reset(hc_sock_t *s);
#define NULLTERM 1
#endif
-#define INTERFACE_LEN IFNAMSIZ
+#ifdef HICN_VPP_PLUGIN
+ #define INTERFACE_LEN 64
+#else
+ #define INTERFACE_LEN IFNAMSIZ
+#endif
#define MAXSZ_HC_NAME_ SYMBOLIC_NAME_LEN
#define MAXSZ_HC_NAME MAXSZ_HC_NAME_ + NULLTERM
diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/face.h b/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
index f0a8045de..12bf3afa6 100644
--- a/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
+++ b/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
@@ -34,7 +34,7 @@
#include <hicn/util/ip_address.h>
-typedef unsigned int hash_t;
+//typedef unsigned int hash_t; //incompatible with vpp
/* Netdevice type */
@@ -192,7 +192,7 @@ void face_free(face_t * face);
typedef int (*face_cmp_t)(const face_t * f1, const face_t * f2);
int face_cmp(const face_t * f1, const face_t * f2);
-hash_t face_hash(const face_t * face);
+unsigned int face_hash(const face_t * face);
size_t
face_snprintf(char * s, size_t size, const face_t * face);