diff options
author | Jordan Augé <jordan.auge+fdio@cisco.com> | 2019-11-15 12:20:09 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2019-11-15 12:20:09 +0000 |
commit | 4f2b5bb4c0fb4083b4f2bb19296117c6e66e862e (patch) | |
tree | ce33d227b203121b98f6afda4179a1a3894c6f04 /ctrl/libhicnctrl/includes/hicn/ctrl/api.h | |
parent | 92bc1a46f8e33cc664a95819fde45b9b5b4ac321 (diff) | |
parent | fdb523a02680f5aa0727b862f0616ba5f8cb24cf (diff) |
Merge "[HICN-386] Improve API error management in libhicnctrl"
Diffstat (limited to 'ctrl/libhicnctrl/includes/hicn/ctrl/api.h')
-rw-r--r-- | ctrl/libhicnctrl/includes/hicn/ctrl/api.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h index f522010cd..b3032d0f3 100644 --- a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h +++ b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h @@ -74,6 +74,8 @@ #define HICN_DEFAULT_PORT 9695 +#define HOTFIXMARGIN 0 + /* Helper for avoiding warnings about type-punning */ #define UNION_CAST(x, destType) \ (((union {__typeof__(x) a; destType b;})x).b) @@ -124,6 +126,7 @@ typedef struct hc_data_s { /* Callbacks */ data_callback_t complete_cb; // XXX int (*complete_cb)(struct hc_data_s * data); void * complete_cb_data; + int ret; } hc_data_t; /** @@ -412,7 +415,7 @@ foreach_connection_type } hc_connection_type_t; #define MAXSZ_HC_CONNECTION_TYPE_ 9 -#define MAXSZ_HC_CONNECTION_TYPE MAXSZ_HC_CONNECTION_TYPE_ + NULLTERM +#define MAXSZ_HC_CONNECTION_TYPE MAXSZ_HC_CONNECTION_TYPE_ + NULLTERM + HOTFIXMARGIN extern const char * connection_type_str[]; @@ -574,7 +577,7 @@ int hc_face_list_async(hc_sock_t * s); //, hc_data_t ** pdata); #define MAXSZ_FACE_NAME_ SYMBOLIC_NAME_LEN #define MAXSZ_FACE_NAME MAXSZ_FACE_NAME_ + NULLTERM -#define MAXSZ_HC_FACE_ MAXSZ_FACE_ID_ + MAXSZ_FACE_NAME_ + MAXSZ_FACE_ + 5 +#define MAXSZ_HC_FACE_ MAXSZ_FACE_ID_ + MAXSZ_FACE_NAME_ + MAXSZ_FACE_ + 5 + HOTFIXMARGIN #define MAXSZ_HC_FACE MAXSZ_HC_FACE_ + NULLTERM int hc_face_snprintf(char * s, size_t size, hc_face_t * face); |