Merge "[HICN-470] Fix wrong type for face_id_t in libhicnctrl"

3 files changed, 6 insertions, 4 deletions

diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
index e7cd39ebf..c1eccbd17 100644
--- a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
+++ b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h
@@ -554,7 +554,7 @@ int hc_connection_snprintf(char *s, size_t size,
  *----------------------------------------------------------------------------*/
 
 typedef struct {
-  u8 id;
+  face_id_t id;
   char name[SYMBOLIC_NAME_LEN];
   face_t face;  // or embed ?
                 // face_id_t parent; /* Pointer from connection to listener */
@@ -598,7 +598,7 @@ int hc_face_snprintf(char *s, size_t size, hc_face_t *face);
  *----------------------------------------------------------------------------*/
 
 typedef struct {
-  u8 face_id;               /* Kr. */
+  face_id_t face_id;               /* Kr. */
   int family;               /* Krw */
   ip_address_t remote_addr; /* krw */
   u8 len;                   /* krw */
@@ -630,7 +630,7 @@ int hc_route_snprintf(char *s, size_t size, hc_route_t *route);
  *----------------------------------------------------------------------------*/
 
 typedef struct {
-  u8 face_id; /* Kr. */  // XXX listener id, could be NULL for all ?
+  face_id_t face_id; /* Kr. */  // XXX listener id, could be NULL for all ?
   int family;            /* Krw */
   ip_address_t prefix;   /* krw */
   u8 prefix_len;         /* krw */
diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/face.h b/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
index 12bf3afa6..49a6a783c 100644
--- a/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
+++ b/ctrl/libhicnctrl/includes/hicn/ctrl/face.h
@@ -148,6 +148,8 @@ extern const char * face_type_str[];
 
 /* Face */
 
+typedef u32 face_id_t;
+
 typedef struct {
     face_type_t type;
     face_state_t admin_state;
diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/route.h b/ctrl/libhicnctrl/includes/hicn/ctrl/route.h
index 2b96d22cc..d7ef6a26f 100644
--- a/ctrl/libhicnctrl/includes/hicn/ctrl/route.h
+++ b/ctrl/libhicnctrl/includes/hicn/ctrl/route.h
@@ -21,8 +21,8 @@
 #define HICN_ROUTE_H
 
 #include <hicn/util/ip_address.h>
+#include <hicn/ctrl/face.h>
 
-typedef u8 face_id_t;
 typedef u16 route_cost_t;
 
 typedef struct hicn_route_s hicn_route_t;