diff options
Diffstat (limited to 'ctrl')
| -rw-r--r-- | ctrl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/facemgr/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/cmake/Modules/Packaging.cmake | 59 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/includes/hicn/ctrl/api.h | 35 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/CMakeLists.txt | 50 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/api.c | 2396 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/api_private.h | 208 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/cli.c | 27 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/modules/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/modules/hicn_light_api.c | 2278 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/src/modules/hicn_plugin_api.c (renamed from ctrl/libhicnctrl/src/hicn_plugin_api.c) | 678 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/hicn-light/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/hicn-light/plugin/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt | 2 |
16 files changed, 3238 insertions, 2561 deletions
diff --git a/ctrl/CMakeLists.txt b/ctrl/CMakeLists.txt index 50357651f..331ae9078 100644 --- a/ctrl/CMakeLists.txt +++ b/ctrl/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(ctrl) diff --git a/ctrl/facemgr/CMakeLists.txt b/ctrl/facemgr/CMakeLists.txt index ba9de9464..2fad5d839 100644 --- a/ctrl/facemgr/CMakeLists.txt +++ b/ctrl/facemgr/CMakeLists.txt @@ -15,7 +15,7 @@ if (APPLE) # >= 3.13 - CMP0079 (only needed on Apple platform for conditionally linking Network.framwork to libfacemgr) cmake_minimum_required(VERSION 3.13 FATAL_ERROR) else() - cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + cmake_minimum_required(VERSION 3.10 FATAL_ERROR) endif() project(facemgr) diff --git a/ctrl/libhicnctrl/CMakeLists.txt b/ctrl/libhicnctrl/CMakeLists.txt index b2c5975be..22f81401f 100644 --- a/ctrl/libhicnctrl/CMakeLists.txt +++ b/ctrl/libhicnctrl/CMakeLists.txt @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(libhicnctrl) @@ -36,13 +36,6 @@ set(CMAKE_MACOSX_RPATH ON) set(LIBHICNCTRL hicnctrl) -if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(LIBHICNCTRL ${LIBHICNCTRL}-memif) - set(LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs") - list(APPEND HICN_LIBRARIES ${HICNPLUGIN_LIBRARIES}) - list(APPEND HICN_LIBRARIES ${SAFE_VAPI_LIBRARIES}) -endif() - set(LIBHICNCTRL ${LIBHICNCTRL} CACHE INTERNAL "" FORCE) set(LIBHICNCTRL_SHARED ${LIBHICNCTRL}.shared CACHE INTERNAL "" FORCE) set(LIBHICNCTRL_STATIC ${LIBHICNCTRL}.static CACHE INTERNAL "" FORCE) @@ -94,6 +87,7 @@ else() endif() set(LIBHICNCTRL_COMPONENT lib${LIBHICNCTRL}) +set (LIBHICNCTRL_COMPONENT_MODULES ${LIBHICNCTRL_COMPONENT}-modules) add_subdirectory(includes) add_subdirectory(src) diff --git a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake index bf0a4d504..2851375be 100644 --- a/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake +++ b/ctrl/libhicnctrl/cmake/Modules/Packaging.cmake @@ -25,45 +25,32 @@ set(${LIBHICNCTRL_COMPONENT}-dev_DESCRIPTION CACHE STRING "Description for deb/rpm package." ) -if (BUILD_HICNPLUGIN AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES - "" - CACHE STRING "Dependencies for deb/rpm package." - ) - - set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} (>= stable_version), hicn-plugin-dev (>= stable_version)" - CACHE STRING "Dependencies for deb/rpm package." - ) - - set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES - "" - CACHE STRING "Dependencies for deb/rpm package." - ) +set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES + "" + CACHE STRING "Dependencies for deb/rpm package." +) - set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} >= stable_version, hicn-plugin-dev >= stable_version" - CACHE STRING "Dependencies for deb/rpm package." - ) +set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES + "${LIBHICNCTRL_COMPONENT} (>= stable_version)" + CACHE STRING "Dependencies for deb/rpm package." +) -else () - set(${LIBHICNCTRL_COMPONENT}_DEB_DEPENDENCIES - "" - CACHE STRING "Dependencies for deb/rpm package." - ) +set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES + "" + CACHE STRING "Dependencies for deb/rpm package." +) - set(${LIBHICNCTRL_COMPONENT}-dev_DEB_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} (>= stable_version)" - CACHE STRING "Dependencies for deb/rpm package." - ) +set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES + "${LIBHICNCTRL_COMPONENT} >= stable_version" + CACHE STRING "Dependencies for deb/rpm package." +) - set(${LIBHICNCTRL_COMPONENT}_RPM_DEPENDENCIES - "" - CACHE STRING "Dependencies for deb/rpm package." - ) +set(${LIBHICNCTRL_COMPONENT_MODULES}_DEB_DEPENDENCIES + "hicn-plugin (>= stable_version)" + CACHE STRING "Dependencies for deb/rpm package." +) - set(${LIBHICNCTRL_COMPONENT}-dev_RPM_DEPENDENCIES - "${LIBHICNCTRL_COMPONENT} >= stable_version" - CACHE STRING "Dependencies for deb/rpm package." +set(${LIBHICNCTRL_COMPONENT_MODULES}_RPM_DEPENDENCIES + "hicn-plugin >= stable_version" + CACHE STRING "Dependencies for deb/rpm package." ) -endif()
\ No newline at end of file diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h index f92b39ff3..b5a968800 100644 --- a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h +++ b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h @@ -76,6 +76,16 @@ #define HOTFIXMARGIN 0 +/** + * \brief Defines the default size for the allocated data arrays holding the + * results of API calls. + * + * This size should not be too small to avoid wasting memoyy, but also not too + * big to avoid unnecessary realloc's. Later on this size is doubled at each + * reallocation. + */ +#define DEFAULT_SIZE_LOG 3 + /* Helper for avoiding warnings about type-punning */ #ifndef UNION_CAST #define UNION_CAST(x, destType) \ @@ -231,6 +241,12 @@ hc_ ## TYPE ## _find(hc_data_t * data, const hc_ ## TYPE ## _t * element, \ /* This should be at least equal to the maximum packet size */ #define RECV_BUFLEN 8192 +typedef enum { + HICNLIGHT, + VPP, + UNDEFINED +} forwarder_t; + /** * \brief Holds the state of an hICN control socket */ @@ -241,13 +257,22 @@ typedef struct hc_sock_s hc_sock_t; * \param [in] url - The URL to connect to. * \return an hICN control socket */ -hc_sock_t *hc_sock_create_url(const char *url); +hc_sock_t * +hc_sock_create_url(const char * url); + +/** + * \brief Create an hICN control socket using the provided forwarder. + * \return an hICN control socket + */ +hc_sock_t * +hc_sock_create_forwarder(forwarder_t forwarder); /** * \brief Create an hICN control socket using the default connection type. * \return an hICN control socket */ -hc_sock_t *hc_sock_create(void); +hc_sock_t * +hc_sock_create(void); /** * \brief Frees an hICN control socket @@ -382,11 +407,7 @@ int hc_sock_reset(hc_sock_t *s); #define NULLTERM 1 #endif -#ifdef HICN_VPP_PLUGIN - #define INTERFACE_LEN 64 -#else - #define INTERFACE_LEN IFNAMSIZ -#endif +#define INTERFACE_LEN 16 #define MAXSZ_HC_NAME_ SYMBOLIC_NAME_LEN #define MAXSZ_HC_NAME MAXSZ_HC_NAME_ + NULLTERM diff --git a/ctrl/libhicnctrl/src/CMakeLists.txt b/ctrl/libhicnctrl/src/CMakeLists.txt index f5d3c49a3..f9934d70e 100644 --- a/ctrl/libhicnctrl/src/CMakeLists.txt +++ b/ctrl/libhicnctrl/src/CMakeLists.txt @@ -15,41 +15,25 @@ list(APPEND COMPILER_DEFINITIONS "-DWITH_POLICY" ) -set(HEADER_FILES - api.h - commands.h - face.h -) - -set(UTIL_HEADER_FILES - face.h -) - set(SOURCE_FILES face.c route.c + api.c ) -if(BUILD_HICNPLUGIN) - set(SOURCE_FILES - ${SOURCE_FILES} - hicn_plugin_api.c - ) -else () - set(SOURCE_FILES - ${SOURCE_FILES} - api.c - ) -endif() +set(HEADER_FILES + api_private.h +) set(LIBRARIES m + dl ${HICN_LIBRARIES} ) set(INCLUDE_DIRS - ./ - ../includes/ + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../includes/ ${HICN_INCLUDE_DIRS} ) @@ -61,9 +45,17 @@ else () set(LINK_TYPE SHARED STATIC) endif () +if (${CMAKE_SYSTEM_NAME} MATCHES Android) + list(APPEND SOURCE_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/modules/hicn_light_api.c + ) +else() + add_subdirectory(modules) +endif() + build_library(${LIBHICNCTRL} ${LINK_TYPE} - SOURCES ${SOURCE_FILES} + SOURCES ${SOURCE_FILES} ${HEADER_FILES} INSTALL_HEADERS ${TO_INSTALL_HEADER_FILES} LINK_LIBRARIES ${LIBRARIES} DEPENDS ${DEPENDENCIES} @@ -74,7 +66,13 @@ build_library(${LIBHICNCTRL} ) if (NOT DISABLE_EXECUTABLES) - set(LIBRARIES ${LIBRARIES} ${LIBHICN_SHARED} ${LIBHICNCTRL_SHARED}) + if (DISABLE_SHARED_LIBRARIES) + set(LIBRARIES ${LIBRARIES} ${LIBHICNCTRL_STATIC}) + set(DEPENDENCIES ${LIBHICNCTRL_STATIC}) + else () + set(LIBRARIES ${LIBRARIES} ${LIBHICN_SHARED} ${LIBHICNCTRL_SHARED}) + set(DEPENDENCIES ${LIBHICNCTRL_SHARED}) + endif () list(APPEND DAEMON_SRC cli.c @@ -83,7 +81,7 @@ if (NOT DISABLE_EXECUTABLES) build_executable(${HICNCTRL} SOURCES ${DAEMON_SRC} LINK_LIBRARIES ${LIBRARIES} - DEPENDS ${LIBHICNCTRL_SHARED} + DEPENDS ${DEPENDENCIES} COMPONENT ${LIBHICNCTRL_COMPONENT} INCLUDE_DIRS ${INCLUDE_DIRS} DEFINITIONS ${COMPILER_DEFINITIONS} diff --git a/ctrl/libhicnctrl/src/api.c b/ctrl/libhicnctrl/src/api.c index 8dcb978e0..4bb66c784 100644 --- a/ctrl/libhicnctrl/src/api.c +++ b/ctrl/libhicnctrl/src/api.c @@ -18,155 +18,26 @@ * \brief Implementation of hICN control library API */ -#include <assert.h> // assert -#include <math.h> // log2 -#include <stdbool.h> -#include <stdio.h> // snprintf -#include <string.h> // memmove, strcasecmp -#include <sys/socket.h> // socket -#include <unistd.h> // close, fcntl -#include <fcntl.h> // fcntl -#include <sys/types.h> // getpid -#include <unistd.h> // getpid -#ifdef __linux__ -#include <sys/syscall.h> -#define gettid() syscall(SYS_gettid) -#endif /* __linux__ */ - -#include <hicn/ctrl/api.h> -#include <hicn/ctrl/commands.h> -#include <hicn/util/token.h> #include <hicn/util/log.h> -#include <hicn/util/map.h> -#include <strings.h> +#include "api_private.h" -#define PORT 9695 +#include <math.h> // log2 +#include <dlfcn.h> // dlopen -#define INT_CMP(x, y) ((x > y) ? 1 : (x < y) ? -1 : 0) -#define BOOLSTR(x) ((x) ? "true" : "false") -/* - * Internal state associated to a pending request - */ -typedef struct { - int seq; - hc_data_t * data; - /* Information used to process results */ - int size_in; - int (*parse)(const u8 * src, u8 * dst); -} hc_sock_request_t; - -/** - * Messages to the forwarder might be multiplexed thanks to the seqNum fields in - * the header_control_message structure. The forwarder simply answers back the - * original sequence number. We maintain a map of such sequence number to - * outgoing queries so that replied can be demultiplexed and treated - * appropriately. - */ -TYPEDEF_MAP_H(hc_sock_map, int, hc_sock_request_t *); -TYPEDEF_MAP(hc_sock_map, int, hc_sock_request_t *, int_cmp, int_snprintf, generic_snprintf); - -struct hc_sock_s { - char * url; - int fd; - - /* Partial receive buffer */ - u8 buf[RECV_BUFLEN]; - size_t roff; /**< Read offset */ - size_t woff; /**< Write offset */ - - /* - * Because received messages are potentially unbounded in size, we might not - * guarantee that we can store a full packet before processing it. We must - * implement a very simple state machine remembering the current parsing - * status in order to partially process the packet. - */ - size_t remaining; - u32 send_id; - - /* Next sequence number to be used for requests */ - int seq; - - /* Request being parsed (NULL if none) */ - hc_sock_request_t * cur_request; - - bool async; - hc_sock_map_t * map; +/* /!\ Please update constants in public header file upon changes */ +const char * connection_state_str[] = { +#define _(x) [HC_CONNECTION_STATE_ ## x] = STRINGIZE(x), +foreach_connection_state +#undef _ }; - -hc_sock_request_t * -hc_sock_request_create(int seq, hc_data_t * data, HC_PARSE parse) -{ - assert(data); - - hc_sock_request_t * request = malloc(sizeof(hc_sock_request_t)); - if (!request) - return NULL; - request->seq = seq; - request->data = data; - request->parse = parse; - return request; -} - -void -hc_sock_request_free(hc_sock_request_t * request) -{ - free(request); -} - - -#if 0 -#ifdef __APPLE__ -#define RANDBYTE() (u8)(arc4random() & 0xFF) -#else -#define RANDBYTE() (u8)(random() & 0xFF) -#endif -#endif -#define RANDBYTE() (u8)(rand() & 0xFF) - -/* - * list was working with all seq set to 0, but it seems hicnLightControl uses - * 1, and replies with the same seqno - */ -#define HICN_CTRL_SEND_SEQ_INIT 1 -#define HICN_CTRL_RECV_SEQ_INIT 1 - -#define MAX(x, y) ((x > y) ? x : y) - -/** - * \brief Defines the default size for the allocated data arrays holding the - * results of API calls. - * - * This size should not be too small to avoid wasting memoyy, but also not too - * big to avoid unnecessary realloc's. Later on this size is doubled at each - * reallocation. - */ -#define DEFAULT_SIZE_LOG 3 - -/** - * In practise, we want to preserve enough room to store a full packet of - * average expected size (say a header + N payload elements). - */ -#define AVG_ELEMENTS (1 << DEFAULT_SIZE_LOG) -#define AVG_BUFLEN sizeof(hc_msg_header_t) + AVG_ELEMENTS * sizeof(hc_msg_payload_t) - -/* - * We should at least have buffer space allowing to store one processable unit - * of data, either the header of the maximum possible payload - */ -#define MIN_BUFLEN MAX(sizeof(hc_msg_header_t), sizeof(hc_msg_payload_t)) - -static const struct in6_addr loopback_addr = IN6ADDR_LOOPBACK_INIT; - -/* /!\ Please update constants in header file upon changes */ +/* /!\ Please update constants in public header file upon changes */ const char * connection_type_str[] = { #define _(x) [CONNECTION_TYPE_ ## x] = STRINGIZE(x), foreach_connection_type #undef _ }; -#define IS_VALID_CONNECTION_TYPE(x) IS_VALID_ENUM_TYPE(CONNECTION_TYPE, x) - hc_connection_type_t connection_type_from_str(const char * str) { @@ -177,14 +48,14 @@ connection_type_from_str(const char * str) else if (strcasecmp(str, "HICN") == 0) return CONNECTION_TYPE_HICN; else - return CONNECTION_TYPE_UNDEFINED; + return CONNECTION_TYPE_UNDEFINED; } /* Conversions to shield lib user from heterogeneity */ #define IS_VALID_LIST_CONNECTIONS_TYPE(x) ((x >= CONN_GRE) && (x <= CONN_HICN)) -static const hc_connection_type_t map_from_list_connections_type[] = { +const hc_connection_type_t map_from_list_connections_type[] = { [CONN_GRE] = CONNECTION_TYPE_UNDEFINED, [CONN_TCP] = CONNECTION_TYPE_TCP, [CONN_UDP] = CONNECTION_TYPE_UDP, @@ -193,17 +64,9 @@ static const hc_connection_type_t map_from_list_connections_type[] = { [CONN_HICN] = CONNECTION_TYPE_HICN, }; -typedef enum { - ENCAP_TCP, - ENCAP_UDP, - ENCAP_ETHER, - ENCAP_LOCAL, - ENCAP_HICN -} EncapType; - #define IS_VALID_LIST_LISTENERS_TYPE(x) ((x >= ENCAP_TCP) && (x <= ENCAP_HICN)) -static const hc_connection_type_t map_from_encap_type[] = { +const hc_connection_type_t map_from_encap_type[] = { [ENCAP_TCP] = CONNECTION_TYPE_TCP, [ENCAP_UDP] = CONNECTION_TYPE_UDP, [ENCAP_ETHER] = CONNECTION_TYPE_UNDEFINED, @@ -211,13 +74,13 @@ static const hc_connection_type_t map_from_encap_type[] = { [ENCAP_HICN] = CONNECTION_TYPE_HICN, }; -static const connection_type map_to_connection_type[] = { +const connection_type map_to_connection_type[] = { [CONNECTION_TYPE_TCP] = TCP_CONN, [CONNECTION_TYPE_UDP] = UDP_CONN, [CONNECTION_TYPE_HICN] = HICN_CONN, }; -static const listener_mode map_to_listener_mode[] = { +const listener_mode map_to_listener_mode[] = { [CONNECTION_TYPE_TCP] = IP_MODE, [CONNECTION_TYPE_UDP] = IP_MODE, [CONNECTION_TYPE_HICN] = HICN_MODE, @@ -225,13 +88,6 @@ static const listener_mode map_to_listener_mode[] = { #define IS_VALID_LIST_CONNECTIONS_STATE(x) ((x >= IFACE_UP) && (x <= IFACE_UNKNOWN)) -/* /!\ Please update constants in header file upon changes */ -const char * connection_state_str[] = { -#define _(x) [HC_CONNECTION_STATE_ ## x] = STRINGIZE(x), -foreach_connection_state -#undef _ -}; - /* #define IS_VALID_CONNECTION_STATE(x) IS_VALID_ENUM_TYPE(CONNECTION_STATE, x) @@ -242,19 +98,14 @@ static const connection_state map_to_connection_state[] = { */ -static const hc_connection_state_t map_from_list_connections_state[] = { +const hc_connection_state_t map_from_list_connections_state[] = { [IFACE_UP] = HC_CONNECTION_STATE_UP, [IFACE_DOWN] = HC_CONNECTION_STATE_DOWN, [IFACE_UNKNOWN] = HC_CONNECTION_STATE_UNDEFINED, }; -#define connection_state_to_face_state(x) ((face_state_t)(x)) -#define face_state_to_connection_state(x) ((hc_connection_state_t)(x)) - -#define IS_VALID_ADDR_TYPE(x) ((x >= ADDR_INET) && (x <= ADDR_UNIX)) - -static const int map_from_addr_type[] = { +const int map_from_addr_type[] = { [ADDR_INET] = AF_INET, [ADDR_INET6] = AF_INET6, [ADDR_LINK] = AF_UNSPEC, @@ -262,49 +113,12 @@ static const int map_from_addr_type[] = { [ADDR_UNIX] = AF_UNSPEC, }; -static const address_type map_to_addr_type[] = { +const address_type map_to_addr_type[] = { [AF_INET] = ADDR_INET, [AF_INET6] = ADDR_INET6, }; /****************************************************************************** - * Message helper types and aliases - ******************************************************************************/ - -#define foreach_hc_command \ - _(add_connection) \ - _(remove_connection) \ - _(list_connections) \ - _(add_listener) \ - _(remove_listener) \ - _(list_listeners) \ - _(add_route) \ - _(remove_route) \ - _(list_routes) \ - _(cache_store) \ - _(cache_serve) \ - /*_(cache_clear) */ \ - _(set_strategy) \ - _(set_wldr) \ - _(add_punting) \ - _(mapme_activator) \ - _(mapme_timing) - -typedef header_control_message hc_msg_header_t; - -typedef union { -#define _(x) x ## _command x; - foreach_hc_command -#undef _ -} hc_msg_payload_t; - - -typedef struct hc_msg_s { - hc_msg_header_t hdr; - hc_msg_payload_t payload; -} hc_msg_t; - -/****************************************************************************** * Control Data ******************************************************************************/ @@ -358,7 +172,8 @@ hc_data_ensure_available(hc_data_t * data, size_t count) if (!data->buffer) return -1; } - return 0; + + return 0; } int @@ -370,7 +185,8 @@ hc_data_push_many(hc_data_t * data, const void * elements, size_t count) memcpy(data->buffer + data->size * data->out_element_size, elements, count * data->out_element_size); data->size += count; - return 0; + + return 0; } int @@ -398,7 +214,7 @@ hc_data_set_callback(hc_data_t * data, data_callback_t cb, void * cb_data) { data->complete_cb = cb; data->complete_cb_data = cb_data; - return 0; + return 0; } int @@ -408,7 +224,7 @@ hc_data_set_complete(hc_data_t * data) data->ret = 0; if (data->complete_cb) return data->complete_cb(data, data->complete_cb_data); - return 0; + return 0; } int @@ -422,748 +238,164 @@ int hc_data_reset(hc_data_t * data) { data->size = 0; - return 0; + return 0; } -/****************************************************************************** - * Control socket - ******************************************************************************/ - -/** - * \brief Parse a connection URL into a sockaddr - * \param [in] url - URL - * \param [out] sa - Resulting struct sockaddr, expected zero'ed. - * \return 0 if parsing succeeded, a negative error value otherwise. - */ -int -hc_sock_parse_url(const char * url, struct sockaddr * sa) +static hc_sock_t * _open_module(const char *name) { - /* FIXME URL parsing is currently not implemented */ - assert(!url); - -#ifdef __linux__ - srand(time(NULL) ^ getpid() ^ gettid()); + char complete_name[128]; +#ifdef __APPLE__ + sprintf(complete_name, "%s.dylib", name); +#elif defined(__linux__) + sprintf(complete_name, "%s.so", name); #else - srand((unsigned int )(time(NULL) ^ getpid())); -#endif /* __linux__ */ - - /* - * A temporary solution is to inspect the sa_family fields of the passed in - * sockaddr, which defaults to AF_UNSPEC (0) and thus creates an IPv4/TCP - * connection to localhost. - */ - switch (sa->sa_family) { - case AF_UNSPEC: - case AF_INET: - { - struct sockaddr_in * sai = (struct sockaddr_in *)sa; - sai->sin_family = AF_INET; - sai->sin_port = htons(PORT); - sai->sin_addr.s_addr = htonl(INADDR_LOOPBACK); - break; - } - case AF_INET6: - { - struct sockaddr_in6 * sai6 = (struct sockaddr_in6 *)sa; - sai6->sin6_family = AF_INET6; - sai6->sin6_port = htons(PORT); - sai6->sin6_addr = loopback_addr; - break; - } - default: - return -1; - } - - return 0; -} - -hc_sock_t * -hc_sock_create_url(const char * url) -{ - hc_sock_t * s = malloc(sizeof(hc_sock_t)); - if (!s) - goto ERR_MALLOC; - - s->url = url ? strdup(url) : NULL; - - s->fd = socket(AF_INET, SOCK_STREAM, 0); - if (s->fd < 0) - goto ERR_SOCKET; + #error "System not supported for dynamic lynking" +#endif - if (hc_sock_reset(s) < 0) - goto ERR_RESET; + void *handle = 0; + const char *error = 0; + hc_sock_t *(*creator)(void) = 0; + hc_sock_t *ret = 0; - s->seq = 0; - s->cur_request = NULL; + // open module + handle = dlopen(complete_name, RTLD_LAZY); + if (!handle) { + if ((error = dlerror()) != 0) { + ERROR("%s", error); + } - s->map = hc_sock_map_create(); - if (!s->map) - goto ERR_MAP; + return 0; + } + + // get factory method + creator = (hc_sock_t * (*)(void)) dlsym(handle, "_hc_sock_create"); + if (!creator) { + if ((error = dlerror()) != 0) { + ERROR("%s", error); + return 0; + } + } - return s; + ret = (*creator)(); + ret->handle = handle; - //hc_sock_map_free(s->map); -ERR_MAP: -ERR_RESET: - if (s->url) - free(s->url); - close(s->fd); -ERR_SOCKET: - free(s); -ERR_MALLOC: - return NULL; + return ret; } -hc_sock_t * -hc_sock_create(void) +hc_sock_t *hc_sock_create_forwarder(forwarder_t forwarder) { - return hc_sock_create_url(NULL); -} - -void -hc_sock_free(hc_sock_t * s) -{ - hc_sock_request_t ** request_array = NULL; - int n = hc_sock_map_get_value_array(s->map, &request_array); - if (n < 0) { - ERROR("Could not retrieve pending request array for freeing up resources"); - } else { - for (unsigned i = 0; i < n; i++) { - hc_sock_request_t * request = request_array[i]; - if (hc_sock_map_remove(s->map, request->seq, NULL) < 0) - ERROR("[hc_sock_process] Error removing request from map"); - hc_sock_request_free(request); - } - free(request_array); + switch (forwarder) + { + case HICNLIGHT: + return _open_module("hicnlightctrl_module"); + case VPP: + return _open_module("vppctrl_module"); + default: + return NULL; } - - hc_sock_map_free(s->map); - if (s->url) - free(s->url); - close(s->fd); - free(s); } -int -hc_sock_get_next_seq(hc_sock_t * s) -{ - return s->seq++; -} +#ifdef ANDROID +// In android we do not load a module at runtime +// but we link the hicnlight implmentation directly +// to the main library +extern hc_sock_t *_hc_sock_create(); +#endif -int -hc_sock_set_nonblocking(hc_sock_t * s) +hc_sock_t *hc_sock_create(void) { - return (fcntl(s->fd, F_SETFL, fcntl(s->fd, F_GETFL) | O_NONBLOCK) < 0); -} - -int -hc_sock_get_fd(hc_sock_t * s) -{ - return s->fd; +#ifdef ANDROID + hc_sock_t *ret = _hc_sock_create(); + ret->handle = NULL; + return ret; +#else + return hc_sock_create_forwarder(HICNLIGHT); +#endif } -int -hc_sock_connect(hc_sock_t * s) +void hc_sock_free(hc_sock_t *s) { - struct sockaddr_storage ss; - memset(&ss, 0, sizeof(struct sockaddr_storage)); - - if (hc_sock_parse_url(s->url, (struct sockaddr *)&ss) < 0) - goto ERR_PARSE; - - size_t size = ss.ss_family == AF_INET - ? sizeof(struct sockaddr_in) - : sizeof(struct sockaddr_in6); - if (connect(s->fd, (struct sockaddr *)&ss, (socklen_t)size) < 0) //sizeof(struct sockaddr)) < 0) - goto ERR_CONNECT; + void *handle = s->handle; + s->hc_sock_free(s); - return 0; - -ERR_CONNECT: -ERR_PARSE: - return -1; -} - -int -hc_sock_send(hc_sock_t * s, hc_msg_t * msg, size_t msglen, int seq) -{ - int rc; - msg->hdr.seqNum = seq; - rc = (int)send(s->fd, msg, msglen, 0); - if (rc < 0) { - perror("hc_sock_send"); - return -1; + if (handle) { + dlclose(handle); } - return 0; } -int -hc_sock_get_available(hc_sock_t * s, u8 ** buffer, size_t * size) +int hc_sock_get_next_seq(hc_sock_t *s) { - *buffer = s->buf + s->woff; - *size = RECV_BUFLEN - s->woff; - - return 0; + return s->hc_sock_get_next_seq(s); } -int -hc_sock_recv(hc_sock_t * s) +int hc_sock_set_nonblocking(hc_sock_t *s) { - int rc; - - /* - * This condition should be ensured to guarantee correct processing of - * messages - */ - assert(RECV_BUFLEN - s->woff > MIN_BUFLEN); - - rc = (int)recv(s->fd, s->buf + s->woff, RECV_BUFLEN - s->woff, 0); - if (rc == 0) { - /* Connection has been closed */ - return 0; - } - if (rc < 0) { - /* - * Let's not return 0 which currently means the socket has been closed - */ - if (errno == EWOULDBLOCK) - return -1; - perror("hc_sock_recv"); - return -1; - } - s->woff += rc; - return rc; + return s->hc_sock_get_next_seq(s); } -/* - * Returns -99 in case of internal error, -1 in case of API command failure - */ -int -hc_sock_process(hc_sock_t * s, hc_data_t ** data) +int hc_sock_get_fd(hc_sock_t *s) { - int err = 0; - - /* We must have received at least one byte */ - size_t available = s->woff - s->roff; - - while(available > 0) { - - if (!s->cur_request) { // No message being parsed, alternatively (remaining == 0) - hc_msg_t * msg = (hc_msg_t*)(s->buf + s->roff); - - /* We expect a message header */ - if (available < sizeof(hc_msg_header_t)) { - break; - } - - hc_sock_request_t * request = NULL; - if (hc_sock_map_get(s->map, msg->hdr.seqNum, &request) < 0) { - ERROR("[hc_sock_process] Error searching for matching request"); - return -99; - } - if (!request) { - ERROR("[hc_sock_process] No request matching received sequence number"); - return -99; - } - - s->remaining = msg->hdr.length; - switch(msg->hdr.messageType) { - case ACK_LIGHT: - assert(s->remaining == 1); - assert(!data); - s->cur_request = request; - break; - case NACK_LIGHT: - assert(s->remaining == 1); - assert(!data); - hc_data_set_error(request->data); - s->cur_request = request; - err = -1; - break; - case RESPONSE_LIGHT: - assert(data); - if (s->remaining == 0) { - hc_data_set_complete(request->data); - *data = request->data; - if (hc_sock_map_remove(s->map, request->seq, NULL) < 0) - ERROR("[hc_sock_process] Error removing request from map"); - hc_sock_request_free(request); - } else { - /* We only remember it if there is still data to parse */ - s->cur_request = request; - } - break; - default: - ERROR("[hc_sock_process] Invalid response received"); - return -99; - } - - available -= sizeof(hc_msg_header_t); - s->roff += sizeof(hc_msg_header_t); - } else { - /* We expect the complete payload, or at least a chunk of it */ - size_t num_chunks = available / s->cur_request->data->in_element_size; - if (num_chunks == 0) - break; - if (num_chunks > s->remaining) - num_chunks = s->remaining; - - if (!s->cur_request->parse) { - /* If we don't need to parse results, then we can directly push - * all of them into the result data structure */ - hc_data_push_many(s->cur_request->data, s->buf + s->roff, num_chunks); - } else { - int rc; - rc = hc_data_ensure_available(s->cur_request->data, num_chunks); - if (rc < 0) { - ERROR("[hc_sock_process] Error in hc_data_ensure_available"); - return -99; - } - for (int i = 0; i < num_chunks; i++) { - u8 * dst = hc_data_get_next(s->cur_request->data); - if (!dst) { - ERROR("[hc_sock_process] Error in hc_data_get_next"); - return -99; - } - - rc = s->cur_request->parse(s->buf + s->roff + i * s->cur_request->data->in_element_size, dst); - if (rc < 0) { - ERROR("[hc_sock_process] Error in parse"); - err = -99; /* FIXME we let the loop complete (?) */ - } - s->cur_request->data->size++; - } - } - - s->remaining -= num_chunks; - available -= num_chunks * s->cur_request->data->in_element_size; - s->roff += num_chunks * s->cur_request->data->in_element_size; - if (s->remaining == 0) { - if (hc_sock_map_remove(s->map, s->cur_request->seq, NULL) < 0) { - ERROR("[hc_sock_process] Error removing request from map"); - return -99; - } - hc_data_set_complete(s->cur_request->data); - if (data) - *data = s->cur_request->data; - hc_sock_request_free(s->cur_request); - s->cur_request = NULL; - } - - } - } - - /* Make sure there is enough remaining space in the buffer */ - if (RECV_BUFLEN - s->woff < AVG_BUFLEN) { - /* - * There should be no overlap provided a sufficiently large BUFLEN, but - * who knows. - */ - memmove(s->buf, s->buf + s->roff, s->woff - s->roff); - s->woff -= s->roff; - s->roff = 0; - } - - return err; + return s->hc_sock_get_fd(s); } -int -hc_sock_callback(hc_sock_t * s, hc_data_t ** pdata) -{ - hc_data_t * data; - - for (;;) { - int n = hc_sock_recv(s); - if (n == 0) - goto ERR_EOF; - if (n < 0) { - switch(errno) { - case ECONNRESET: - case ENODEV: - /* Forwarder restarted */ - WARN("Forwarder likely restarted: not (yet) implemented"); - goto ERR; - case EWOULDBLOCK: - //DEBUG("Would block... stop reading from socket"); - goto END; - default: - perror("hc_sock_recv"); - goto ERR; - } - } - if (hc_sock_process(s, &data) < 0) { - goto ERR; - } - } -END: - if (pdata) - *pdata = data; - else - hc_data_free(data); - return 0; - -ERR: - hc_data_free(data); -ERR_EOF: - return -1; -} - -int -hc_sock_reset(hc_sock_t * s) +int hc_sock_connect(hc_sock_t *s) { - s->roff = s->woff = 0; - s->remaining = 0; - return 0; + return s->hc_sock_connect(s); } -/****************************************************************************** - * Command-specific structures and functions - ******************************************************************************/ - -typedef int (*HC_PARSE)(const u8 *, u8 *); - -typedef struct { - hc_action_t cmd; - command_id cmd_id; - size_t size_in; - size_t size_out; - HC_PARSE parse; -} hc_command_params_t; - -int -hc_execute_command(hc_sock_t * s, hc_msg_t * msg, size_t msg_len, - hc_command_params_t * params, hc_data_t ** pdata, bool async) -{ - int ret; - if (async) - assert(!pdata); - - /* Sanity check */ - switch(params->cmd) { - case ACTION_CREATE: - assert(params->size_in != 0); /* payload repeated */ - assert(params->size_out == 0); - assert(params->parse == NULL); - break; - case ACTION_DELETE: - assert(params->size_in != 0); /* payload repeated */ - assert(params->size_out == 0); - assert(params->parse == NULL); - break; - case ACTION_LIST: - assert(params->size_in != 0); - assert(params->size_out != 0); - assert(params->parse != NULL); - break; - case ACTION_SET: - assert(params->size_in != 0); - assert(params->size_out == 0); - assert(params->parse == NULL); - break; - default: - return -1; - } - - //hc_sock_reset(s); - - /* XXX data will at least store the result (complete) */ - hc_data_t * data = hc_data_create(params->size_in, params->size_out, NULL); - if (!data) { - ERROR("[hc_execute_command] Could not create data storage"); - goto ERR_DATA; - } - - int seq = hc_sock_get_next_seq(s); - - /* Create state used to process the request */ - hc_sock_request_t * request = NULL; - request = hc_sock_request_create(seq, data, params->parse); - if (!request) { - ERROR("[hc_execute_command] Could not create request state"); - goto ERR_REQUEST; - } - - /* Add state to map */ - if (hc_sock_map_add(s->map, seq, request) < 0) { - ERROR("[hc_execute_command] Error adding request state to map"); - goto ERR_MAP; - } - - if (hc_sock_send(s, msg, msg_len, seq) < 0) { - ERROR("[hc_execute_command] Error sending message"); - goto ERR_PROCESS; - } - - if (async) - return 0; - - while(!data->complete) { - /* - * As the socket is non blocking it might happen that we need to read - * several times before success... shall we alternate between blocking - * and non-blocking mode ? - */ - int n = hc_sock_recv(s); - if (n == 0) - goto ERR_EOF; - if (n < 0) - continue; //break; - int rc = hc_sock_process(s, pdata); - switch(rc) { - case 0: - break; - case -1: - ret = rc; - break; - case -99: - ERROR("[hc_execute_command] Error processing socket results"); - goto ERR; - break; - default: - ERROR("[hc_execute_command] Unexpected return value"); - goto ERR; - } - } - -ERR_EOF: - ret = data->ret; - if (!data->complete) - return -1; - if (!pdata) - hc_data_free(data); - - return ret; - -ERR_PROCESS: -ERR_MAP: - hc_sock_request_free(request); -ERR: -ERR_REQUEST: - hc_data_free(data); -ERR_DATA: - return -99; -} - -/*----------------------------------------------------------------------------* - * Listeners - *----------------------------------------------------------------------------*/ - -/* LISTENER CREATE */ - -int -_hc_listener_create(hc_sock_t * s, hc_listener_t * listener, bool async) +int hc_sock_get_available(hc_sock_t *s, u8 **buffer, size_t *size) { - char listener_s[MAXSZ_HC_LISTENER]; - int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); - if (rc >= MAXSZ_HC_LISTENER) - WARN("[_hc_listener_create] Unexpected truncation of listener string"); - DEBUG("[_hc_listener_create] listener=%s async=%s", listener_s, - BOOLSTR(async)); - - if (!IS_VALID_FAMILY(listener->family)) - return -1; - - if (!IS_VALID_CONNECTION_TYPE(listener->type)) - return -1; - - struct { - header_control_message hdr; - add_listener_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = ADD_LISTENER, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = listener->local_addr, - .port = htons(listener->local_port), - .addressType = (u8)map_to_addr_type[listener->family], - .listenerMode = (u8)map_to_listener_mode[listener->type], - .connectionType = (u8)map_to_connection_type[listener->type], - } - }; - - rc = snprintf(msg.payload.symbolic, SYMBOLIC_NAME_LEN, "%s", listener->name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_listener_create] Unexpected truncation of symbolic name string"); - - rc = snprintf(msg.payload.interfaceName, INTERFACE_LEN, "%s", listener->interface_name); - if (rc >= INTERFACE_LEN) - WARN("[_hc_listener_create] Unexpected truncation of interface name string"); - - hc_command_params_t params = { - .cmd = ACTION_CREATE, - .cmd_id = ADD_LISTENER, - .size_in = sizeof(add_listener_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return s->hc_sock_get_available(s, buffer, size); } -int -hc_listener_create(hc_sock_t * s, hc_listener_t * listener) +int hc_sock_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen, int seq) { - return _hc_listener_create(s, listener, false); + return s->hc_sock_send(s, msg, msglen, seq); } -int -hc_listener_create_async(hc_sock_t * s, hc_listener_t * listener) +int hc_sock_recv(hc_sock_t *s) { - return _hc_listener_create(s, listener, true); + return s->hc_sock_recv(s); } -/* LISTENER GET */ - -int -hc_listener_get(hc_sock_t * s, hc_listener_t * listener, - hc_listener_t ** listener_found) +int hc_sock_process(hc_sock_t *s, hc_data_t **data) { - hc_data_t * listeners; - hc_listener_t * found; - - char listener_s[MAXSZ_HC_LISTENER]; - int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); - if (rc >= MAXSZ_HC_LISTENER) - WARN("[hc_listener_get] Unexpected truncation of listener string"); - DEBUG("[hc_listener_get] listener=%s", listener_s); - - if (hc_listener_list(s, &listeners) < 0) - return -1; - - /* Test */ - if (hc_listener_find(listeners, listener, &found) < 0) { - hc_data_free(listeners); - return -1; - } - - if (found) { - *listener_found = malloc(sizeof(hc_listener_t)); - if (!*listener_found) - return -1; - **listener_found = *found; - } else { - *listener_found = NULL; - } - - hc_data_free(listeners); - - return 0; + return s->hc_sock_process(s, data); } - -/* LISTENER DELETE */ - -int -_hc_listener_delete(hc_sock_t * s, hc_listener_t * listener, bool async) -{ - char listener_s[MAXSZ_HC_LISTENER]; - int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); - if (rc >= MAXSZ_HC_LISTENER) - WARN("[_hc_listener_delete] Unexpected truncation of listener string"); - DEBUG("[_hc_listener_delete] listener=%s async=%s", listener_s, - BOOLSTR(async)); - - struct { - header_control_message hdr; - remove_listener_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = REMOVE_LISTENER, - .length = 1, - .seqNum = 0, - }, - }; - - if (listener->id) { - rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%d", listener->id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); - } else if (*listener->name) { - rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%s", listener->name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); - } else { - hc_listener_t * listener_found; - if (hc_listener_get(s, listener, &listener_found) < 0) - return -1; - if (!listener_found) - return -1; - rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%d", listener_found->id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); - free(listener_found); - } - - hc_command_params_t params = { - .cmd = ACTION_DELETE, - .cmd_id = REMOVE_LISTENER, - .size_in = sizeof(remove_listener_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +int hc_sock_callback(hc_sock_t *s, hc_data_t **data) +{ + return s->hc_sock_callback(s, data); } -int -hc_listener_delete(hc_sock_t * s, hc_listener_t * listener) +int hc_sock_reset(hc_sock_t *s) { - return _hc_listener_delete(s, listener, false); + return s->hc_sock_reset(s); } -int -hc_listener_delete_async(hc_sock_t * s, hc_listener_t * listener) +int hc_listener_create(hc_sock_t *s, hc_listener_t *listener) { - return _hc_listener_delete(s, listener, true); + return s->hc_listener_create(s, listener); } - -/* LISTENER LIST */ - -int -_hc_listener_list(hc_sock_t * s, hc_data_t ** pdata, bool async) -{ - DEBUG("[hc_listener_list] async=%s", BOOLSTR(async)); - - struct { - header_control_message hdr; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = LIST_LISTENERS, - .length = 0, - .seqNum = 0, - }, - }; - - hc_command_params_t params = { - .cmd = ACTION_LIST, - .cmd_id = LIST_LISTENERS, - .size_in = sizeof(list_listeners_command), - .size_out = sizeof(hc_listener_t), - .parse = (HC_PARSE)hc_listener_parse, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +int hc_listener_get(hc_sock_t *s, hc_listener_t *listener, + hc_listener_t **listener_found) +{ + return s->hc_listener_get(s, listener, listener_found); } -int -hc_listener_list(hc_sock_t * s, hc_data_t ** pdata) +int hc_listener_delete(hc_sock_t *s, hc_listener_t *listener) { - return _hc_listener_list(s, pdata, false); + return s->hc_listener_delete(s, listener); } -int -hc_listener_list_async(hc_sock_t * s, hc_data_t ** pdata) +int hc_listener_list(hc_sock_t *s, hc_data_t **pdata) { - return _hc_listener_list(s, pdata, true); + return s->hc_listener_list(s, pdata); } +GENERATE_FIND(listener); + /* LISTENER VALIDATE */ int @@ -1247,8 +479,6 @@ hc_listener_parse(void * in, hc_listener_t * listener) return 0; } -GENERATE_FIND(listener) - /* LISTENER SNPRINTF */ /* /!\ Please update constants in header file upon changes */ @@ -1268,221 +498,57 @@ hc_listener_snprintf(char * s, size_t size, hc_listener_t * listener) connection_type_str[listener->type]); } -/*----------------------------------------------------------------------------* - * CONNECTION - *----------------------------------------------------------------------------*/ - -/* CONNECTION CREATE */ - -int -_hc_connection_create(hc_sock_t * s, hc_connection_t * connection, bool async) +int hc_connection_create(hc_sock_t *s, hc_connection_t *connection) { - char connection_s[MAXSZ_HC_CONNECTION]; - int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); - if (rc >= MAXSZ_HC_CONNECTION) - WARN("[_hc_connection_create] Unexpected truncation of connection string"); - DEBUG("[_hc_connection_create] connection=%s async=%s", connection_s, BOOLSTR(async)); - - if (hc_connection_validate(connection) < 0) - return -1; - - struct { - header_control_message hdr; - add_connection_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = ADD_CONNECTION, - .length = 1, - .seqNum = 0, - }, - .payload = { - .remoteIp = connection->remote_addr, - .localIp = connection->local_addr, - .remotePort = htons(connection->remote_port), - .localPort = htons(connection->local_port), - .ipType = (u8)map_to_addr_type[connection->family], - .connectionType = (u8)map_to_connection_type[connection->type], - .admin_state = connection->admin_state, -#ifdef WITH_POLICY - .priority = connection->priority, - .tags = connection->tags, -#endif /* WITH_POLICY */ - } - }; - rc = snprintf(msg.payload.symbolic, SYMBOLIC_NAME_LEN, "%s", connection->name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_create] Unexpected truncation of symbolic name string"); - //snprintf(msg.payload.interfaceName, INTERFACE_NAME_LEN, "%s", connection->interface_name); - - hc_command_params_t params = { - .cmd = ACTION_CREATE, - .cmd_id = ADD_CONNECTION, - .size_in = sizeof(add_connection_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return s->hc_connection_create(s, connection); } -int -hc_connection_create(hc_sock_t * s, hc_connection_t * connection) +int hc_connection_get(hc_sock_t *s, hc_connection_t *connection, + hc_connection_t **connection_found) { - return _hc_connection_create(s, connection, false); + return s->hc_connection_get(s, connection, connection_found); } -int -hc_connection_create_async(hc_sock_t * s, hc_connection_t * connection) +int hc_connection_update_by_id(hc_sock_t *s, int hc_connection_id, + hc_connection_t *connection) { - return _hc_connection_create(s, connection, true); + return s->hc_connection_update_by_id(s, hc_connection_id, connection); } -/* CONNECTION GET */ - -int -hc_connection_get(hc_sock_t * s, hc_connection_t * connection, - hc_connection_t ** connection_found) +int hc_connection_update(hc_sock_t *s, hc_connection_t *connection_current, + hc_connection_t *connection_updated) { - hc_data_t * connections; - hc_connection_t * found; - - char connection_s[MAXSZ_HC_CONNECTION]; - int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); - if (rc >= MAXSZ_HC_CONNECTION) - WARN("[hc_connection_get] Unexpected truncation of connection string"); - DEBUG("[hc_connection_get] connection=%s", connection_s); - - if (hc_connection_list(s, &connections) < 0) - return -1; - - /* Test */ - if (hc_connection_find(connections, connection, &found) < 0) { - hc_data_free(connections); - return -1; - } - - if (found) { - *connection_found = malloc(sizeof(hc_connection_t)); - if (!*connection_found) - return -1; - **connection_found = *found; - } else { - *connection_found = NULL; - } - - hc_data_free(connections); - - return 0; + return s->hc_connection_update(s, connection_current, connection_updated); } - -/* CONNECTION DELETE */ - -int -_hc_connection_delete(hc_sock_t * s, hc_connection_t * connection, bool async) -{ - char connection_s[MAXSZ_HC_CONNECTION]; - int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); - if (rc >= MAXSZ_HC_CONNECTION) - WARN("[_hc_connection_delete] Unexpected truncation of connection string"); - DEBUG("[_hc_connection_delete] connection=%s async=%s", connection_s, BOOLSTR(async)); - - struct { - header_control_message hdr; - remove_connection_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = REMOVE_CONNECTION, - .length = 1, - .seqNum = 0, - }, - }; - - if (connection->id) { - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", connection->id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); - } else if (*connection->name) { - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", connection->name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); - } else { - hc_connection_t * connection_found; - if (hc_connection_get(s, connection, &connection_found) < 0) - return -1; - if (!connection_found) - return -1; - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", connection_found->id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); - free(connection_found); - } - - hc_command_params_t params = { - .cmd = ACTION_DELETE, - .cmd_id = REMOVE_CONNECTION, - .size_in = sizeof(remove_connection_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_connection_delete(hc_sock_t * s, hc_connection_t * connection) +int hc_connection_delete(hc_sock_t *s, hc_connection_t *connection) { - return _hc_connection_delete(s, connection, false); + return s->hc_connection_delete(s, connection); } -int -hc_connection_delete_async(hc_sock_t * s, hc_connection_t * connection) +int hc_connection_list(hc_sock_t *s, hc_data_t **pdata) { - return _hc_connection_delete(s, connection, true); + return s->hc_connection_list(s, pdata); } -/* CONNECTION LIST */ - -int -_hc_connection_list(hc_sock_t * s, hc_data_t ** pdata, bool async) -{ - DEBUG("[hc_connection_list] async=%s", BOOLSTR(async)); - - struct { - header_control_message hdr; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = LIST_CONNECTIONS, - .length = 0, - .seqNum = 0, - }, - }; - - hc_command_params_t params = { - .cmd = ACTION_LIST, - .cmd_id = LIST_CONNECTIONS, - .size_in = sizeof(list_connections_command), - .size_out = sizeof(hc_connection_t), - .parse = (HC_PARSE)hc_connection_parse, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +int hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, face_state_t state) +{ + return s->hc_connection_set_admin_state(s, conn_id_or_name, state); } -int -hc_connection_list(hc_sock_t * s, hc_data_t ** pdata) +#ifdef WITH_POLICY +int hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) { - return _hc_connection_list(s, pdata, false); + return s->hc_connection_set_priority(s, conn_id_or_name, priority); } -int -hc_connection_list_async(hc_sock_t * s, hc_data_t ** pdata) +int hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) { - return _hc_connection_list(s, pdata, true); + return s->hc_connection_set_tags(s, conn_id_or_name, tags); } +#endif // WITH_POLICY + +GENERATE_FIND(connection); /* CONNECTION VALIDATE */ @@ -1597,8 +663,6 @@ hc_connection_parse(void * in, hc_connection_t * connection) return 0; } -GENERATE_FIND(connection) - /* CONNECTION SNPRINTF */ /* /!\ Please update constants in header file upon changes */ @@ -1632,327 +696,169 @@ hc_connection_snprintf(char * s, size_t size, const hc_connection_t * connection connection_type_str[connection->type]); } -/* CONNECTION SET ADMIN STATE */ - -int -_hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, - face_state_t state, bool async) +int hc_face_create(hc_sock_t *s, hc_face_t *face) { - int rc; - DEBUG("[hc_connection_set_admin_state] connection_id/name=%s admin_state=%s async=%s", - conn_id_or_name, face_state_str[state], BOOLSTR(async)); - struct { - header_control_message hdr; - connection_set_admin_state_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = CONNECTION_SET_ADMIN_STATE, - .length = 1, - .seqNum = 0, - }, - .payload = { - .admin_state = state, - }, - }; - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_set_admin_state] Unexpected truncation of symbolic name string"); - - hc_command_params_t params = { - .cmd = ACTION_SET, - .cmd_id = CONNECTION_SET_ADMIN_STATE, - .size_in = sizeof(connection_set_admin_state_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return s->hc_face_create(s, face); } -int -hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, - face_state_t state) +int hc_face_get(hc_sock_t *s, hc_face_t *face, hc_face_t **face_found) { - return _hc_connection_set_admin_state(s, conn_id_or_name, state, false); + return s->hc_face_get(s, face, face_found); } -int -hc_connection_set_admin_state_async(hc_sock_t * s, const char * conn_id_or_name, - face_state_t state) +int hc_face_delete(hc_sock_t *s, hc_face_t *face) { - return _hc_connection_set_admin_state(s, conn_id_or_name, state, true); + return s->hc_face_delete(s, face); } -int -_hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, - uint32_t priority, bool async) +int hc_face_list(hc_sock_t *s, hc_data_t **pdata) { - int rc; - DEBUG("[hc_connection_set_priority] connection_id/name=%s priority=%d async=%s", - conn_id_or_name, priority, BOOLSTR(async)); - struct { - header_control_message hdr; - connection_set_priority_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = CONNECTION_SET_PRIORITY, - .length = 1, - .seqNum = 0, - }, - .payload = { - .priority = priority, - }, - }; - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_set_priority] Unexpected truncation of symbolic name string"); - - hc_command_params_t params = { - .cmd = ACTION_SET, - .cmd_id = CONNECTION_SET_PRIORITY, - .size_in = sizeof(connection_set_priority_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return s->hc_face_list(s, pdata); } -int -hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, - uint32_t priority) +int hc_face_list_async(hc_sock_t *s) { - return _hc_connection_set_priority(s, conn_id_or_name, priority, false); + return s->hc_face_list_async(s); } -int -hc_connection_set_priority_async(hc_sock_t * s, const char * conn_id_or_name, - uint32_t priority) +int hc_face_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, face_state_t state) { - return _hc_connection_set_priority(s, conn_id_or_name, priority, true); + return s->hc_face_set_admin_state(s, conn_id_or_name, state); } -int -_hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, - policy_tags_t tags, bool async) +#ifdef WITH_POLICY +int hc_face_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) { - int rc; - DEBUG("[hc_connection_set_tags] connection_id/name=%s tags=%d async=%s", - conn_id_or_name, tags, BOOLSTR(async)); - struct { - header_control_message hdr; - connection_set_tags_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = CONNECTION_SET_TAGS, - .length = 1, - .seqNum = 0, - }, - .payload = { - .tags = tags, - }, - }; - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_connection_set_tags] Unexpected truncation of symbolic name string"); - - hc_command_params_t params = { - .cmd = ACTION_SET, - .cmd_id = CONNECTION_SET_TAGS, - .size_in = sizeof(connection_set_tags_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return s->hc_face_set_priority(s, conn_id_or_name, priority); } -int -hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, - policy_tags_t tags) +int hc_face_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) { - return _hc_connection_set_tags(s, conn_id_or_name, tags, false); + return s->hc_face_set_tags(s, conn_id_or_name, tags); } +#endif /* WITH_POLICY */ +/* /!\ Please update constants in header file upon changes */ int -hc_connection_set_tags_async(hc_sock_t * s, const char * conn_id_or_name, - policy_tags_t tags) +hc_face_snprintf(char * s, size_t size, hc_face_t * face) { - return _hc_connection_set_tags(s, conn_id_or_name, tags, true); -} - -/*----------------------------------------------------------------------------* - * Routes - *----------------------------------------------------------------------------*/ + /* URLs are also big enough to contain IP addresses in the hICN case */ + char local[MAXSZ_URL]; + char remote[MAXSZ_URL]; +#ifdef WITH_POLICY + char tags[MAXSZ_POLICY_TAGS]; +#endif /* WITH_POLICY */ + int rc; -/* ROUTE CREATE */ + switch(face->face.type) { + case FACE_TYPE_HICN: + case FACE_TYPE_HICN_LISTENER: + rc = ip_address_snprintf(local, MAXSZ_URL, + &face->face.local_addr, + face->face.family); + if (rc >= MAXSZ_URL) + WARN("[hc_face_snprintf] Unexpected truncation of URL string"); + if (rc < 0) + return rc; + rc = ip_address_snprintf(remote, MAXSZ_URL, + &face->face.remote_addr, + face->face.family); + if (rc >= MAXSZ_URL) + WARN("[hc_face_snprintf] Unexpected truncation of URL string"); + if (rc < 0) + return rc; + break; + case FACE_TYPE_TCP: + case FACE_TYPE_UDP: + case FACE_TYPE_TCP_LISTENER: + case FACE_TYPE_UDP_LISTENER: + rc = url_snprintf(local, MAXSZ_URL, face->face.family, + &face->face.local_addr, + face->face.local_port); + if (rc >= MAXSZ_URL) + WARN("[hc_face_snprintf] Unexpected truncation of URL string"); + if (rc < 0) + return rc; + rc = url_snprintf(remote, MAXSZ_URL, face->face.family, + &face->face.remote_addr, + face->face.remote_port); + if (rc >= MAXSZ_URL) + WARN("[hc_face_snprintf] Unexpected truncation of URL string"); + if (rc < 0) + return rc; + break; + default: + return -1; + } -int -_hc_route_create(hc_sock_t * s, hc_route_t * route, bool async) -{ - char route_s[MAXSZ_HC_ROUTE]; - int rc = hc_route_snprintf(route_s, MAXSZ_HC_ROUTE, route); - if (rc >= MAXSZ_HC_ROUTE) - WARN("[_hc_route_create] Unexpected truncation of route string"); + // [#ID NAME] TYPE LOCAL_URL REMOTE_URL STATE/ADMIN_STATE (TAGS) +#ifdef WITH_POLICY + rc = policy_tags_snprintf(tags, MAXSZ_POLICY_TAGS, face->face.tags); + if (rc >= MAXSZ_POLICY_TAGS) + WARN("[hc_face_snprintf] Unexpected truncation of policy tags string"); if (rc < 0) - WARN("[_hc_route_create] Error building route string"); - else - DEBUG("[hc_route_create] route=%s async=%s", route_s, BOOLSTR(async)); - - if (!IS_VALID_FAMILY(route->family)) - return -1; - - struct { - header_control_message hdr; - add_route_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = ADD_ROUTE, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = route->remote_addr, - .cost = route->cost, - .addressType = (u8)map_to_addr_type[route->family], - .len = route->len, - } - }; - - /* - * The route commands expects the ID (or name that we don't use) as part of - * the symbolicOrConnid attribute. - */ - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", route->face_id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_route_create] Unexpected truncation of symbolic name string"); - - hc_command_params_t params = { - .cmd = ACTION_CREATE, - .cmd_id = ADD_ROUTE, - .size_in = sizeof(add_route_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_route_create(hc_sock_t * s, hc_route_t * route) -{ - return _hc_route_create(s, route, false); -} + return rc; -int -hc_route_create_async(hc_sock_t * s, hc_route_t * route) -{ - return _hc_route_create(s, route, true); + return snprintf(s, size, "[#%d %s] %s %s %s %s %s/%s [%d] (%s)", + face->id, + face->name, + face->face.netdevice.index != NETDEVICE_UNDEFINED_INDEX ? face->face.netdevice.name : "*", + face_type_str[face->face.type], + local, + remote, + face_state_str[face->face.state], + face_state_str[face->face.admin_state], + face->face.priority, + tags); +#else + return snprintf(s, size, "[#%d %s] %s %s %s %s %s/%s", + face->id, + face->name, + face->face.netdevice.index != NETDEVICE_UNDEFINED_INDEX ? face->face.netdevice.name : "*", + face_type_str[face->face.type], + local, + remote, + face_state_str[face->face.state], + face_state_str[face->face.admin_state]); +#endif /* WITH_POLICY */ } -/* ROUTE DELETE */ - int -_hc_route_delete(hc_sock_t * s, hc_route_t * route, bool async) +hc_connection_parse_to_face(void * in, hc_face_t * face) { - char route_s[MAXSZ_HC_ROUTE]; - int rc = hc_route_snprintf(route_s, MAXSZ_HC_ROUTE, route); - if (rc >= MAXSZ_HC_ROUTE) - WARN("[_hc_route_delete] Unexpected truncation of route string"); - DEBUG("[hc_route_delete] route=%s async=%s", route_s, BOOLSTR(async)); - - if (!IS_VALID_FAMILY(route->family)) - return -1; + hc_connection_t connection; - struct { - header_control_message hdr; - remove_route_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = REMOVE_ROUTE, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = route->remote_addr, - .addressType = (u8)map_to_addr_type[route->family], - .len = route->len, - } - }; + if (hc_connection_parse(in, &connection) < 0) { + ERROR("[hc_connection_parse_to_face] Could not parse connection"); + return -1; + } - /* - * The route commands expects the ID (or name that we don't use) as part of - * the symbolicOrConnid attribute. - */ - snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", route->face_id); - - hc_command_params_t params = { - .cmd = ACTION_DELETE, - .cmd_id = REMOVE_ROUTE, - .size_in = sizeof(remove_route_command), - .size_out = 0, - .parse = NULL, - }; + if (hc_connection_to_face(&connection, face) < 0) { + ERROR("[hc_connection_parse_to_face] Could not convert connection to face."); + return -1; + } - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); + return 0; } -int -hc_route_delete(hc_sock_t * s, hc_route_t * route) +int hc_route_create(hc_sock_t * s, hc_route_t * route) { - return _hc_route_delete(s, route, false); + return s->hc_route_create(s, route); } -int -hc_route_delete_async(hc_sock_t * s, hc_route_t * route) +int hc_route_delete(hc_sock_t * s, hc_route_t * route) { - return _hc_route_delete(s, route, true); -} - -/* ROUTE LIST */ - -int -_hc_route_list(hc_sock_t * s, hc_data_t ** pdata, bool async) -{ - //DEBUG("[hc_route_list] async=%s", BOOLSTR(async)); - - struct { - header_control_message hdr; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = LIST_ROUTES, - .length = 0, - .seqNum = 0, - }, - }; - - hc_command_params_t params = { - .cmd = ACTION_LIST, - .cmd_id = LIST_ROUTES, - .size_in = sizeof(list_routes_command), - .size_out = sizeof(hc_route_t), - .parse = (HC_PARSE)hc_route_parse, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); + return s->hc_route_delete(s, route); } -int -hc_route_list(hc_sock_t * s, hc_data_t ** pdata) +int hc_route_list(hc_sock_t * s, hc_data_t ** pdata) { - return _hc_route_list(s, pdata, false); + return s->hc_route_list(s, pdata); } -int -hc_route_list_async(hc_sock_t * s) +int hc_route_list_async(hc_sock_t * s) { - return _hc_route_list(s, NULL, true); + return s->hc_route_list_async(s); } /* ROUTE PARSE */ @@ -2005,19 +911,6 @@ hc_route_snprintf(char * s, size_t size, hc_route_t * route) MAXSZ_COST, route->cost, prefix, MAXSZ_LEN, route->len); } -/*----------------------------------------------------------------------------* - * Face - * - * Face support is not directly available in hicn-light, but we can offer such - * an interface through a combination of listeners and connections. The code - * starts with some conversion functions between faces/listeners/connections. - * - * We also need to make sure that there always exist a (single) listener when a - * connection is created, and in the hICN face case, that there is a single - * connection attached to this listener. - * - *----------------------------------------------------------------------------*/ - /* FACE -> LISTENER */ int @@ -2236,484 +1129,25 @@ hc_connection_to_local_listener(const hc_connection_t * connection, hc_listener_ return 0; } -/* FACE CREATE */ - -int -hc_face_create(hc_sock_t * s, hc_face_t * face) +int hc_punting_create(hc_sock_t *s, hc_punting_t *punting) { - hc_listener_t listener; - hc_listener_t * listener_found; - - hc_connection_t connection; - hc_connection_t * connection_found; - - char face_s[MAXSZ_HC_FACE]; - int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); - if (rc >= MAXSZ_HC_FACE) - WARN("[hc_face_create] Unexpected truncation of face string"); - DEBUG("[hc_face_create] face=%s", face_s); - - switch(face->face.type) - { - case FACE_TYPE_HICN: - case FACE_TYPE_TCP: - case FACE_TYPE_UDP: - if (hc_face_to_connection(face, &connection, true) < 0) { - ERROR("[hc_face_create] Could not convert face to connection."); - return -1; - } - - /* Ensure we have a corresponding local listener */ - if (hc_connection_to_local_listener(&connection, &listener) < 0) { - ERROR("[hc_face_create] Could not convert face to local listener."); - return -1; - } - - if (hc_listener_get(s, &listener, &listener_found) < 0) { - ERROR("[hc_face_create] Could not retrieve listener"); - return -1; - } - - if (!listener_found) { - /* We need to create the listener if it does not exist */ - if (hc_listener_create(s, &listener) < 0) { - ERROR("[hc_face_create] Could not create listener."); - free(listener_found); - return -1; - } - } else { - free(listener_found); - } - - /* Create corresponding connection */ - if (hc_connection_create(s, &connection) < 0) { - ERROR("[hc_face_create] Could not create connection."); - return -1; - } - - /* - * Once the connection is created, we need to list all connections - * and compare with the current one to find the created face ID. - */ - if (hc_connection_get(s, &connection, &connection_found) < 0) { - ERROR("[hc_face_create] Could not retrieve connection"); - return -1; - } - - if (!connection_found) { - ERROR("[hc_face_create] Could not find newly created connection."); - return -1; - } - - face->id = connection_found->id; - free(connection_found); - - break; - - case FACE_TYPE_HICN_LISTENER: - case FACE_TYPE_TCP_LISTENER: - case FACE_TYPE_UDP_LISTENER: - if (hc_face_to_listener(face, &listener) < 0) { - ERROR("Could not convert face to listener."); - return -1; - } - if (hc_listener_create(s, &listener) < 0) { - ERROR("[hc_face_create] Could not create listener."); - return -1; - } - return -1; - break; - default: - ERROR("[hc_face_create] Unknwon face type."); - - return -1; - }; - - return 0; + return s->hc_punting_create(s, punting); } -int -hc_face_get(hc_sock_t * s, hc_face_t * face, hc_face_t ** face_found) +int hc_punting_get(hc_sock_t *s, hc_punting_t *punting, + hc_punting_t **punting_found) { - hc_listener_t listener; - hc_listener_t * listener_found; - - hc_connection_t connection; - hc_connection_t * connection_found; - - char face_s[MAXSZ_HC_FACE]; - int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); - if (rc >= MAXSZ_HC_FACE) - WARN("[hc_face_get] Unexpected truncation of face string"); - DEBUG("[hc_face_get] face=%s", face_s); - - switch(face->face.type) - { - case FACE_TYPE_HICN: - case FACE_TYPE_TCP: - case FACE_TYPE_UDP: - if (hc_face_to_connection(face, &connection, false) < 0) - return -1; - if (hc_connection_get(s, &connection, &connection_found) < 0) - return -1; - if (!connection_found) { - *face_found = NULL; - return 0; - } - *face_found = malloc(sizeof(hc_face_t)); - hc_connection_to_face(connection_found, *face_found); - free(connection_found); - break; - - case FACE_TYPE_HICN_LISTENER: - case FACE_TYPE_TCP_LISTENER: - case FACE_TYPE_UDP_LISTENER: - if (hc_face_to_listener(face, &listener) < 0) - return -1; - if (hc_listener_get(s, &listener, &listener_found) < 0) - return -1; - if (!listener_found) { - *face_found = NULL; - return 0; - } - *face_found = malloc(sizeof(hc_face_t)); - hc_listener_to_face(listener_found, *face_found); - free(listener_found); - break; - - default: - return -1; - } - - return 0; - -} - -/* FACE DELETE */ - -int -hc_face_delete(hc_sock_t * s, hc_face_t * face) -{ - char face_s[MAXSZ_HC_FACE]; - int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); - if (rc >= MAXSZ_HC_FACE) - WARN("[hc_face_delete] Unexpected truncation of face string"); - DEBUG("[hc_face_delete] face=%s", face_s); - - hc_connection_t connection; - if (hc_face_to_connection(face, &connection, false) < 0) { - ERROR("[hc_face_delete] Could not convert face to connection."); - return -1; - } - - if (hc_connection_delete(s, &connection) < 0) { - ERROR("[hc_face_delete] Error removing connection"); - return -1; - } - - /* If this is the last connection attached to the listener, remove it */ - - hc_data_t * connections; - hc_listener_t listener = {{0}}; - - /* - * Ensure we have a corresponding local listener - * NOTE: hc_face_to_listener is not appropriate - */ - if (hc_connection_to_local_listener(&connection, &listener) < 0) { - ERROR("[hc_face_create] Could not convert face to local listener."); - return -1; - } -#if 1 - /* - * The name is generated to prepare listener creation, we need it to be - * empty for deletion. The id should not need to be reset though. - */ - listener.id = 0; - memset(listener.name, 0, sizeof(listener.name)); -#endif - if (hc_connection_list(s, &connections) < 0) { - ERROR("[hc_face_delete] Error getting the list of listeners"); - return -1; - } - - bool delete = true; - foreach_connection(c, connections) { - if ((ip_address_cmp(&c->local_addr, &listener.local_addr, c->family) == 0) && - (c->local_port == listener.local_port) && - (strcmp(c->interface_name, listener.interface_name) == 0)) { - delete = false; - } - } - - if (delete) { - if (hc_listener_delete(s, &listener) < 0) { - ERROR("[hc_face_delete] Error removing listener"); - return -1; - } - } - - hc_data_free(connections); - - return 0; - - + return s->hc_punting_get(s, punting, punting_found); } -/* FACE LIST */ - -int -hc_face_list(hc_sock_t * s, hc_data_t ** pdata) +int hc_punting_delete(hc_sock_t *s, hc_punting_t *punting) { - hc_data_t * connection_data; - hc_face_t face; - - //DEBUG("[hc_face_list]"); - - if (hc_connection_list(s, &connection_data) < 0) { - ERROR("[hc_face_list] Could not list connections."); - return -1; - } - - hc_data_t * face_data = hc_data_create(sizeof(hc_connection_t), sizeof(hc_face_t), NULL); - foreach_connection(c, connection_data) { - if (hc_connection_to_face(c, &face) < 0) { - ERROR("[hc_face_list] Could not convert connection to face."); - goto ERR; - } - hc_data_push(face_data, &face); - } - - *pdata = face_data; - hc_data_free(connection_data); - return 0; - -ERR: - hc_data_free(connection_data); - return -1; + return s->hc_punting_delete(s, punting); } -int -hc_connection_parse_to_face(void * in, hc_face_t * face) +int hc_punting_list(hc_sock_t *s, hc_data_t **pdata) { - hc_connection_t connection; - - if (hc_connection_parse(in, &connection) < 0) { - ERROR("[hc_connection_parse_to_face] Could not parse connection"); - return -1; - } - - if (hc_connection_to_face(&connection, face) < 0) { - ERROR("[hc_connection_parse_to_face] Could not convert connection to face."); - return -1; - } - - return 0; -} - - -int -hc_face_list_async(hc_sock_t * s) -{ - struct { - header_control_message hdr; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = LIST_CONNECTIONS, - .length = 0, - .seqNum = 0, - }, - }; - - hc_command_params_t params = { - .cmd = ACTION_LIST, - .cmd_id = LIST_CONNECTIONS, - .size_in = sizeof(list_connections_command), - .size_out = sizeof(hc_face_t), - .parse = (HC_PARSE)hc_connection_parse_to_face, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, true); -} - -/* /!\ Please update constants in header file upon changes */ -int -hc_face_snprintf(char * s, size_t size, hc_face_t * face) -{ - /* URLs are also big enough to contain IP addresses in the hICN case */ - char local[MAXSZ_URL]; - char remote[MAXSZ_URL]; -#ifdef WITH_POLICY - char tags[MAXSZ_POLICY_TAGS]; -#endif /* WITH_POLICY */ - int rc; - - switch(face->face.type) { - case FACE_TYPE_HICN: - case FACE_TYPE_HICN_LISTENER: - rc = ip_address_snprintf(local, MAXSZ_URL, - &face->face.local_addr, - face->face.family); - if (rc >= MAXSZ_URL) - WARN("[hc_face_snprintf] Unexpected truncation of URL string"); - if (rc < 0) - return rc; - rc = ip_address_snprintf(remote, MAXSZ_URL, - &face->face.remote_addr, - face->face.family); - if (rc >= MAXSZ_URL) - WARN("[hc_face_snprintf] Unexpected truncation of URL string"); - if (rc < 0) - return rc; - break; - case FACE_TYPE_TCP: - case FACE_TYPE_UDP: - case FACE_TYPE_TCP_LISTENER: - case FACE_TYPE_UDP_LISTENER: - rc = url_snprintf(local, MAXSZ_URL, face->face.family, - &face->face.local_addr, - face->face.local_port); - if (rc >= MAXSZ_URL) - WARN("[hc_face_snprintf] Unexpected truncation of URL string"); - if (rc < 0) - return rc; - rc = url_snprintf(remote, MAXSZ_URL, face->face.family, - &face->face.remote_addr, - face->face.remote_port); - if (rc >= MAXSZ_URL) - WARN("[hc_face_snprintf] Unexpected truncation of URL string"); - if (rc < 0) - return rc; - break; - default: - return -1; - } - - // [#ID NAME] TYPE LOCAL_URL REMOTE_URL STATE/ADMIN_STATE (TAGS) -#ifdef WITH_POLICY - rc = policy_tags_snprintf(tags, MAXSZ_POLICY_TAGS, face->face.tags); - if (rc >= MAXSZ_POLICY_TAGS) - WARN("[hc_face_snprintf] Unexpected truncation of policy tags string"); - if (rc < 0) - return rc; - - return snprintf(s, size, "[#%d %s] %s %s %s %s %s/%s [%d] (%s)", - face->id, - face->name, - face->face.netdevice.index != NETDEVICE_UNDEFINED_INDEX ? face->face.netdevice.name : "*", - face_type_str[face->face.type], - local, - remote, - face_state_str[face->face.state], - face_state_str[face->face.admin_state], - face->face.priority, - tags); -#else - return snprintf(s, size, "[#%d %s] %s %s %s %s %s/%s", - face->id, - face->name, - face->face.netdevice.index != NETDEVICE_UNDEFINED_INDEX ? face->face.netdevice.name : "*", - face_type_str[face->face.type], - local, - remote, - face_state_str[face->face.state], - face_state_str[face->face.admin_state]); -#endif /* WITH_POLICY */ -} - -int -hc_face_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, - face_state_t admin_state) -{ - return hc_connection_set_admin_state(s, conn_id_or_name, admin_state); -} - -int -hc_face_set_priority(hc_sock_t * s, const char * conn_id_or_name, - uint32_t priority) -{ - return hc_connection_set_priority(s, conn_id_or_name, priority); -} - -int -hc_face_set_tags(hc_sock_t * s, const char * conn_id_or_name, - policy_tags_t tags) -{ - return hc_connection_set_tags(s, conn_id_or_name, tags); -} - -/*----------------------------------------------------------------------------* - * Punting - *----------------------------------------------------------------------------*/ - -int -_hc_punting_create(hc_sock_t * s, hc_punting_t * punting, bool async) -{ - int rc; - - if (hc_punting_validate(punting) < 0) - return -1; - - struct { - header_control_message hdr; - add_punting_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = ADD_PUNTING, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = punting->prefix, - .addressType = (u8)map_to_addr_type[punting->family], - .len = punting->prefix_len, - } - }; - rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", punting->face_id); - if (rc >= SYMBOLIC_NAME_LEN) - WARN("[_hc_punting_create] Unexpected truncation of symbolic name string"); - - hc_command_params_t params = { - .cmd = ACTION_CREATE, - .cmd_id = ADD_PUNTING, - .size_in = sizeof(add_punting_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_punting_create(hc_sock_t * s, hc_punting_t * punting) -{ - return _hc_punting_create(s, punting, false); -} - -int -hc_punting_create_async(hc_sock_t * s, hc_punting_t * punting) -{ - return _hc_punting_create(s, punting, true); -} - -int hc_punting_get(hc_sock_t * s, hc_punting_t * punting, hc_punting_t ** punting_found) -{ - ERROR("hc_punting_get not (yet) implemented."); - return -1; -} - -int hc_punting_delete(hc_sock_t * s, hc_punting_t * punting) -{ - ERROR("hc_punting_delete not (yet) implemented."); - return -1; -} - -int hc_punting_list(hc_sock_t * s, hc_data_t ** pdata) -{ - ERROR("hc_punting_list not (yet) implemented."); - return -1; + return s->hc_punting_list(s, pdata); } int hc_punting_validate(const hc_punting_t * punting) @@ -2768,130 +1202,24 @@ int hc_punting_snprintf(char * s, size_t size, hc_punting_t * punting) return -1; } - -/*----------------------------------------------------------------------------* - * Cache - *----------------------------------------------------------------------------*/ - -int -_hc_cache_set_store(hc_sock_t * s, int enabled, bool async) -{ - struct { - header_control_message hdr; - cache_store_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = CACHE_STORE, - .length = 1, - .seqNum = 0, - }, - .payload = { - .activate = enabled, - } - }; - - hc_command_params_t params = { - .cmd = ACTION_SET, - .cmd_id = CACHE_STORE, - .size_in = sizeof(cache_store_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_cache_set_store(hc_sock_t * s, int enabled) +int hc_cache_set_store(hc_sock_t *s, int enabled) { - return _hc_cache_set_store(s, enabled, false); + return s->hc_cache_set_store(s, enabled); } -int -hc_cache_set_store_async(hc_sock_t * s, int enabled) +int hc_cache_set_serve(hc_sock_t *s, int enabled) { - return _hc_cache_set_store(s, enabled, true); + return s->hc_cache_set_serve(s, enabled); } -int -_hc_cache_set_serve(hc_sock_t * s, int enabled, bool async) -{ - struct { - header_control_message hdr; - cache_serve_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = CACHE_SERVE, - .length = 1, - .seqNum = 0, - }, - .payload = { - .activate = enabled, - } - }; - - hc_command_params_t params = { - .cmd = ACTION_SET, - .cmd_id = CACHE_SERVE, - .size_in = sizeof(cache_serve_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_cache_set_serve(hc_sock_t * s, int enabled) -{ - return _hc_cache_set_serve(s, enabled, false); -} - -int -hc_cache_set_serve_async(hc_sock_t * s, int enabled) -{ - return _hc_cache_set_serve(s, enabled, true); -} - -/*----------------------------------------------------------------------------* - * Strategy - *----------------------------------------------------------------------------*/ - -// per prefix -int -hc_strategy_set(hc_sock_t * s /* XXX */) +int hc_strategy_list(hc_sock_t *s, hc_data_t **data) { - return 0; + return s->hc_strategy_list(s, data); } -/* How to retrieve that from the forwarder ? */ -static const char * strategies[] = { - "random", - "load_balancer", -}; - -#define ARRAY_SIZE(array) (sizeof(array) / sizeof(*array)) - -int -hc_strategy_list(hc_sock_t * s, hc_data_t ** data) +int hc_strategy_set(hc_sock_t *s /* XXX */) { - int rc; - - *data = hc_data_create(0, sizeof(hc_strategy_t), NULL); - - for (unsigned i = 0; i < ARRAY_SIZE(strategies); i++) { - hc_strategy_t * strategy = (hc_strategy_t*)hc_data_get_next(*data); - if (!strategy) - return -1; - rc = snprintf(strategy->name, MAXSZ_HC_STRATEGY, "%s", strategies[i]); - if (rc >= MAXSZ_HC_STRATEGY) - WARN("[hc_strategy_list] Unexpected truncation of strategy name string"); - (*data)->size++; - } - - return 0; + return s->hc_strategy_set(s); } /* /!\ Please update constants in header file upon changes */ @@ -2901,187 +1229,33 @@ hc_strategy_snprintf(char * s, size_t size, hc_strategy_t * strategy) return snprintf(s, size, "%s", strategy->name); } -/*----------------------------------------------------------------------------* - * WLDR - *----------------------------------------------------------------------------*/ - -// per connection -int -hc_wldr_set(hc_sock_t * s /* XXX */) +int hc_wldr_set(hc_sock_t *s /* XXX */) { - return 0; + return s->hc_wldr_set(s); } -/*----------------------------------------------------------------------------* - * MAP-Me - *----------------------------------------------------------------------------*/ - -int -hc_mapme_set(hc_sock_t * s, int enabled) +int hc_mapme_set(hc_sock_t *s, int enabled) { - return 0; + return s->hc_mapme_set(s, enabled); } -int -hc_mapme_set_discovery(hc_sock_t * s, int enabled) +int hc_mapme_set_discovery(hc_sock_t *s, int enabled) { - return 0; + return s->hc_mapme_set_discovery(s, enabled); } -int -hc_mapme_set_timescale(hc_sock_t * s, double timescale) +int hc_mapme_set_timescale(hc_sock_t *s, double timescale) { - return 0; + return s->hc_mapme_set_timescale(s, timescale); } -int -hc_mapme_set_retx(hc_sock_t * s, double timescale) +int hc_mapme_set_retx(hc_sock_t *s, double timescale) { - return 0; + return s->hc_mapme_set_retx(s, timescale); } -/*----------------------------------------------------------------------------* - * Policy - *----------------------------------------------------------------------------*/ - #ifdef WITH_POLICY -/* POLICY CREATE */ - -int -_hc_policy_create(hc_sock_t * s, hc_policy_t * policy, bool async) -{ - if (!IS_VALID_FAMILY(policy->family)) - return -1; - - struct { - header_control_message hdr; - add_policy_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = ADD_POLICY, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = policy->remote_addr, - .addressType = (u8)map_to_addr_type[policy->family], - .len = policy->len, - .policy = policy->policy, - } - }; - - hc_command_params_t params = { - .cmd = ACTION_CREATE, - .cmd_id = ADD_POLICY, - .size_in = sizeof(add_policy_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_policy_create(hc_sock_t * s, hc_policy_t * policy) -{ - return _hc_policy_create(s, policy, false); -} - -int -hc_policy_create_async(hc_sock_t * s, hc_policy_t * policy) -{ - return _hc_policy_create(s, policy, true); -} - -/* POLICY DELETE */ - -int -_hc_policy_delete(hc_sock_t * s, hc_policy_t * policy, bool async) -{ - if (!IS_VALID_FAMILY(policy->family)) - return -1; - - struct { - header_control_message hdr; - remove_policy_command payload; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = REMOVE_POLICY, - .length = 1, - .seqNum = 0, - }, - .payload = { - .address = policy->remote_addr, - .addressType = (u8)map_to_addr_type[policy->family], - .len = policy->len, - } - }; - - hc_command_params_t params = { - .cmd = ACTION_DELETE, - .cmd_id = REMOVE_POLICY, - .size_in = sizeof(remove_policy_command), - .size_out = 0, - .parse = NULL, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); -} - -int -hc_policy_delete(hc_sock_t * s, hc_policy_t * policy) -{ - return _hc_policy_delete(s, policy, false); -} - -int -hc_policy_delete_async(hc_sock_t * s, hc_policy_t * policy) -{ - return _hc_policy_delete(s, policy, true); -} - -/* POLICY LIST */ - -int -_hc_policy_list(hc_sock_t * s, hc_data_t ** pdata, bool async) -{ - struct { - header_control_message hdr; - } msg = { - .hdr = { - .messageType = REQUEST_LIGHT, - .commandID = LIST_POLICIES, - .length = 0, - .seqNum = 0, - }, - }; - - hc_command_params_t params = { - .cmd = ACTION_LIST, - .cmd_id = LIST_POLICIES, - .size_in = sizeof(list_policies_command), - .size_out = sizeof(hc_policy_t), - .parse = (HC_PARSE)hc_policy_parse, - }; - - return hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); -} - -int -hc_policy_list(hc_sock_t * s, hc_data_t ** pdata) -{ - return _hc_policy_list(s, pdata, false); -} - -int -hc_policy_list_async(hc_sock_t * s, hc_data_t ** pdata) -{ - return _hc_policy_list(s, pdata, true); -} - /* POLICY PARSE */ int @@ -3114,4 +1288,4 @@ hc_policy_snprintf(char * s, size_t size, hc_policy_t * policy) return 0; } -#endif /* WITH_POLICY */ +#endif /* WITH_POLICY */
\ No newline at end of file diff --git a/ctrl/libhicnctrl/src/api_private.h b/ctrl/libhicnctrl/src/api_private.h new file mode 100644 index 000000000..3922e1f3c --- /dev/null +++ b/ctrl/libhicnctrl/src/api_private.h @@ -0,0 +1,208 @@ +/* + * Copyright (c) 2017-2019 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef HICN_API_PRIVATE_H +#define HICN_API_PRIVATE_H + +#include <hicn/ctrl/api.h> +#include <hicn/ctrl/commands.h> +#include <hicn/util/token.h> +#include <hicn/util/log.h> +#include <hicn/util/map.h> + +#define INT_CMP(x, y) ((x > y) ? 1 : (x < y) ? -1 : 0) +#define ARRAY_SIZE(array) (sizeof(array) / sizeof(*array)) + +#if 0 +#ifdef __APPLE__ +#define RANDBYTE() (u8)(arc4random() & 0xFF) +#else +#define RANDBYTE() (u8)(random() & 0xFF) +#endif +#endif +#define RANDBYTE() (u8)(rand() & 0xFF) + +hc_connection_type_t +connection_type_from_str(const char * str); + +extern const hc_connection_type_t map_from_list_connections_type[]; +extern const hc_connection_type_t map_from_encap_type[]; +extern const connection_type map_to_connection_type[]; +extern const listener_mode map_to_listener_mode[]; +extern const hc_connection_state_t map_from_list_connections_state[]; +extern const int map_from_addr_type[]; +extern const address_type map_to_addr_type[]; +extern const char * connection_state_str[]; +extern const char * connection_type_str[]; + +typedef enum { + ENCAP_TCP, + ENCAP_UDP, + ENCAP_ETHER, + ENCAP_LOCAL, + ENCAP_HICN +} EncapType; + +#define connection_state_to_face_state(x) ((face_state_t)(x)) +#define face_state_to_connection_state(x) ((hc_connection_state_t)(x)) + +#define IS_VALID_ADDR_TYPE(x) ((x >= ADDR_INET) && (x <= ADDR_UNIX)) + +#define IS_VALID_CONNECTION_TYPE(x) IS_VALID_ENUM_TYPE(CONNECTION_TYPE, x) + +typedef struct hc_sock_impl_s hc_sock_impl_t; + +int hc_data_ensure_available(hc_data_t * data, size_t count); +u8 *hc_data_get_next(hc_data_t * data); +int hc_data_set_error(hc_data_t * data); + +int +hc_connection_parse_to_face(void * in, hc_face_t * face); + +int +hc_listener_to_face(const hc_listener_t * listener, hc_face_t * face); + +int +hc_connection_to_face(const hc_connection_t * connection, hc_face_t * face); + +int +hc_face_to_listener(const hc_face_t * face, hc_listener_t * listener); + +int +hc_connection_to_local_listener(const hc_connection_t * connection, hc_listener_t * listener); + +int +hc_face_to_connection(const hc_face_t * face, hc_connection_t * connection, bool generate_name); + +struct hc_sock_s { + int (*hc_sock_get_next_seq)(hc_sock_t *s); + int (*hc_sock_set_nonblocking)(hc_sock_t *s); + int (*hc_sock_get_fd)(hc_sock_t *s); + int (*hc_sock_connect)(hc_sock_t *s); + int (*hc_sock_get_available)(hc_sock_t *s, u8 **buffer, size_t *size); + int (*hc_sock_send)(hc_sock_t *s, hc_msg_t *msg, size_t msglen, int seq); + int (*hc_sock_recv)(hc_sock_t *s); + int (*hc_sock_process)(hc_sock_t *s, hc_data_t **data); + int (*hc_sock_callback)(hc_sock_t *s, hc_data_t **data); + int (*hc_sock_reset)(hc_sock_t *s); + void (*hc_sock_free)(hc_sock_t *s); + + int (*hc_listener_create)(hc_sock_t *s, hc_listener_t *listener); + int (*hc_listener_create_async)(hc_sock_t *s, hc_listener_t *listener); + int (*hc_listener_get)(hc_sock_t *s, hc_listener_t *listener, + hc_listener_t **listener_found); + int (*hc_listener_delete)(hc_sock_t *s, hc_listener_t *listener); + int (*hc_listener_delete_async)(hc_sock_t *s, hc_listener_t *listener); + int (*hc_listener_list)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_listener_list_async)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_listener_validate)(const hc_listener_t *listener); + int (*hc_listener_cmp)(const hc_listener_t *l1, const hc_listener_t *l2); + int (*hc_listener_parse)(void *in, hc_listener_t *listener); + + int (*hc_connection_create)(hc_sock_t *s, hc_connection_t *connection); + int (*hc_connection_create_async)(hc_sock_t *s, hc_connection_t *connection); + int (*hc_connection_get)(hc_sock_t *s, hc_connection_t *connection, + hc_connection_t **connection_found); + int (*hc_connection_update_by_id)(hc_sock_t *s, int hc_connection_id, + hc_connection_t *connection); + int (*hc_connection_update)(hc_sock_t *s, hc_connection_t *connection_current, + hc_connection_t *connection_updated); + int (*hc_connection_delete)(hc_sock_t *s, hc_connection_t *connection); + int (*hc_connection_delete_async)(hc_sock_t *s, hc_connection_t *connection); + int (*hc_connection_list)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_connection_list_async)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_connection_validate)(const hc_connection_t *connection); + int (*hc_connection_cmp)(const hc_connection_t *c1, const hc_connection_t *c2); + int (*hc_connection_parse)(void *in, hc_connection_t *connection); + int (*hc_connection_set_admin_state)(hc_sock_t * s, const char * conn_id_or_name, face_state_t state); + int (*hc_connection_set_admin_state_async)(hc_sock_t * s, const char * conn_id_or_name, face_state_t state); + +#ifdef WITH_POLICY + int (*hc_connection_set_priority)(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority); + int (*hc_connection_set_priority_async)(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority); + int (*hc_connection_set_tags)(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags); + int (*hc_connection_set_tags_async)(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags); +#endif // WITH_POLICY + + int (*hc_connection_snprintf)(char *s, size_t size, + const hc_connection_t *connection); + + int (*hc_face_create)(hc_sock_t *s, hc_face_t *face); + int (*hc_face_get)(hc_sock_t *s, hc_face_t *face, hc_face_t **face_found); + int (*hc_face_delete)(hc_sock_t *s, hc_face_t *face); + int (*hc_face_list)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_face_list_async)(hc_sock_t *s); + int (*hc_face_set_admin_state)(hc_sock_t * s, const char * conn_id_or_name, face_state_t state); + int (*hc_face_set_admin_state_async)(hc_sock_t * s, const char * conn_id_or_name, face_state_t state); + +#ifdef WITH_POLICY + int (*hc_face_set_priority)(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority); + int (*hc_face_set_priority_async)(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority); + int (*hc_face_set_tags)(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags); + int (*hc_face_set_tags_async)(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags); +#endif // WITH_POLICY + + int (*hc_face_snprintf)(char *s, size_t size, hc_face_t *face); + + int (*hc_route_parse)(void *in, hc_route_t *route); + int (*hc_route_create)(hc_sock_t * s, hc_route_t * route); + int (*hc_route_create_async)(hc_sock_t * s, hc_route_t * route); + int (*hc_route_delete)(hc_sock_t * s, hc_route_t * route); + int (*hc_route_delete_async)(hc_sock_t * s, hc_route_t * route); + int (*hc_route_list)(hc_sock_t * s, hc_data_t ** pdata); + int (*hc_route_list_async)(hc_sock_t * s); + + int (*hc_punting_create)(hc_sock_t *s, hc_punting_t *punting); + int (*hc_punting_create_async)(hc_sock_t *s, hc_punting_t *punting); + int (*hc_punting_get)(hc_sock_t *s, hc_punting_t *punting, + hc_punting_t **punting_found); + int (*hc_punting_delete)(hc_sock_t *s, hc_punting_t *punting); + int (*hc_punting_list)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_punting_validate)(const hc_punting_t *punting); + int (*hc_punting_cmp)(const hc_punting_t *c1, const hc_punting_t *c2); + int (*hc_punting_parse)(void *in, hc_punting_t *punting); + + int (*hc_cache_set_store)(hc_sock_t *s, int enabled); + int (*hc_cache_set_serve)(hc_sock_t *s, int enabled); + int (*hc_cache_set_store_async)(hc_sock_t *s, int enabled); + int (*hc_cache_set_serve_async)(hc_sock_t *s, int enabled); + + int (*hc_strategy_list)(hc_sock_t *s, hc_data_t **data); + int (*hc_strategy_snprintf)(char *s, size_t size, hc_strategy_t *strategy); + int (*hc_strategy_set)(hc_sock_t *s /* XXX */); + + int (*hc_wldr_set)(hc_sock_t *s /* XXX */); + + int (*hc_mapme_set)(hc_sock_t *s, int enabled); + int (*hc_mapme_set_discovery)(hc_sock_t *s, int enabled); + int (*hc_mapme_set_timescale)(hc_sock_t *s, double timescale); + int (*hc_mapme_set_retx)(hc_sock_t *s, double timescale); + +#ifdef WITH_POLICY + int (*hc_policy_parse)(void *in, hc_policy_t *policy); + int (*hc_policy_create)(hc_sock_t *s, hc_policy_t *policy); + int (*hc_policy_create_async)(hc_sock_t *s, hc_policy_t *policy); + int (*hc_policy_delete)(hc_sock_t *s, hc_policy_t *policy); + int (*hc_policy_delete_async)(hc_sock_t *s, hc_policy_t *policy); + int (*hc_policy_list)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_policy_list_async)(hc_sock_t *s, hc_data_t **pdata); + int (*hc_policy_snprintf)(char *s, size_t size, hc_policy_t *policy); +#endif // WITH_POLICY + + // Reference to module containing the implementation + void *handle; +}; + +#endif // HICN_API_PRIVATE_H
\ No newline at end of file diff --git a/ctrl/libhicnctrl/src/cli.c b/ctrl/libhicnctrl/src/cli.c index fc81139d6..064eb77e3 100644 --- a/ctrl/libhicnctrl/src/cli.c +++ b/ctrl/libhicnctrl/src/cli.c @@ -48,6 +48,9 @@ foreach_object #undef _ } hc_object_t; +#define HICNLIGHT_PARAM "hicnlight" +#define VPP_PARAM "vpp" + void usage_header() { @@ -247,7 +250,7 @@ usage_connection(const char * prog, bool header, bool verbose) void usage(const char * prog) { - fprintf(stderr, "Usage: %s [ [-d] [-f|-l|-c|-r] PARAMETERS | [-F|-L|-C|-R] ]\n", prog); + fprintf(stderr, "Usage: %s [ -z forwarder (hicnlight | vpp) ] [ [-d] [-f|-l|-c|-r] PARAMETERS | [-F|-L|-C|-R] ]\n", prog); fprintf(stderr, "\n"); fprintf(stderr, "High-level commands\n"); fprintf(stderr, "\n"); @@ -319,15 +322,25 @@ foreach_face_type int -parse_options(int argc, char *argv[], hc_command_t * command) +parse_options(int argc, char *argv[], hc_command_t * command, forwarder_t *forwarder) { command->object = OBJECT_UNDEFINED; command->action = ACTION_CREATE; int opt; int family; - while ((opt = getopt(argc, argv, "dflcrFLCRSh")) != -1) { + while ((opt = getopt(argc, argv, "dflcrFLCRShz:")) != -1) { switch (opt) { + case 'z' : + if (strncmp(optarg, VPP_PARAM, strlen(VPP_PARAM)) == 0) { + *forwarder = VPP; + } else if (strncmp(optarg, HICNLIGHT_PARAM, strlen(HICNLIGHT_PARAM))) { + *forwarder = HICNLIGHT; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + break; case 'd': command->action = ACTION_DELETE; break; @@ -380,7 +393,7 @@ parse_options(int argc, char *argv[], hc_command_t * command) switch(command->action) { case ACTION_CREATE: if ((argc - optind != 5) && (argc - optind != 6)) { - usage_face_create(argv[0], true, false); + usage_face_create(argv[0], true, false); goto ERR_PARAM; } /* NAME will be autogenerated (and currently not used) */ @@ -693,10 +706,12 @@ int main(int argc, char *argv[]) char buf_route[MAXSZ_HC_ROUTE]; char buf_strategy[MAXSZ_HC_STRATEGY]; - if (parse_options(argc, argv, &command) < 0) + forwarder_t forwarder = HICNLIGHT; + + if (parse_options(argc, argv, &command, &forwarder) < 0) die(OPTIONS, "Bad arguments"); - hc_sock_t * s = hc_sock_create(); + hc_sock_t * s = hc_sock_create_forwarder(forwarder); if (!s) die(SOCKET, "Error creating socket."); diff --git a/ctrl/libhicnctrl/src/modules/CMakeLists.txt b/ctrl/libhicnctrl/src/modules/CMakeLists.txt new file mode 100644 index 000000000..e07ab8c99 --- /dev/null +++ b/ctrl/libhicnctrl/src/modules/CMakeLists.txt @@ -0,0 +1,48 @@ +# Copyright (c) 2021 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + + +list(APPEND HICNLIGHT_MODULE_SOURCE_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/hicn_light_api.c +) + +build_module(hicnlightctrl_module + SHARED + SOURCES ${HICNLIGHT_MODULE_SOURCE_FILES} + DEPENDS ${DEPENDENCIES} + COMPONENT ${LIBHICNCTRL_COMPONENT} + INCLUDE_DIRS ${INCLUDE_DIRS} + DEFINITIONS ${COMPILER_DEFINITIONS} + COMPILE_OPTIONS ${COMPILE_FLAGS} +) + +if(BUILD_HICNPLUGIN AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") + list(APPEND HICNLIGHT_PLUGIN_SOURCE_FILES + ${CMAKE_CURRENT_SOURCE_DIR}/hicn_plugin_api.c + ) + + build_module(vppctrl_module + SHARED + SOURCES ${HICNLIGHT_PLUGIN_SOURCE_FILES} + DEPENDS ${DEPENDENCIES} + LINK_LIBRARIES ${HICNPLUGIN_LIBRARIES} ${SAFE_VAPI_LIBRARIES} + COMPONENT ${LIBHICNCTRL_COMPONENT_MODULES} + INCLUDE_DIRS ${INCLUDE_DIRS} + DEFINITIONS ${COMPILER_DEFINITIONS} + COMPILE_OPTIONS ${COMPILE_FLAGS} + LINK_FLAGS "-Wl,-unresolved-symbols=ignore-in-shared-libs" + ) + +endif()
\ No newline at end of file diff --git a/ctrl/libhicnctrl/src/modules/hicn_light_api.c b/ctrl/libhicnctrl/src/modules/hicn_light_api.c new file mode 100644 index 000000000..d1a055777 --- /dev/null +++ b/ctrl/libhicnctrl/src/modules/hicn_light_api.c @@ -0,0 +1,2278 @@ +/* + * Copyright (c) 2017-2019 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * \file api.c + * \brief Implementation of hICN control library API + */ + +#include "api_private.h" + +#include <assert.h> // assert +#include <stdbool.h> +#include <stdio.h> // snprintf +#include <string.h> // memmove, strcasecmp +#include <sys/socket.h> // socket +#include <unistd.h> // close, fcntl +#include <fcntl.h> // fcntl +#include <sys/types.h> // getpid +#include <unistd.h> // getpid +#ifdef __linux__ +#include <sys/syscall.h> +#define gettid() syscall(SYS_gettid) +#endif /* __linux__ */ +#include <strings.h> + +#define PORT 9695 + +#define BOOLSTR(x) ((x) ? "true" : "false") + +/* + * Internal state associated to a pending request + */ +typedef struct { + int seq; + hc_data_t * data; + /* Information used to process results */ + int size_in; + int (*parse)(const u8 * src, u8 * dst); +} hc_sock_request_t; + +/** + * Messages to the forwarder might be multiplexed thanks to the seqNum fields in + * the header_control_message structure. The forwarder simply answers back the + * original sequence number. We maintain a map of such sequence number to + * outgoing queries so that replied can be demultiplexed and treated + * appropriately. + */ +TYPEDEF_MAP_H(hc_sock_map, int, hc_sock_request_t *); +TYPEDEF_MAP(hc_sock_map, int, hc_sock_request_t *, int_cmp, int_snprintf, generic_snprintf); + +struct hc_sock_light_s { + /* This must be the first element of the struct */ + hc_sock_t vft; + + char * url; + int fd; + + /* Partial receive buffer */ + u8 buf[RECV_BUFLEN]; + size_t roff; /**< Read offset */ + size_t woff; /**< Write offset */ + + /* + * Because received messages are potentially unbounded in size, we might not + * guarantee that we can store a full packet before processing it. We must + * implement a very simple state machine remembering the current parsing + * status in order to partially process the packet. + */ + size_t remaining; + u32 send_id; + + /* Next sequence number to be used for requests */ + int seq; + + /* Request being parsed (NULL if none) */ + hc_sock_request_t * cur_request; + + bool async; + hc_sock_map_t * map; +}; + +typedef struct hc_sock_light_s hc_sock_light_t; + +#define TO_HC_SOCK_LIGHT(s) (hc_sock_light_t*)(s) + +hc_sock_request_t * +hc_sock_request_create(int seq, hc_data_t * data, HC_PARSE parse) +{ + assert(data); + + hc_sock_request_t * request = malloc(sizeof(hc_sock_request_t)); + if (!request) + return NULL; + request->seq = seq; + request->data = data; + request->parse = parse; + return request; +} + +void +hc_sock_light_request_free(hc_sock_request_t * request) +{ + free(request); +} + +/* + * list was working with all seq set to 0, but it seems hicnLightControl uses + * 1, and replies with the same seqno + */ +#define HICN_CTRL_SEND_SEQ_INIT 1 +#define HICN_CTRL_RECV_SEQ_INIT 1 + +#define MAX(x, y) ((x > y) ? x : y) + +/** + * In practise, we want to preserve enough room to store a full packet of + * average expected size (say a header + N payload elements). + */ +#define AVG_ELEMENTS (1 << DEFAULT_SIZE_LOG) +#define AVG_BUFLEN (sizeof(hc_msg_header_t) + AVG_ELEMENTS * sizeof(hc_msg_payload_t)) + +/* + * We should at least have buffer space allowing to store one processable unit + * of data, either the header of the maximum possible payload + */ +#define MIN_BUFLEN MAX(sizeof(hc_msg_header_t), sizeof(hc_msg_payload_t)) + +static const struct in6_addr loopback_addr = IN6ADDR_LOOPBACK_INIT; + +/****************************************************************************** + * Message helper types and aliases + ******************************************************************************/ + +#define foreach_hc_command \ + _(add_connection) \ + _(remove_connection) \ + _(list_connections) \ + _(add_listener) \ + _(remove_listener) \ + _(list_listeners) \ + _(add_route) \ + _(remove_route) \ + _(list_routes) \ + _(cache_store) \ + _(cache_serve) \ + /*_(cache_clear) */ \ + _(set_strategy) \ + _(set_wldr) \ + _(add_punting) \ + _(mapme_activator) \ + _(mapme_timing) + +typedef header_control_message hc_msg_header_t; + +typedef union { +#define _(x) x ## _command x; + foreach_hc_command +#undef _ +} hc_msg_payload_t; + + +typedef struct hc_msg_s { + hc_msg_header_t hdr; + hc_msg_payload_t payload; +} hc_msg_t; + +/****************************************************************************** + * Control socket + ******************************************************************************/ + +/** + * \brief Parse a connection URL into a sockaddr + * \param [in] url - URL + * \param [out] sa - Resulting struct sockaddr, expected zero'ed. + * \return 0 if parsing succeeded, a negative error value otherwise. + */ +static int +_hc_sock_light_parse_url(const char * url, struct sockaddr * sa) +{ + /* FIXME URL parsing is currently not implemented */ + assert(!url); + +#ifdef __linux__ + srand(time(NULL) ^ getpid() ^ gettid()); +#else + srand((unsigned int )(time(NULL) ^ getpid())); +#endif /* __linux__ */ + + /* + * A temporary solution is to inspect the sa_family fields of the passed in + * sockaddr, which defaults to AF_UNSPEC (0) and thus creates an IPv4/TCP + * connection to localhost. + */ + switch (sa->sa_family) { + case AF_UNSPEC: + case AF_INET: + { + struct sockaddr_in * sai = (struct sockaddr_in *)sa; + sai->sin_family = AF_INET; + sai->sin_port = htons(PORT); + sai->sin_addr.s_addr = htonl(INADDR_LOOPBACK); + break; + } + case AF_INET6: + { + struct sockaddr_in6 * sai6 = (struct sockaddr_in6 *)sa; + sai6->sin6_family = AF_INET6; + sai6->sin6_port = htons(PORT); + sai6->sin6_addr = loopback_addr; + break; + } + default: + return -1; + } + + return 0; +} + +static int +_hc_sock_light_reset(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + s->roff = s->woff = 0; + s->remaining = 0; + return 0; +} + +void +_hc_sock_light_free(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + hc_sock_request_t ** request_array = NULL; + int n = hc_sock_map_get_value_array(s->map, &request_array); + if (n < 0) { + ERROR("Could not retrieve pending request array for freeing up resources"); + } else { + for (unsigned i = 0; i < n; i++) { + hc_sock_request_t * request = request_array[i]; + if (hc_sock_map_remove(s->map, request->seq, NULL) < 0) + ERROR("[hc_sock_light_process] Error removing request from map"); + hc_sock_light_request_free(request); + } + free(request_array); + } + + hc_sock_map_free(s->map); + if (s->url) + free(s->url); + close(s->fd); + free(s); +} + +static int +_hc_sock_light_get_next_seq(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + return s->seq++; +} + +static int +_hc_sock_light_set_nonblocking(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + return (fcntl(s->fd, F_SETFL, fcntl(s->fd, F_GETFL) | O_NONBLOCK) < 0); +} + +static int +_hc_sock_light_get_fd(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + return s->fd; +} + +static int +_hc_sock_light_connect(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + struct sockaddr_storage ss; + memset(&ss, 0, sizeof(struct sockaddr_storage)); + + if (_hc_sock_light_parse_url(s->url, (struct sockaddr *)&ss) < 0) + goto ERR_PARSE; + + size_t size = ss.ss_family == AF_INET + ? sizeof(struct sockaddr_in) + : sizeof(struct sockaddr_in6); + if (connect(s->fd, (struct sockaddr *)&ss, (socklen_t)size) < 0) //sizeof(struct sockaddr)) < 0) + goto ERR_CONNECT; + + return 0; + +ERR_CONNECT: +ERR_PARSE: + return -1; +} + +static int +_hc_sock_light_send(hc_sock_t * socket, hc_msg_t * msg, size_t msglen, int seq) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + int rc; + msg->hdr.seqNum = seq; + rc = (int)send(s->fd, msg, msglen, 0); + if (rc < 0) { + perror("hc_sock_light_send"); + return -1; + } + return 0; +} + +static int +_hc_sock_light_get_available(hc_sock_t * socket, u8 ** buffer, size_t * size) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + *buffer = s->buf + s->woff; + *size = RECV_BUFLEN - s->woff; + + return 0; +} + +static int +_hc_sock_light_recv(hc_sock_t * socket) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + int rc; + + /* + * This condition should be ensured to guarantee correct processing of + * messages + */ + assert(RECV_BUFLEN - s->woff > MIN_BUFLEN); + + rc = (int)recv(s->fd, s->buf + s->woff, RECV_BUFLEN - s->woff, 0); + if (rc == 0) { + /* Connection has been closed */ + return 0; + } + if (rc < 0) { + /* + * Let's not return 0 which currently means the socket has been closed + */ + if (errno == EWOULDBLOCK) + return -1; + perror("hc_sock_light_recv"); + return -1; + } + s->woff += rc; + return rc; +} + +/* + * Returns -99 in case of internal error, -1 in case of API command failure + */ +static int +_hc_sock_light_process(hc_sock_t * socket, hc_data_t ** data) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + int err = 0; + + /* We must have received at least one byte */ + size_t available = s->woff - s->roff; + + while(available > 0) { + + if (!s->cur_request) { // No message being parsed, alternatively (remaining == 0) + hc_msg_t * msg = (hc_msg_t*)(s->buf + s->roff); + + /* We expect a message header */ + if (available < sizeof(hc_msg_header_t)) { + break; + } + + hc_sock_request_t * request = NULL; + if (hc_sock_map_get(s->map, msg->hdr.seqNum, &request) < 0) { + ERROR("[hc_sock_light_process] Error searching for matching request"); + return -99; + } + if (!request) { + ERROR("[hc_sock_light_process] No request matching received sequence number"); + return -99; + } + + s->remaining = msg->hdr.length; + switch(msg->hdr.messageType) { + case ACK_LIGHT: + assert(s->remaining == 1); + assert(!data); + s->cur_request = request; + break; + case NACK_LIGHT: + assert(s->remaining == 1); + assert(!data); + hc_data_set_error(request->data); + s->cur_request = request; + err = -1; + break; + case RESPONSE_LIGHT: + assert(data); + if (s->remaining == 0) { + hc_data_set_complete(request->data); + *data = request->data; + if (hc_sock_map_remove(s->map, request->seq, NULL) < 0) + ERROR("[hc_sock_light_process] Error removing request from map"); + hc_sock_light_request_free(request); + } else { + /* We only remember it if there is still data to parse */ + s->cur_request = request; + } + break; + default: + ERROR("[hc_sock_light_process] Invalid response received"); + return -99; + } + + available -= sizeof(hc_msg_header_t); + s->roff += sizeof(hc_msg_header_t); + } else { + /* We expect the complete payload, or at least a chunk of it */ + size_t num_chunks = available / s->cur_request->data->in_element_size; + if (num_chunks == 0) + break; + if (num_chunks > s->remaining) + num_chunks = s->remaining; + + if (!s->cur_request->parse) { + /* If we don't need to parse results, then we can directly push + * all of them into the result data structure */ + hc_data_push_many(s->cur_request->data, s->buf + s->roff, num_chunks); + } else { + int rc; + rc = hc_data_ensure_available(s->cur_request->data, num_chunks); + if (rc < 0) { + ERROR("[hc_sock_light_process] Error in hc_data_ensure_available"); + return -99; + } + for (int i = 0; i < num_chunks; i++) { + u8 * dst = hc_data_get_next(s->cur_request->data); + if (!dst) { + ERROR("[hc_sock_light_process] Error in hc_data_get_next"); + return -99; + } + + rc = s->cur_request->parse(s->buf + s->roff + i * s->cur_request->data->in_element_size, dst); + if (rc < 0) { + ERROR("[hc_sock_light_process] Error in parse"); + err = -99; /* FIXME we let the loop complete (?) */ + } + s->cur_request->data->size++; + } + } + + s->remaining -= num_chunks; + available -= num_chunks * s->cur_request->data->in_element_size; + s->roff += num_chunks * s->cur_request->data->in_element_size; + if (s->remaining == 0) { + if (hc_sock_map_remove(s->map, s->cur_request->seq, NULL) < 0) { + ERROR("[hc_sock_light_process] Error removing request from map"); + return -99; + } + hc_data_set_complete(s->cur_request->data); + if (data) + *data = s->cur_request->data; + hc_sock_light_request_free(s->cur_request); + s->cur_request = NULL; + } + + } + } + + /* Make sure there is enough remaining space in the buffer */ + if (RECV_BUFLEN - s->woff < AVG_BUFLEN) { + /* + * There should be no overlap provided a sufficiently large BUFLEN, but + * who knows. + */ + memmove(s->buf, s->buf + s->roff, s->woff - s->roff); + s->woff -= s->roff; + s->roff = 0; + } + + return err; +} + +static int +_hc_sock_light_callback(hc_sock_t * socket, hc_data_t ** pdata) +{ + hc_data_t * data; + + for (;;) { + int n = _hc_sock_light_recv(socket); + if (n == 0) + goto ERR_EOF; + if (n < 0) { + switch(errno) { + case ECONNRESET: + case ENODEV: + /* Forwarder restarted */ + WARN("Forwarder likely restarted: not (yet) implemented"); + goto ERR; + case EWOULDBLOCK: + //DEBUG("Would block... stop reading from socket"); + goto END; + default: + perror("hc_sock_light_recv"); + goto ERR; + } + } + if (_hc_sock_light_process(socket, &data) < 0) { + goto ERR; + } + } +END: + if (pdata) + *pdata = data; + else + hc_data_free(data); + return 0; + +ERR: + hc_data_free(data); +ERR_EOF: + return -1; +} + +/****************************************************************************** + * Command-specific structures and functions + ******************************************************************************/ + +typedef int (*HC_PARSE)(const u8 *, u8 *); + +typedef struct { + hc_action_t cmd; + command_id cmd_id; + size_t size_in; + size_t size_out; + HC_PARSE parse; +} hc_command_params_t; + +static int +_hc_execute_command(hc_sock_t * socket, hc_msg_t * msg, size_t msg_len, + hc_command_params_t * params, hc_data_t ** pdata, bool async) +{ + hc_sock_light_t *s = TO_HC_SOCK_LIGHT(socket); + int ret; + if (async) + assert(!pdata); + + /* Sanity check */ + switch(params->cmd) { + case ACTION_CREATE: + assert(params->size_in != 0); /* payload repeated */ + assert(params->size_out == 0); + assert(params->parse == NULL); + break; + case ACTION_DELETE: + assert(params->size_in != 0); /* payload repeated */ + assert(params->size_out == 0); + assert(params->parse == NULL); + break; + case ACTION_LIST: + assert(params->size_in != 0); + assert(params->size_out != 0); + assert(params->parse != NULL); + break; + case ACTION_SET: + assert(params->size_in != 0); + assert(params->size_out == 0); + assert(params->parse == NULL); + break; + default: + return -1; + } + + //hc_sock_light_reset(s); + + /* XXX data will at least store the result (complete) */ + hc_data_t * data = hc_data_create(params->size_in, params->size_out, NULL); + if (!data) { + ERROR("[_hc_execute_command] Could not create data storage"); + goto ERR_DATA; + } + + int seq = _hc_sock_light_get_next_seq(socket); + + /* Create state used to process the request */ + hc_sock_request_t * request = NULL; + request = hc_sock_request_create(seq, data, params->parse); + if (!request) { + ERROR("[_hc_execute_command] Could not create request state"); + goto ERR_REQUEST; + } + + /* Add state to map */ + if (hc_sock_map_add(s->map, seq, request) < 0) { + ERROR("[_hc_execute_command] Error adding request state to map"); + goto ERR_MAP; + } + + if (_hc_sock_light_send(socket, msg, msg_len, seq) < 0) { + ERROR("[_hc_execute_command] Error sending message"); + goto ERR_PROCESS; + } + + if (async) + return 0; + + while(!data->complete) { + /* + * As the socket is non blocking it might happen that we need to read + * several times before success... shall we alternate between blocking + * and non-blocking mode ? + */ + int n = _hc_sock_light_recv(socket); + if (n == 0) + goto ERR_EOF; + if (n < 0) + continue; //break; + int rc = _hc_sock_light_process(socket, pdata); + switch(rc) { + case 0: + break; + case -1: + ret = rc; + break; + case -99: + ERROR("[_hc_execute_command] Error processing socket results"); + goto ERR; + break; + default: + ERROR("[_hc_execute_command] Unexpected return value"); + goto ERR; + } + } + +ERR_EOF: + ret = data->ret; + if (!data->complete) + return -1; + if (!pdata) + hc_data_free(data); + + return ret; + +ERR_PROCESS: +ERR_MAP: + hc_sock_light_request_free(request); +ERR: +ERR_REQUEST: + hc_data_free(data); +ERR_DATA: + return -99; +} + +/*----------------------------------------------------------------------------* + * Listeners + *----------------------------------------------------------------------------*/ + +/* LISTENER CREATE */ + +static int +_hc_listener_create_internal(hc_sock_t * socket, hc_listener_t * listener, bool async) +{ + char listener_s[MAXSZ_HC_LISTENER]; + int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); + if (rc >= MAXSZ_HC_LISTENER) + WARN("[_hc_listener_create] Unexpected truncation of listener string"); + DEBUG("[_hc_listener_create] listener=%s async=%s", listener_s, + BOOLSTR(async)); + + if (!IS_VALID_FAMILY(listener->family)) + return -1; + + if (!IS_VALID_CONNECTION_TYPE(listener->type)) + return -1; + + struct { + header_control_message hdr; + add_listener_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = ADD_LISTENER, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = listener->local_addr, + .port = htons(listener->local_port), + .addressType = (u8)map_to_addr_type[listener->family], + .listenerMode = (u8)map_to_listener_mode[listener->type], + .connectionType = (u8)map_to_connection_type[listener->type], + } + }; + + rc = snprintf(msg.payload.symbolic, SYMBOLIC_NAME_LEN, "%s", listener->name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_listener_create] Unexpected truncation of symbolic name string"); + + rc = snprintf(msg.payload.interfaceName, INTERFACE_LEN, "%s", listener->interface_name); + if (rc >= INTERFACE_LEN) + WARN("[_hc_listener_create] Unexpected truncation of interface name string"); + + hc_command_params_t params = { + .cmd = ACTION_CREATE, + .cmd_id = ADD_LISTENER, + .size_in = sizeof(add_listener_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_listener_create(hc_sock_t * s, hc_listener_t * listener) +{ + return _hc_listener_create_internal(s, listener, false); +} + +static int +_hc_listener_create_async(hc_sock_t * s, hc_listener_t * listener) +{ + return _hc_listener_create_internal(s, listener, true); +} + +/* LISTENER LIST */ + +static int +_hc_listener_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) +{ + DEBUG("[hc_listener_list] async=%s", BOOLSTR(async)); + + struct { + header_control_message hdr; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = LIST_LISTENERS, + .length = 0, + .seqNum = 0, + }, + }; + + hc_command_params_t params = { + .cmd = ACTION_LIST, + .cmd_id = LIST_LISTENERS, + .size_in = sizeof(list_listeners_command), + .size_out = sizeof(hc_listener_t), + .parse = (HC_PARSE)hc_listener_parse, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +} + +static int +_hc_listener_list(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_listener_list_internal(s, pdata, false); +} + +static int +_hc_listener_list_async(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_listener_list_internal(s, pdata, true); +} + +/* LISTENER GET */ + +static int +_hc_listener_get(hc_sock_t * socket, hc_listener_t * listener, + hc_listener_t ** listener_found) +{ + hc_data_t * listeners; + hc_listener_t * found; + + char listener_s[MAXSZ_HC_LISTENER]; + int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); + if (rc >= MAXSZ_HC_LISTENER) + WARN("[hc_listener_get] Unexpected truncation of listener string"); + DEBUG("[hc_listener_get] listener=%s", listener_s); + + if (_hc_listener_list(socket, &listeners) < 0) + return -1; + + /* Test */ + if (hc_listener_find(listeners, listener, &found) < 0) { + hc_data_free(listeners); + return -1; + } + + if (found) { + *listener_found = malloc(sizeof(hc_listener_t)); + if (!*listener_found) + return -1; + **listener_found = *found; + } else { + *listener_found = NULL; + } + + hc_data_free(listeners); + + return 0; +} + + +/* LISTENER DELETE */ + +static int +_hc_listener_delete_internal(hc_sock_t * socket, hc_listener_t * listener, bool async) +{ + char listener_s[MAXSZ_HC_LISTENER]; + int rc = hc_listener_snprintf(listener_s, MAXSZ_HC_LISTENER, listener); + if (rc >= MAXSZ_HC_LISTENER) + WARN("[_hc_listener_delete] Unexpected truncation of listener string"); + DEBUG("[_hc_listener_delete] listener=%s async=%s", listener_s, + BOOLSTR(async)); + + struct { + header_control_message hdr; + remove_listener_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = REMOVE_LISTENER, + .length = 1, + .seqNum = 0, + }, + }; + + if (listener->id) { + rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%d", listener->id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); + } else if (*listener->name) { + rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%s", listener->name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); + } else { + hc_listener_t * listener_found; + if (_hc_listener_get(socket, listener, &listener_found) < 0) + return -1; + if (!listener_found) + return -1; + rc = snprintf(msg.payload.symbolicOrListenerid, SYMBOLIC_NAME_LEN, "%d", listener_found->id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_listener_delete] Unexpected truncation of symbolic name string"); + free(listener_found); + } + + hc_command_params_t params = { + .cmd = ACTION_DELETE, + .cmd_id = REMOVE_LISTENER, + .size_in = sizeof(remove_listener_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_listener_delete(hc_sock_t * s, hc_listener_t * listener) +{ + return _hc_listener_delete_internal(s, listener, false); +} + +static int +_hc_listener_delete_async(hc_sock_t * s, hc_listener_t * listener) +{ + return _hc_listener_delete_internal(s, listener, true); +} + +/*----------------------------------------------------------------------------* + * CONNECTION + *----------------------------------------------------------------------------*/ + +/* CONNECTION CREATE */ + +static int +_hc_connection_create_internal(hc_sock_t * socket, hc_connection_t * connection, bool async) +{ + char connection_s[MAXSZ_HC_CONNECTION]; + int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); + if (rc >= MAXSZ_HC_CONNECTION) + WARN("[_hc_connection_create] Unexpected truncation of connection string"); + DEBUG("[_hc_connection_create] connection=%s async=%s", connection_s, BOOLSTR(async)); + + if (hc_connection_validate(connection) < 0) + return -1; + + struct { + header_control_message hdr; + add_connection_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = ADD_CONNECTION, + .length = 1, + .seqNum = 0, + }, + .payload = { + .remoteIp = connection->remote_addr, + .localIp = connection->local_addr, + .remotePort = htons(connection->remote_port), + .localPort = htons(connection->local_port), + .ipType = (u8)map_to_addr_type[connection->family], + .connectionType = (u8)map_to_connection_type[connection->type], + .admin_state = connection->admin_state, +#ifdef WITH_POLICY + .priority = connection->priority, + .tags = connection->tags, +#endif /* WITH_POLICY */ + } + }; + rc = snprintf(msg.payload.symbolic, SYMBOLIC_NAME_LEN, "%s", connection->name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_create] Unexpected truncation of symbolic name string"); + //snprintf(msg.payload.interfaceName, INTERFACE_NAME_LEN, "%s", connection->interface_name); + + hc_command_params_t params = { + .cmd = ACTION_CREATE, + .cmd_id = ADD_CONNECTION, + .size_in = sizeof(add_connection_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_connection_create(hc_sock_t * s, hc_connection_t * connection) +{ + return _hc_connection_create_internal(s, connection, false); +} + +static int +_hc_connection_create_async(hc_sock_t * s, hc_connection_t * connection) +{ + return _hc_connection_create_internal(s, connection, true); +} + +/* CONNECTION LIST */ + +static int +_hc_connection_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) +{ + DEBUG("[hc_connection_list] async=%s", BOOLSTR(async)); + + struct { + header_control_message hdr; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = LIST_CONNECTIONS, + .length = 0, + .seqNum = 0, + }, + }; + + hc_command_params_t params = { + .cmd = ACTION_LIST, + .cmd_id = LIST_CONNECTIONS, + .size_in = sizeof(list_connections_command), + .size_out = sizeof(hc_connection_t), + .parse = (HC_PARSE)hc_connection_parse, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +} + +static int +_hc_connection_list(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_connection_list_internal(s, pdata, false); +} + +static int +_hc_connection_list_async(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_connection_list_internal(s, pdata, true); +} + +/* CONNECTION GET */ + +static int +_hc_connection_get(hc_sock_t * socket, hc_connection_t * connection, + hc_connection_t ** connection_found) +{ + hc_data_t * connections; + hc_connection_t * found; + + char connection_s[MAXSZ_HC_CONNECTION]; + int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); + if (rc >= MAXSZ_HC_CONNECTION) + WARN("[hc_connection_get] Unexpected truncation of connection string"); + DEBUG("[hc_connection_get] connection=%s", connection_s); + + if (_hc_connection_list(socket, &connections) < 0) + return -1; + + /* Test */ + if (hc_connection_find(connections, connection, &found) < 0) { + hc_data_free(connections); + return -1; + } + + if (found) { + *connection_found = malloc(sizeof(hc_connection_t)); + if (!*connection_found) + return -1; + **connection_found = *found; + } else { + *connection_found = NULL; + } + + hc_data_free(connections); + + return 0; +} + + +/* CONNECTION DELETE */ + +static int +_hc_connection_delete_internal(hc_sock_t * socket, hc_connection_t * connection, bool async) +{ + char connection_s[MAXSZ_HC_CONNECTION]; + int rc = hc_connection_snprintf(connection_s, MAXSZ_HC_CONNECTION, connection); + if (rc >= MAXSZ_HC_CONNECTION) + WARN("[_hc_connection_delete] Unexpected truncation of connection string"); + DEBUG("[_hc_connection_delete] connection=%s async=%s", connection_s, BOOLSTR(async)); + + struct { + header_control_message hdr; + remove_connection_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = REMOVE_CONNECTION, + .length = 1, + .seqNum = 0, + }, + }; + + if (connection->id) { + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", connection->id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); + } else if (*connection->name) { + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", connection->name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); + } else { + hc_connection_t * connection_found; + if (_hc_connection_get(socket, connection, &connection_found) < 0) + return -1; + if (!connection_found) + return -1; + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", connection_found->id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_delete] Unexpected truncation of symbolic name string"); + free(connection_found); + } + + hc_command_params_t params = { + .cmd = ACTION_DELETE, + .cmd_id = REMOVE_CONNECTION, + .size_in = sizeof(remove_connection_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_connection_delete(hc_sock_t * s, hc_connection_t * connection) +{ + return _hc_connection_delete_internal(s, connection, false); +} + +static int +_hc_connection_delete_async(hc_sock_t * s, hc_connection_t * connection) +{ + return _hc_connection_delete_internal(s, connection, true); +} + +static int +_hc_connection_update_by_id(hc_sock_t *s, int hc_connection_id, + hc_connection_t *connection) +{ + // Not implemented + return -1; +} + +static int +_hc_connection_update(hc_sock_t *s, hc_connection_t *connection_current, + hc_connection_t *connection_updated) +{ + // Not implemented + return -1; +} + +/* CONNECTION SET ADMIN STATE */ + +static int +_hc_connection_set_admin_state_internal(hc_sock_t * socket, const char * conn_id_or_name, + face_state_t state, bool async) +{ + int rc; + DEBUG("[hc_connection_set_admin_state] connection_id/name=%s admin_state=%s async=%s", + conn_id_or_name, face_state_str[state], BOOLSTR(async)); + struct { + header_control_message hdr; + connection_set_admin_state_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = CONNECTION_SET_ADMIN_STATE, + .length = 1, + .seqNum = 0, + }, + .payload = { + .admin_state = state, + }, + }; + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_set_admin_state] Unexpected truncation of symbolic name string"); + + hc_command_params_t params = { + .cmd = ACTION_SET, + .cmd_id = CONNECTION_SET_ADMIN_STATE, + .size_in = sizeof(connection_set_admin_state_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_connection_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, + face_state_t state) +{ + return _hc_connection_set_admin_state_internal(s, conn_id_or_name, state, false); +} + +static int +_hc_connection_set_admin_state_async(hc_sock_t * s, const char * conn_id_or_name, + face_state_t state) +{ + return _hc_connection_set_admin_state_internal(s, conn_id_or_name, state, true); +} + +#ifdef WITH_POLICY + +static int +_hc_connection_set_priority_internal(hc_sock_t * socket, const char * conn_id_or_name, + uint32_t priority, bool async) +{ + int rc; + DEBUG("[hc_connection_set_priority] connection_id/name=%s priority=%d async=%s", + conn_id_or_name, priority, BOOLSTR(async)); + struct { + header_control_message hdr; + connection_set_priority_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = CONNECTION_SET_PRIORITY, + .length = 1, + .seqNum = 0, + }, + .payload = { + .priority = priority, + }, + }; + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_set_priority] Unexpected truncation of symbolic name string"); + + hc_command_params_t params = { + .cmd = ACTION_SET, + .cmd_id = CONNECTION_SET_PRIORITY, + .size_in = sizeof(connection_set_priority_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, + uint32_t priority) +{ + return _hc_connection_set_priority_internal(s, conn_id_or_name, priority, false); +} + +static int +_hc_connection_set_priority_async(hc_sock_t * s, const char * conn_id_or_name, + uint32_t priority) +{ + return _hc_connection_set_priority_internal(s, conn_id_or_name, priority, true); +} + +#endif // WITH_POLICY + +static int +_hc_connection_set_tags_internal(hc_sock_t * s, const char * conn_id_or_name, + policy_tags_t tags, bool async) +{ + int rc; + DEBUG("[hc_connection_set_tags] connection_id/name=%s tags=%d async=%s", + conn_id_or_name, tags, BOOLSTR(async)); + struct { + header_control_message hdr; + connection_set_tags_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = CONNECTION_SET_TAGS, + .length = 1, + .seqNum = 0, + }, + .payload = { + .tags = tags, + }, + }; + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%s", conn_id_or_name); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_connection_set_tags] Unexpected truncation of symbolic name string"); + + hc_command_params_t params = { + .cmd = ACTION_SET, + .cmd_id = CONNECTION_SET_TAGS, + .size_in = sizeof(connection_set_tags_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(s, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, + policy_tags_t tags) +{ + return _hc_connection_set_tags_internal(s, conn_id_or_name, tags, false); +} + +static int +_hc_connection_set_tags_async(hc_sock_t * s, const char * conn_id_or_name, + policy_tags_t tags) +{ + return _hc_connection_set_tags_internal(s, conn_id_or_name, tags, true); +} + +/*----------------------------------------------------------------------------* + * Routes + *----------------------------------------------------------------------------*/ + +/* ROUTE CREATE */ + +static int +_hc_route_create_internal(hc_sock_t * socket, hc_route_t * route, bool async) +{ + char route_s[MAXSZ_HC_ROUTE]; + int rc = hc_route_snprintf(route_s, MAXSZ_HC_ROUTE, route); + if (rc >= MAXSZ_HC_ROUTE) + WARN("[_hc_route_create] Unexpected truncation of route string"); + if (rc < 0) + WARN("[_hc_route_create] Error building route string"); + else + DEBUG("[hc_route_create] route=%s async=%s", route_s, BOOLSTR(async)); + + if (!IS_VALID_FAMILY(route->family)) + return -1; + + struct { + header_control_message hdr; + add_route_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = ADD_ROUTE, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = route->remote_addr, + .cost = route->cost, + .addressType = (u8)map_to_addr_type[route->family], + .len = route->len, + } + }; + + /* + * The route commands expects the ID (or name that we don't use) as part of + * the symbolicOrConnid attribute. + */ + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", route->face_id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_route_create] Unexpected truncation of symbolic name string"); + + hc_command_params_t params = { + .cmd = ACTION_CREATE, + .cmd_id = ADD_ROUTE, + .size_in = sizeof(add_route_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_route_create(hc_sock_t * s, hc_route_t * route) +{ + return _hc_route_create_internal(s, route, false); +} + +static int +_hc_route_create_async(hc_sock_t * s, hc_route_t * route) +{ + return _hc_route_create_internal(s, route, true); +} + +/* ROUTE DELETE */ + +static int +_hc_route_delete_internal(hc_sock_t * socket, hc_route_t * route, bool async) +{ + char route_s[MAXSZ_HC_ROUTE]; + int rc = hc_route_snprintf(route_s, MAXSZ_HC_ROUTE, route); + if (rc >= MAXSZ_HC_ROUTE) + WARN("[_hc_route_delete] Unexpected truncation of route string"); + DEBUG("[hc_route_delete] route=%s async=%s", route_s, BOOLSTR(async)); + + if (!IS_VALID_FAMILY(route->family)) + return -1; + + struct { + header_control_message hdr; + remove_route_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = REMOVE_ROUTE, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = route->remote_addr, + .addressType = (u8)map_to_addr_type[route->family], + .len = route->len, + } + }; + + /* + * The route commands expects the ID (or name that we don't use) as part of + * the symbolicOrConnid attribute. + */ + snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", route->face_id); + + hc_command_params_t params = { + .cmd = ACTION_DELETE, + .cmd_id = REMOVE_ROUTE, + .size_in = sizeof(remove_route_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_route_delete(hc_sock_t * s, hc_route_t * route) +{ + return _hc_route_delete_internal(s, route, false); +} + +static int +_hc_route_delete_async(hc_sock_t * s, hc_route_t * route) +{ + return _hc_route_delete_internal(s, route, true); +} + +/* ROUTE LIST */ + +static int +_hc_route_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) +{ + //DEBUG("[hc_route_list] async=%s", BOOLSTR(async)); + + struct { + header_control_message hdr; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = LIST_ROUTES, + .length = 0, + .seqNum = 0, + }, + }; + + hc_command_params_t params = { + .cmd = ACTION_LIST, + .cmd_id = LIST_ROUTES, + .size_in = sizeof(list_routes_command), + .size_out = sizeof(hc_route_t), + .parse = (HC_PARSE)hc_route_parse, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +} + +static int +_hc_route_list(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_route_list_internal(s, pdata, false); +} + +static int +_hc_route_list_async(hc_sock_t * s) +{ + return _hc_route_list_internal(s, NULL, true); +} + +/*----------------------------------------------------------------------------* + * Face + * + * Face support is not directly available in hicn-light, but we can offer such + * an interface through a combination of listeners and connections. The code + * starts with some conversion functions between faces/listeners/connections. + * + * We also need to make sure that there always exist a (single) listener when a + * connection is created, and in the hICN face case, that there is a single + * connection attached to this listener. + * + *----------------------------------------------------------------------------*/ + +/* FACE CREATE */ + +static int +_hc_face_create(hc_sock_t * socket, hc_face_t * face) +{ + hc_listener_t listener; + hc_listener_t * listener_found; + + hc_connection_t connection; + hc_connection_t * connection_found; + + char face_s[MAXSZ_HC_FACE]; + int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); + if (rc >= MAXSZ_HC_FACE) + WARN("[hc_face_create] Unexpected truncation of face string"); + DEBUG("[hc_face_create] face=%s", face_s); + + switch(face->face.type) + { + case FACE_TYPE_HICN: + case FACE_TYPE_TCP: + case FACE_TYPE_UDP: + if (hc_face_to_connection(face, &connection, true) < 0) { + ERROR("[hc_face_create] Could not convert face to connection."); + return -1; + } + + /* Ensure we have a corresponding local listener */ + if (hc_connection_to_local_listener(&connection, &listener) < 0) { + ERROR("[hc_face_create] Could not convert face to local listener."); + return -1; + } + + if (_hc_listener_get(socket, &listener, &listener_found) < 0) { + ERROR("[hc_face_create] Could not retrieve listener"); + return -1; + } + + if (!listener_found) { + /* We need to create the listener if it does not exist */ + if (_hc_listener_create(socket, &listener) < 0) { + ERROR("[hc_face_create] Could not create listener."); + free(listener_found); + return -1; + } + } else { + free(listener_found); + } + + /* Create corresponding connection */ + if (_hc_connection_create(socket, &connection) < 0) { + ERROR("[hc_face_create] Could not create connection."); + return -1; + } + + /* + * Once the connection is created, we need to list all connections + * and compare with the current one to find the created face ID. + */ + if (_hc_connection_get(socket, &connection, &connection_found) < 0) { + ERROR("[hc_face_create] Could not retrieve connection"); + return -1; + } + + if (!connection_found) { + ERROR("[hc_face_create] Could not find newly created connection."); + return -1; + } + + face->id = connection_found->id; + free(connection_found); + + break; + + case FACE_TYPE_HICN_LISTENER: + case FACE_TYPE_TCP_LISTENER: + case FACE_TYPE_UDP_LISTENER: + if (hc_face_to_listener(face, &listener) < 0) { + ERROR("Could not convert face to listener."); + return -1; + } + if (_hc_listener_create(socket, &listener) < 0) { + ERROR("[hc_face_create] Could not create listener."); + return -1; + } + return -1; + break; + default: + ERROR("[hc_face_create] Unknwon face type."); + + return -1; + }; + + return 0; +} + +static int +_hc_face_get(hc_sock_t * socket, hc_face_t * face, hc_face_t ** face_found) +{ + hc_listener_t listener; + hc_listener_t * listener_found; + + hc_connection_t connection; + hc_connection_t * connection_found; + + char face_s[MAXSZ_HC_FACE]; + int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); + if (rc >= MAXSZ_HC_FACE) + WARN("[hc_face_get] Unexpected truncation of face string"); + DEBUG("[hc_face_get] face=%s", face_s); + + switch(face->face.type) + { + case FACE_TYPE_HICN: + case FACE_TYPE_TCP: + case FACE_TYPE_UDP: + if (hc_face_to_connection(face, &connection, false) < 0) + return -1; + if (_hc_connection_get(socket, &connection, &connection_found) < 0) + return -1; + if (!connection_found) { + *face_found = NULL; + return 0; + } + *face_found = malloc(sizeof(hc_face_t)); + hc_connection_to_face(connection_found, *face_found); + free(connection_found); + break; + + case FACE_TYPE_HICN_LISTENER: + case FACE_TYPE_TCP_LISTENER: + case FACE_TYPE_UDP_LISTENER: + if (hc_face_to_listener(face, &listener) < 0) + return -1; + if (_hc_listener_get(socket, &listener, &listener_found) < 0) + return -1; + if (!listener_found) { + *face_found = NULL; + return 0; + } + *face_found = malloc(sizeof(hc_face_t)); + hc_listener_to_face(listener_found, *face_found); + free(listener_found); + break; + + default: + return -1; + } + + return 0; + +} + +/* FACE DELETE */ + +static int +_hc_face_delete(hc_sock_t * socket, hc_face_t * face) +{ + char face_s[MAXSZ_HC_FACE]; + int rc = hc_face_snprintf(face_s, MAXSZ_HC_FACE, face); + if (rc >= MAXSZ_HC_FACE) + WARN("[hc_face_delete] Unexpected truncation of face string"); + DEBUG("[hc_face_delete] face=%s", face_s); + + hc_connection_t connection; + if (hc_face_to_connection(face, &connection, false) < 0) { + ERROR("[hc_face_delete] Could not convert face to connection."); + return -1; + } + + if (_hc_connection_delete(socket, &connection) < 0) { + ERROR("[hc_face_delete] Error removing connection"); + return -1; + } + + /* If this is the last connection attached to the listener, remove it */ + + hc_data_t * connections; + hc_listener_t listener = {{0}}; + + /* + * Ensure we have a corresponding local listener + * NOTE: hc_face_to_listener is not appropriate + */ + if (hc_connection_to_local_listener(&connection, &listener) < 0) { + ERROR("[hc_face_create] Could not convert face to local listener."); + return -1; + } +#if 1 + /* + * The name is generated to prepare listener creation, we need it to be + * empty for deletion. The id should not need to be reset though. + */ + listener.id = 0; + memset(listener.name, 0, sizeof(listener.name)); +#endif + if (_hc_connection_list(socket, &connections) < 0) { + ERROR("[hc_face_delete] Error getting the list of listeners"); + return -1; + } + + bool delete = true; + foreach_connection(c, connections) { + if ((ip_address_cmp(&c->local_addr, &listener.local_addr, c->family) == 0) && + (c->local_port == listener.local_port) && + (strcmp(c->interface_name, listener.interface_name) == 0)) { + delete = false; + } + } + + if (delete) { + if (_hc_listener_delete(socket, &listener) < 0) { + ERROR("[hc_face_delete] Error removing listener"); + return -1; + } + } + + hc_data_free(connections); + + return 0; + + +} + +/* FACE LIST */ + +static int +_hc_face_list(hc_sock_t * socket, hc_data_t ** pdata) +{ + hc_data_t * connection_data; + hc_face_t face; + + //DEBUG("[hc_face_list]"); + + if (_hc_connection_list(socket, &connection_data) < 0) { + ERROR("[hc_face_list] Could not list connections."); + return -1; + } + + hc_data_t * face_data = hc_data_create(sizeof(hc_connection_t), sizeof(hc_face_t), NULL); + foreach_connection(c, connection_data) { + if (hc_connection_to_face(c, &face) < 0) { + ERROR("[hc_face_list] Could not convert connection to face."); + goto ERR; + } + hc_data_push(face_data, &face); + } + + *pdata = face_data; + hc_data_free(connection_data); + return 0; + +ERR: + hc_data_free(connection_data); + return -1; +} + +static int +_hc_face_list_async(hc_sock_t * socket) +{ + struct { + header_control_message hdr; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = LIST_CONNECTIONS, + .length = 0, + .seqNum = 0, + }, + }; + + hc_command_params_t params = { + .cmd = ACTION_LIST, + .cmd_id = LIST_CONNECTIONS, + .size_in = sizeof(list_connections_command), + .size_out = sizeof(hc_face_t), + .parse = (HC_PARSE)hc_connection_parse_to_face, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, true); +} + +static int +_hc_face_set_admin_state(hc_sock_t * s, const char * conn_id_or_name, + face_state_t admin_state) +{ + return hc_connection_set_admin_state(s, conn_id_or_name, admin_state); +} + +#ifdef WITH_POLICY +static int +_hc_face_set_priority(hc_sock_t * s, const char * conn_id_or_name, + uint32_t priority) +{ + return hc_connection_set_priority(s, conn_id_or_name, priority); +} + +static int +_hc_face_set_tags(hc_sock_t * s, const char * conn_id_or_name, + policy_tags_t tags) +{ + return hc_connection_set_tags(s, conn_id_or_name, tags); +} +#endif // WITH_POLICY + +/*----------------------------------------------------------------------------* + * Punting + *----------------------------------------------------------------------------*/ + +static int +_hc_punting_create_internal(hc_sock_t * socket, hc_punting_t * punting, bool async) +{ + int rc; + + if (hc_punting_validate(punting) < 0) + return -1; + + struct { + header_control_message hdr; + add_punting_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = ADD_PUNTING, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = punting->prefix, + .addressType = (u8)map_to_addr_type[punting->family], + .len = punting->prefix_len, + } + }; + rc = snprintf(msg.payload.symbolicOrConnid, SYMBOLIC_NAME_LEN, "%d", punting->face_id); + if (rc >= SYMBOLIC_NAME_LEN) + WARN("[_hc_punting_create] Unexpected truncation of symbolic name string"); + + hc_command_params_t params = { + .cmd = ACTION_CREATE, + .cmd_id = ADD_PUNTING, + .size_in = sizeof(add_punting_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_punting_create(hc_sock_t * s, hc_punting_t * punting) +{ + return _hc_punting_create_internal(s, punting, false); +} + +static int +_hc_punting_create_async(hc_sock_t * s, hc_punting_t * punting) +{ + return _hc_punting_create_internal(s, punting, true); +} + +static int +_hc_punting_get(hc_sock_t * s, hc_punting_t * punting, hc_punting_t ** punting_found) +{ + ERROR("hc_punting_get not (yet) implemented."); + return -1; +} + +static int +_hc_punting_delete(hc_sock_t * s, hc_punting_t * punting) +{ + ERROR("hc_punting_delete not (yet) implemented."); + return -1; +} + +static int +_hc_punting_list(hc_sock_t * s, hc_data_t ** pdata) +{ + ERROR("hc_punting_list not (yet) implemented."); + return -1; +} + + +/*----------------------------------------------------------------------------* + * Cache + *----------------------------------------------------------------------------*/ + +static int +_hc_cache_set_store_internal(hc_sock_t * socket, int enabled, bool async) +{ + struct { + header_control_message hdr; + cache_store_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = CACHE_STORE, + .length = 1, + .seqNum = 0, + }, + .payload = { + .activate = enabled, + } + }; + + hc_command_params_t params = { + .cmd = ACTION_SET, + .cmd_id = CACHE_STORE, + .size_in = sizeof(cache_store_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_cache_set_store(hc_sock_t * s, int enabled) +{ + return _hc_cache_set_store_internal(s, enabled, false); +} + +static int +_hc_cache_set_store_async(hc_sock_t * s, int enabled) +{ + return _hc_cache_set_store_internal(s, enabled, true); +} + +static int +_hc_cache_set_serve_internal(hc_sock_t * socket, int enabled, bool async) +{ + struct { + header_control_message hdr; + cache_serve_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = CACHE_SERVE, + .length = 1, + .seqNum = 0, + }, + .payload = { + .activate = enabled, + } + }; + + hc_command_params_t params = { + .cmd = ACTION_SET, + .cmd_id = CACHE_SERVE, + .size_in = sizeof(cache_serve_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_cache_set_serve(hc_sock_t * s, int enabled) +{ + return _hc_cache_set_serve_internal(s, enabled, false); +} + +static int +_hc_cache_set_serve_async(hc_sock_t * s, int enabled) +{ + return _hc_cache_set_serve_internal(s, enabled, true); +} + +/*----------------------------------------------------------------------------* + * Strategy + *----------------------------------------------------------------------------*/ + +// per prefix +static int +_hc_strategy_set(hc_sock_t * s /* XXX */) +{ + return 0; +} + +/* How to retrieve that from the forwarder ? */ +static const char * strategies[] = { + "random", + "load_balancer", +}; + +#define ARRAY_SIZE(array) (sizeof(array) / sizeof(*array)) + +static int +_hc_strategy_list(hc_sock_t * s, hc_data_t ** data) +{ + int rc; + + *data = hc_data_create(0, sizeof(hc_strategy_t), NULL); + + for (unsigned i = 0; i < ARRAY_SIZE(strategies); i++) { + hc_strategy_t * strategy = (hc_strategy_t*)hc_data_get_next(*data); + if (!strategy) + return -1; + rc = snprintf(strategy->name, MAXSZ_HC_STRATEGY, "%s", strategies[i]); + if (rc >= MAXSZ_HC_STRATEGY) + WARN("[hc_strategy_list] Unexpected truncation of strategy name string"); + (*data)->size++; + } + + return 0; +} + +/*----------------------------------------------------------------------------* + * WLDR + *----------------------------------------------------------------------------*/ + +// per connection +static int +_hc_wldr_set(hc_sock_t * s /* XXX */) +{ + return 0; +} + +/*----------------------------------------------------------------------------* + * MAP-Me + *----------------------------------------------------------------------------*/ + +static int +_hc_mapme_set(hc_sock_t * s, int enabled) +{ + return 0; +} + +static int +_hc_mapme_set_discovery(hc_sock_t * s, int enabled) +{ + return 0; +} + +static int +_hc_mapme_set_timescale(hc_sock_t * s, double timescale) +{ + return 0; +} + +static int +_hc_mapme_set_retx(hc_sock_t * s, double timescale) +{ + return 0; +} + +/*----------------------------------------------------------------------------* + * Policy + *----------------------------------------------------------------------------*/ + +#ifdef WITH_POLICY + +/* POLICY CREATE */ + +static int +_hc_policy_create_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) +{ + if (!IS_VALID_FAMILY(policy->family)) + return -1; + + struct { + header_control_message hdr; + add_policy_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = ADD_POLICY, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = policy->remote_addr, + .addressType = (u8)map_to_addr_type[policy->family], + .len = policy->len, + .policy = policy->policy, + } + }; + + hc_command_params_t params = { + .cmd = ACTION_CREATE, + .cmd_id = ADD_POLICY, + .size_in = sizeof(add_policy_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_policy_create(hc_sock_t * s, hc_policy_t * policy) +{ + return _hc_policy_create_internal(s, policy, false); +} + +static int +_hc_policy_create_async(hc_sock_t * s, hc_policy_t * policy) +{ + return _hc_policy_create_internal(s, policy, true); +} + +/* POLICY DELETE */ + +static int +_hc_policy_delete_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) +{ + if (!IS_VALID_FAMILY(policy->family)) + return -1; + + struct { + header_control_message hdr; + remove_policy_command payload; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = REMOVE_POLICY, + .length = 1, + .seqNum = 0, + }, + .payload = { + .address = policy->remote_addr, + .addressType = (u8)map_to_addr_type[policy->family], + .len = policy->len, + } + }; + + hc_command_params_t params = { + .cmd = ACTION_DELETE, + .cmd_id = REMOVE_POLICY, + .size_in = sizeof(remove_policy_command), + .size_out = 0, + .parse = NULL, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, NULL, async); +} + +static int +_hc_policy_delete(hc_sock_t * s, hc_policy_t * policy) +{ + return _hc_policy_delete_internal(s, policy, false); +} + +static int +_hc_policy_delete_async(hc_sock_t * s, hc_policy_t * policy) +{ + return _hc_policy_delete_internal(s, policy, true); +} + +/* POLICY LIST */ + +static int +_hc_policy_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) +{ + struct { + header_control_message hdr; + } msg = { + .hdr = { + .messageType = REQUEST_LIGHT, + .commandID = LIST_POLICIES, + .length = 0, + .seqNum = 0, + }, + }; + + hc_command_params_t params = { + .cmd = ACTION_LIST, + .cmd_id = LIST_POLICIES, + .size_in = sizeof(list_policies_command), + .size_out = sizeof(hc_policy_t), + .parse = (HC_PARSE)hc_policy_parse, + }; + + return _hc_execute_command(socket, (hc_msg_t*)&msg, sizeof(msg), ¶ms, pdata, async); +} + +static int +_hc_policy_list(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_policy_list_internal(s, pdata, false); +} + +static int +_hc_policy_list_async(hc_sock_t * s, hc_data_t ** pdata) +{ + return _hc_policy_list_internal(s, pdata, true); +} + +#endif /* WITH_POLICY */ + +static hc_sock_t hc_sock_light_interface = (hc_sock_t) { + .hc_sock_get_next_seq = _hc_sock_light_get_next_seq, + .hc_sock_set_nonblocking = _hc_sock_light_set_nonblocking, + .hc_sock_get_fd = _hc_sock_light_get_fd, + .hc_sock_connect = _hc_sock_light_connect, + .hc_sock_get_available = _hc_sock_light_get_available, + .hc_sock_send = _hc_sock_light_send, + .hc_sock_recv = _hc_sock_light_recv, + .hc_sock_process = _hc_sock_light_process, + .hc_sock_callback = _hc_sock_light_callback, + .hc_sock_reset = _hc_sock_light_reset, + .hc_sock_free = _hc_sock_light_free, + .hc_listener_create = _hc_listener_create, + .hc_listener_create_async = _hc_listener_create_async, + .hc_listener_get = _hc_listener_get, + .hc_listener_delete = _hc_listener_delete, + .hc_listener_delete_async = _hc_listener_delete_async, + .hc_listener_list = _hc_listener_list, + .hc_listener_list_async = _hc_listener_list_async, + .hc_connection_create = _hc_connection_create, + .hc_connection_create_async = _hc_connection_create_async, + .hc_connection_get = _hc_connection_get, + .hc_connection_update_by_id = _hc_connection_update_by_id, + .hc_connection_update = _hc_connection_update, + .hc_connection_delete = _hc_connection_delete, + .hc_connection_delete_async = _hc_connection_delete_async, + .hc_connection_list = _hc_connection_list, + .hc_connection_list_async = _hc_connection_list_async, + .hc_connection_set_admin_state = _hc_connection_set_admin_state, + .hc_connection_set_admin_state_async = _hc_connection_set_admin_state_async, + +#ifdef WITH_POLICY + .hc_connection_set_priority = _hc_connection_set_priority, + .hc_connection_set_priority_async = _hc_connection_set_priority_async, + .hc_connection_set_tags = _hc_connection_set_tags, + .hc_connection_set_tags_async = _hc_connection_set_tags_async, +#endif // WITH_POLICY + + .hc_face_create = _hc_face_create, + .hc_face_get = _hc_face_get, + .hc_face_delete = _hc_face_delete, + .hc_face_list = _hc_face_list, + .hc_face_list_async = _hc_face_list_async, + .hc_face_set_admin_state = _hc_face_set_admin_state, + +#ifdef WITH_POLICY + .hc_face_set_priority = _hc_face_set_priority, + .hc_face_set_tags = _hc_face_set_tags, +#endif // WITH_POLICY + + .hc_route_create = _hc_route_create, + .hc_route_create_async = _hc_route_create_async, + .hc_route_delete = _hc_route_delete, + .hc_route_delete_async = _hc_route_delete_async, + .hc_route_list = _hc_route_list, + .hc_route_list_async = _hc_route_list_async, + + .hc_punting_create = _hc_punting_create, + .hc_punting_create_async = _hc_punting_create_async, + .hc_punting_get = _hc_punting_get, + .hc_punting_delete = _hc_punting_delete, + .hc_punting_list = _hc_punting_list, + + .hc_cache_set_store = _hc_cache_set_store, + .hc_cache_set_store_async = _hc_cache_set_store_async, + .hc_cache_set_serve = _hc_cache_set_serve, + .hc_cache_set_serve_async = _hc_cache_set_serve_async, + + .hc_strategy_list = _hc_strategy_list, + .hc_strategy_set = _hc_strategy_set, + .hc_wldr_set = _hc_wldr_set, + + .hc_mapme_set = _hc_mapme_set, + .hc_mapme_set_discovery = _hc_mapme_set_discovery, + .hc_mapme_set_timescale = _hc_mapme_set_timescale, + .hc_mapme_set_retx = _hc_mapme_set_retx, + +#ifdef WITH_POLICY + .hc_policy_create = _hc_policy_create, + .hc_policy_create_async = _hc_policy_create_async, + .hc_policy_delete = _hc_policy_delete, + .hc_policy_delete_async = _hc_policy_delete_async, + .hc_policy_list = _hc_policy_list, + .hc_policy_list_async = _hc_policy_list_async +#endif // WITH_POLICY +}; + +// Public contructors + +hc_sock_t * +_hc_sock_create_url(const char * url) +{ + hc_sock_light_t * s = malloc(sizeof(hc_sock_light_t)); + if (!s) + goto ERR_MALLOC; + + s->vft = hc_sock_light_interface; + s->url = url ? strdup(url) : NULL; + + s->fd = socket(AF_INET, SOCK_STREAM, 0); + if (s->fd < 0) + goto ERR_SOCKET; + + if (_hc_sock_light_reset((hc_sock_t*)s) < 0) + goto ERR_RESET; + + s->seq = 0; + s->cur_request = NULL; + + s->map = hc_sock_map_create(); + if (!s->map) + goto ERR_MAP; + + return (hc_sock_t*)(s); + + //hc_sock_light_map_free(s->map); +ERR_MAP: +ERR_RESET: + if (s->url) + free(s->url); + close(s->fd); +ERR_SOCKET: + free(s); +ERR_MALLOC: + return NULL; +} + +hc_sock_t * +_hc_sock_create(void) +{ + return _hc_sock_create_url(NULL); +} diff --git a/ctrl/libhicnctrl/src/hicn_plugin_api.c b/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c index 231c491ba..e59a2e41e 100644 --- a/ctrl/libhicnctrl/src/hicn_plugin_api.c +++ b/ctrl/libhicnctrl/src/modules/hicn_plugin_api.c @@ -18,6 +18,8 @@ * \brief Implementation of hICN control library API */ +#include "api_private.h" + #include <assert.h> // assert #include <fcntl.h> // fcntl #include <math.h> // log2 @@ -27,19 +29,10 @@ #include <sys/socket.h> // socket #include <unistd.h> // close, fcntl #include <vapi/vapi_safe.h> - -#include <hicn/ctrl/api.h> -#include <hicn/ctrl/commands.h> -#include <hicn/util/token.h> -#include <strings.h> #include <vapi/hicn.api.vapi.h> #include <vapi/ip.api.vapi.h> #include <vapi/udp.api.vapi.h> #include <vapi/interface.api.vapi.h> -#include <hicn/util/log.h> -#include <hicn/util/map.h> -#include <hicn/error.h> -#include <vnet/ip/ip6_packet.h> #if __GNUC__ >= 9 @@ -82,7 +75,10 @@ vapi_skc_ctx_t vapi_skc = { /* TYPEDEF_MAP(hc_sock_map, int, hc_sock_request_t *, int_cmp, int_snprintf, */ /* generic_snprintf); */ -struct hc_sock_s { +struct hc_sock_vpp_s { + /* This must be the first element of the struct */ + hc_sock_t vft; + vapi_ctx_t g_vapi_ctx_instance; char *url; int fd; @@ -96,6 +92,9 @@ struct hc_sock_s { bool async; }; +typedef struct hc_sock_vpp_s hc_sock_vpp_t; + +#define TO_HC_SOCK_VPP(s) (hc_sock_vpp_t*)(s) /****************************************************************************** * Message helper types and aliases @@ -146,73 +145,11 @@ typedef struct __attribute__((__packed__)) { } hc_msg_s; /****************************************************************************** - * Control Data - ******************************************************************************/ - -hc_data_t *hc_data_create(size_t in_element_size, size_t out_element_size, data_callback_t complete_cb) { - hc_data_t *data = malloc(sizeof(hc_data_t)); - if (!data) goto ERR_MALLOC; - - /* FIXME Could be NULL thanks to realloc provided size is 0 */ - data->in_element_size = in_element_size; - data->out_element_size = out_element_size; - data->size = 0; - data->current = 0; - data->complete = false; - data->command_id = 0; // TODO this could also be a busy mark in the socket - /* No callback needed in blocking code for instance */ - data->complete_cb = complete_cb; - - return data; - -ERR_MALLOC: - return NULL; -} - -void hc_data_free(hc_data_t *data) { - if (data != NULL) { - if (data->buffer) free(data->buffer); - free(data); - } -} - -/****************************************************************************** * Control socket ******************************************************************************/ -/** - * \brief Parse a connection URL into a sockaddr - * \param [in] url - URL - * \param [out] sa - Resulting struct sockaddr, expected zero'ed. - * \return 0 if parsing succeeded, a negative error value otherwise. - */ -int hc_sock_parse_url(const char *url, struct sockaddr *sa) { - // NOT IMPLEMENTED - return -1; -} - -hc_sock_t *hc_sock_create_url(const char *url) { - // NOT IMPLEMENTED - return NULL; -} - -hc_sock_t *hc_sock_create(void) { - hc_sock_t *s = malloc(sizeof(hc_sock_t)); - - if (!s) goto ERR_SOCK; - - memset(s, 0, sizeof(hc_sock_t)); - - //By default the socket is blocking -- not async - s->async = 0; - - return s; - -ERR_SOCK: - return NULL; -} - -void hc_sock_free(hc_sock_t *s) { +static void _hc_sock_vpp_free(hc_sock_t *socket) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); if (s->url) free(s->url); close(s->fd); free(s); @@ -221,19 +158,21 @@ void hc_sock_free(hc_sock_t *s) { vapi_skc.g_vapi_ctx_instance = NULL; } -int hc_sock_get_next_seq(hc_sock_t *s) { +static int _hc_sock_vpp_get_next_seq(hc_sock_t *socket) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); return vapi_gen_req_context(s->g_vapi_ctx_instance); } -int hc_sock_set_nonblocking(hc_sock_t *s) { +static int _hc_sock_vpp_set_nonblocking(hc_sock_t *socket) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); s->async = 1; return 0; } -int hc_sock_get_fd(hc_sock_t *s) { return 1; } - -int hc_sock_connect(hc_sock_t *s) { +static int _hc_sock_vpp_get_fd(hc_sock_t *s) { return 1; } +static int _hc_sock_vpp_connect(hc_sock_t *socket) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); vapi_error_e rv = vapi_connect_safe(&s->g_vapi_ctx_instance, s->async); if (rv != VAPI_OK) goto ERR_CONNECT; @@ -245,25 +184,35 @@ ERR_CONNECT: return -1; } -int hc_sock_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen, int seq) { +static int _hc_sock_vpp_send(hc_sock_t *s, hc_msg_t *msg, size_t msglen, int seq) { return -1; } -int hc_sock_get_available(hc_sock_t *s, u8 **buffer, size_t *size) { +static int _hc_sock_vpp_get_available(hc_sock_t *s, u8 **buffer, size_t *size) { // NOT IMPLEMENTED return -1; } -int hc_sock_recv(hc_sock_t *s) { +static int _hc_sock_vpp_recv(hc_sock_t *s) { // NOT IMPLEMENTED return -1; } -int hc_sock_process(hc_sock_t *s, hc_data_t **pdata) { +static int _hc_sock_vpp_process(hc_sock_t *s, hc_data_t **pdata) { //NOT IMPLEMENTED return -1; } +static int _hc_sock_vpp_callback(hc_sock_t * socket, hc_data_t ** pdata) { + // NOT IMPLEMENTED + return -1; +} + +static int _hc_sock_vpp_reset(hc_sock_t * socket) { + // NOT IMPLEMENTED + return -1; +} + /****************************************************************************** * Command-specific structures and functions ******************************************************************************/ @@ -275,23 +224,18 @@ int hc_sock_process(hc_sock_t *s, hc_data_t **pdata) { /* LISTENER CREATE */ -int _hc_listener_create(hc_sock_t *s, hc_listener_t *listener, bool async) { +static int _hc_listener_create(hc_sock_t *s, hc_listener_t *listener) { // NOT IMPLEMENTED return -1; } -int hc_listener_create(hc_sock_t *s, hc_listener_t *listener) { - // NOT IMPLEMENTED - return -1; -} - -int hc_listener_create_async(hc_sock_t *s, hc_listener_t *listener) { +static int _hc_listener_create_async(hc_sock_t *s, hc_listener_t *listener) { // NOT IMPLEMENTED return -1; } /* LISTENER GET */ -int hc_listener_get(hc_sock_t *s, hc_listener_t *listener, +static int _hc_listener_get(hc_sock_t *s, hc_listener_t *listener, hc_listener_t **listener_found) { // NOT IMPLEMENTED return -1; @@ -299,21 +243,21 @@ int hc_listener_get(hc_sock_t *s, hc_listener_t *listener, /* LISTENER DELETE */ -int hc_listener_delete(hc_sock_t *s, hc_listener_t *listener) { +static int _hc_listener_delete(hc_sock_t *s, hc_listener_t *listener) { // NOT IMPLEMENTED return -1; } -int hc_listener_delete_async(hc_sock_t *s, hc_listener_t *listener) { +static int _hc_listener_delete_async(hc_sock_t *s, hc_listener_t *listener) { // NOT IMPLEMENTED return -1; } -vapi_error_e process_ip_info(struct vapi_ctx_s *ctx, - void *callback_ctx, - vapi_error_e rv, - bool is_last, - vapi_payload_ip_address_details *reply) { +static vapi_error_e process_ip_info(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_ip_address_details *reply) { if (is_last) return 0; @@ -349,10 +293,11 @@ typedef struct { char interface_name[INTERFACE_LEN]; } hc_vapi_interface_t; -vapi_error_e listener_list_complete_cb (struct vapi_ctx_s *ctx, - void *callback_ctx, - vapi_error_e rv, - bool is_last, +static vapi_error_e listener_list_complete_cb ( + struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, vapi_payload_sw_interface_details *reply) { if (reply == NULL || rv != VAPI_OK) @@ -384,7 +329,8 @@ vapi_error_e listener_list_complete_cb (struct vapi_ctx_s *ctx, /* LISTENER LIST */ -int hc_listener_list(hc_sock_t *s, hc_data_t **pdata) { +static int _hc_listener_list(hc_sock_t *socket, hc_data_t **pdata) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); int retval = VAPI_OK; vapi_lock(); vapi_msg_sw_interface_dump *hicnp_msg; @@ -456,6 +402,7 @@ int hc_listener_list(hc_sock_t *s, hc_data_t **pdata) { retval = vapi_ip_address_dump(s->g_vapi_ctx_instance, msg2, process_ip_info, data2); for (size_t j = index; j < data2->current; j++) { memcpy(((hc_listener_t *)(data2->buffer))[j].interface_name, ((hc_vapi_interface_t*)(data->buffer))[i].interface_name, INTERFACE_LEN); + ((hc_listener_t *)(data2->buffer))[j].type = CONNECTION_TYPE_HICN; } if (retval) goto CLEAN; @@ -475,148 +422,104 @@ FREE_DATA: return retval; } -int hc_listener_list_async(hc_sock_t *s, hc_data_t **pdata) { - // NOT IMPLEMENTED - return -1; -} - -/* LISTENER VALIDATE */ - -int hc_listener_validate(const hc_listener_t *listener) { - // NOT IMPLEMENTED - return -1; -} - -/* LISTENER CMP */ - -int hc_listener_cmp(const hc_listener_t *l1, const hc_listener_t *l2) { - // NOT IMPLEMENTED - return -1; -} - -/* LISTENER PARSE */ - -int hc_listener_parse(void *in, hc_listener_t *listener) { +static int _hc_listener_list_async(hc_sock_t *s, hc_data_t **pdata) { // NOT IMPLEMENTED return -1; } -GENERATE_FIND(listener) - -/* LISTENER SNPRINTF */ - -/* /!\ Please update constants in header file upon changes */ -int -hc_listener_snprintf(char * s, size_t size, hc_listener_t * listener) -{ - char local[MAXSZ_URL]; - int rc; - rc = url_snprintf(local, MAXSZ_URL, - listener->family, &listener->local_addr, listener->local_port); - if (rc >= MAXSZ_URL) - WARN("[hc_listener_snprintf] Unexpected truncation of URL string"); - if (rc < 0) - return rc; - - return snprintf(s, size, "%s %s", listener->interface_name, local); -} - /*----------------------------------------------------------------------------* * CONNECTION *----------------------------------------------------------------------------*/ /* CONNECTION CREATE */ -int hc_connection_create(hc_sock_t *s, hc_connection_t *connection) { +static int _hc_connection_create(hc_sock_t *s, hc_connection_t *connection) { // NOT IMPLEMENTED return -1; } -int hc_connection_create_async(hc_sock_t *s, hc_connection_t *connection) { +static int _hc_connection_create_async(hc_sock_t *s, hc_connection_t *connection) { // NOT IMPLEMENTED return -1; } /* CONNECTION GET */ -int hc_connection_get(hc_sock_t *s, hc_connection_t *connection, +static int _hc_connection_get(hc_sock_t *s, hc_connection_t *connection, hc_connection_t **connection_found) { // NOT IMPLEMENTED return -1; } +static int _hc_connection_update_by_id(hc_sock_t *s, int hc_connection_id, hc_connection_t *connection) { + // Not implemented + return -1; +} + +static int _hc_connection_update(hc_sock_t *s, hc_connection_t *connection_current, hc_connection_t *connection_updated) { + // Not implemented + return -1; +} + /* CONNECTION DELETE */ -int hc_connection_delete(hc_sock_t *s, hc_connection_t *connection) { +static int _hc_connection_delete(hc_sock_t *s, hc_connection_t *connection) { // NOT IMPLEMENTED return -1; } -int hc_connection_delete_async(hc_sock_t *s, hc_connection_t *connection) { +static int _hc_connection_delete_async(hc_sock_t *s, hc_connection_t *connection) { // NOT IMPLEMENTED return -1; } /* CONNECTION LIST */ -int hc_connection_list(hc_sock_t *s, hc_data_t **pdata) { +static int _hc_connection_list(hc_sock_t *s, hc_data_t **pdata) { // NOT IMPLEMENTED return -1; } -int hc_connection_list_async(hc_sock_t *s, hc_data_t **pdata) { +static int _hc_connection_list_async(hc_sock_t *s, hc_data_t **pdata) { // NOT IMPLEMENTED return -1; } -/* CONNECTION VALIDATE */ +/* CONNECTION SET ADMIN STATE */ -int hc_connection_validate(const hc_connection_t *connection) { +static int _hc_connection_set_admin_state(hc_sock_t *s, const char *conn_id_or_name, + face_state_t state) { // NOT IMPLEMENTED return -1; } -/* CONNECTION CMP */ - -/* - * hICN light uses ports even for hICN connections, but their value is ignored. - * As connections are specific to hicn-light, we can safely use IP and ports for - * comparison independently of the face type. - */ -int hc_connection_cmp(const hc_connection_t *c1, const hc_connection_t *c2) { +static int _hc_connection_set_admin_state_async(hc_sock_t *s, + const char *conn_id_or_name, + face_state_t state) { // NOT IMPLEMENTED return -1; } -/* CONNECTION PARSE */ +#ifdef WITH_POLICY -int hc_connection_parse(void *in, hc_connection_t *connection) { +static int _hc_connection_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) { // NOT IMPLEMENTED return -1; } -GENERATE_FIND(connection) - -/* CONNECTION SNPRINTF */ - -/* /!\ Please update constants in header file upon changes */ -int hc_connection_snprintf(char *s, size_t size, - const hc_connection_t *connection) { +static int _hc_connection_set_priority_async(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) { // NOT IMPLEMENTED return -1; } -/* CONNECTION SET ADMIN STATE */ +#endif // WITH_POLICY -int hc_connection_set_admin_state(hc_sock_t *s, const char *conn_id_or_name, - face_state_t state) { +static int _hc_connection_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) { // NOT IMPLEMENTED return -1; } -int hc_connection_set_admin_state_async(hc_sock_t *s, - const char *conn_id_or_name, - face_state_t state) { +static int _hc_connection_set_tags_async(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) { // NOT IMPLEMENTED return -1; } @@ -625,7 +528,7 @@ int hc_connection_set_admin_state_async(hc_sock_t *s, * Routes *----------------------------------------------------------------------------*/ -vapi_error_e create_udp_tunnel_cb( vapi_ctx_t ctx, +static vapi_error_e create_udp_tunnel_cb( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -643,7 +546,7 @@ vapi_error_e create_udp_tunnel_cb( vapi_ctx_t ctx, } /* ROUTE CREATE */ -vapi_error_e parse_route_create( vapi_ctx_t ctx, +static vapi_error_e parse_route_create( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -657,7 +560,7 @@ vapi_error_e parse_route_create( vapi_ctx_t ctx, return reply->retval; } -vapi_error_e hicn_enable_cb( vapi_ctx_t ctx, +static vapi_error_e hicn_enable_cb( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -668,9 +571,10 @@ vapi_error_e hicn_enable_cb( vapi_ctx_t ctx, return reply->retval; } -int _hc_route_create(hc_sock_t *s, hc_route_t *route, bool async) { +static int _hc_route_create_internal(hc_sock_t *socket, hc_route_t *route, bool async) { if (!IS_VALID_FAMILY(route->family)) return -1; + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); int ret; vapi_lock(); @@ -786,16 +690,16 @@ done: return ret; } -int hc_route_create(hc_sock_t *s, hc_route_t *route) { - return _hc_route_create(s, route, false); +static int _hc_route_create(hc_sock_t *s, hc_route_t *route) { + return _hc_route_create_internal(s, route, false); } -int hc_route_create_async(hc_sock_t *s, hc_route_t *route) { - return _hc_route_create(s, route, true); +static int _hc_route_create_async(hc_sock_t *s, hc_route_t *route) { + return _hc_route_create_internal(s, route, true); } /* ROUTE DELETE */ -vapi_error_e parse_route_delete( vapi_ctx_t ctx, +static vapi_error_e parse_route_delete( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -806,9 +710,11 @@ vapi_error_e parse_route_delete( vapi_ctx_t ctx, return reply->retval; } -int _hc_route_delete(hc_sock_t *s, hc_route_t *route, bool async) { +static int _hc_route_delete_internal(hc_sock_t *socket, hc_route_t *route, bool async) { if (!IS_VALID_FAMILY(route->family)) return -1; + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); + vapi_lock(); vapi_msg_ip_route_add_del *hicnp_msg = vapi_alloc_ip_route_add_del(s->g_vapi_ctx_instance, 1); @@ -862,15 +768,15 @@ int _hc_route_delete(hc_sock_t *s, hc_route_t *route, bool async) { return ret; } -int hc_route_delete(hc_sock_t *s, hc_route_t *route) { - return _hc_route_delete(s, route, false); +static int _hc_route_delete(hc_sock_t *s, hc_route_t *route) { + return _hc_route_delete_internal(s, route, false); } -int hc_route_delete_async(hc_sock_t *s, hc_route_t *route) { - return _hc_route_delete(s, route, true); +static int _hc_route_delete_async(hc_sock_t *s, hc_route_t *route) { + return _hc_route_delete_internal(s, route, true); } -vapi_error_e parse_udp_encap_list( vapi_ctx_t ctx, +static vapi_error_e parse_udp_encap_list( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -905,7 +811,7 @@ vapi_error_e parse_udp_encap_list( vapi_ctx_t ctx, return rv; } -int fill_face_with_info(hc_face_t * face, vapi_type_fib_path *path, hc_sock_t *s) { +static int _fill_face_with_info(hc_face_t * face, vapi_type_fib_path *path, hc_sock_t *s) { switch(path->type){ case FIB_API_PATH_FLAG_NONE: { @@ -927,6 +833,8 @@ int fill_face_with_info(hc_face_t * face, vapi_type_fib_path *path, hc_sock_t *s { face->face.type = FACE_TYPE_UDP; face->face.netdevice.index = clib_net_to_host_u32(path->nh.obj_id); + // Let's make the compiler happy + (void)parse_udp_encap_list; //vapi_msg_udp_encap_dump *msg; //msg = vapi_alloc_udp_encap_dump(s->g_vapi_ctx_instance); //vapi_udp_encap_dump(s->g_vapi_ctx_instance, msg, parse_udp_encap_list, face); @@ -944,7 +852,7 @@ typedef struct hicn_route_socket_s { hc_sock_t *s; } hicn_route_socket_t; -vapi_error_e parse_route_list( vapi_ctx_t ctx, +static vapi_error_e parse_route_list( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -964,11 +872,11 @@ vapi_error_e parse_route_list( vapi_ctx_t ctx, if(ip46_address_is_ip4((ip46_address_t *)&(route->remote_addr)) && memcmp(route->remote_addr.v4.as_u8, reply->route.prefix.address.un.ip4, sizeof(ip4_address_t)) == 0 && route->len == reply->route.prefix.len && route->face_id == ~0) { - fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s); + _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s); found = true; } else if (memcmp(route->remote_addr.v6.as_u8, reply->route.prefix.address.un.ip6, sizeof(ip6_address_t)) == 0 && route->len == reply->route.prefix.len && route->face_id == ~0) { - fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s); + _fill_face_with_info(&(route->face), &reply->route.paths[j], rs->s); found = true; } } @@ -977,7 +885,7 @@ vapi_error_e parse_route_list( vapi_ctx_t ctx, return rv; } -vapi_error_e parse_hicn_route_list( vapi_ctx_t ctx, +static vapi_error_e parse_hicn_route_list( vapi_ctx_t ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -1018,7 +926,8 @@ vapi_error_e parse_hicn_route_list( vapi_ctx_t ctx, return rv; } -int _hc_route_list(hc_sock_t *s, hc_data_t **pdata, bool async) { +static int _hc_route_list_internal(hc_sock_t *socket, hc_data_t **pdata, bool async) { + hc_sock_vpp_t *s = TO_HC_SOCK_VPP(socket); vapi_lock(); vapi_msg_hicn_api_routes_dump *msg; @@ -1052,7 +961,7 @@ int _hc_route_list(hc_sock_t *s, hc_data_t **pdata, bool async) { hicn_route_socket_t ctx = { .data = data, - .s = s, + .s = socket, }; ret = vapi_ip_route_dump(s->g_vapi_ctx_instance, hicnp_msg, parse_route_list, &ctx); @@ -1078,29 +987,12 @@ int _hc_route_list(hc_sock_t *s, hc_data_t **pdata, bool async) { return ret; } -int hc_route_list(hc_sock_t *s, hc_data_t **pdata) { - return _hc_route_list(s, pdata, false); -} - -int hc_route_list_async(hc_sock_t *s) { - return _hc_route_list(s, NULL, true); +static int _hc_route_list(hc_sock_t *s, hc_data_t **pdata) { + return _hc_route_list_internal(s, pdata, false); } -/* ROUTE SNPRINTF */ - -/* /!\ Please update constants in header file upon changes */ -int hc_route_snprintf(char *s, size_t size, hc_route_t *route) { - /* interface cost prefix length */ - - char prefix[MAXSZ_IP_ADDRESS]; - int rc; - - rc = ip_address_snprintf(prefix, MAXSZ_IP_ADDRESS, &route->remote_addr, - route->family); - if (rc < 0) return rc; - - return snprintf(s, size, "%*d %*d %s %*d", MAXSZ_FACE_ID, route->face_id, - MAXSZ_COST, route->cost, prefix, MAXSZ_LEN, route->len); +static int _hc_route_list_async(hc_sock_t *s) { + return _hc_route_list_internal(s, NULL, true); } /*----------------------------------------------------------------------------* @@ -1116,176 +1008,108 @@ int hc_route_snprintf(char *s, size_t size, hc_route_t *route) { * *----------------------------------------------------------------------------*/ -/* FACE -> LISTENER */ - -int hc_face_to_listener(const hc_face_t *face, hc_listener_t *listener) { - const face_t *f = &face->face; - - switch (f->type) { - case FACE_TYPE_HICN_LISTENER: - break; - case FACE_TYPE_TCP_LISTENER: - break; - case FACE_TYPE_UDP_LISTENER: - break; - default: - return -1; - } - return -1; /* XXX Not implemented */ -} - -/* LISTENER -> FACE */ - -int hc_listener_to_face(const hc_listener_t *listener, hc_face_t *face) { - return -1; /* XXX Not implemented */ -} - -/* FACE -> CONNECTION */ - -int hc_face_to_connection(const hc_face_t *face, hc_connection_t *connection, - bool generate_name) { - return 0; -} - -/* CONNECTION -> FACE */ - -int hc_connection_to_face(const hc_connection_t *connection, hc_face_t *face) { - return 0; -} - -/* CONNECTION -> LISTENER */ - -int hc_connection_to_local_listener(const hc_connection_t *connection, - hc_listener_t *listener) { - return 0; -} - -int hc_face_create(hc_sock_t *s, hc_face_t *face) { +static int _hc_face_create(hc_sock_t *s, hc_face_t *face) { ERROR("Face creation implemented."); return -1; } -int hc_face_delete(hc_sock_t *s, hc_face_t *face) { +static int _hc_face_get(hc_sock_t * socket, hc_face_t * face, hc_face_t ** face_found) { + ERROR("Face deletion not implemented."); + return -1; +} +static int _hc_face_delete(hc_sock_t *s, hc_face_t *face) { ERROR("Face deletion not implemented."); return -1; } /* FACE LIST */ -int hc_face_list(hc_sock_t *s, hc_data_t **pdata) { - -ERROR("Face list not implemented."); -return -1; +static int _hc_face_list(hc_sock_t *s, hc_data_t **pdata) { + ERROR("Face list not implemented."); + return -1; } -int hc_connection_parse_to_face(void *in, hc_face_t *face) { return 0; } - -int hc_face_list_async(hc_sock_t *s) -{ +static int _hc_face_list_async(hc_sock_t *s) { return 0; } -/* /!\ Please update constants in header file upon changes */ -int hc_face_snprintf(char *s, size_t size, hc_face_t *face) { return 0; } - -int hc_face_set_admin_state( +static int _hc_face_set_admin_state( hc_sock_t *s, const char *conn_id_or_name, // XXX wrong identifier face_state_t admin_state) { return 0; } +#ifdef WITH_POLICY +static int _hc_face_set_priority(hc_sock_t * s, const char * conn_id_or_name, uint32_t priority) { + ERROR("Face set priority not implemented."); + return -1; +} + +static int _hc_face_set_tags(hc_sock_t * s, const char * conn_id_or_name, policy_tags_t tags) { + ERROR("Face set tags not implemented."); + return -1; +} +#endif // WITH_POLICY + /*----------------------------------------------------------------------------* * Punting *----------------------------------------------------------------------------*/ -int _hc_punting_create(hc_sock_t *s, hc_punting_t *punting, bool async) { - return 0; +static int _hc_punting_create_internal(hc_sock_t *s, hc_punting_t *punting, bool async) { + return -1; } -int hc_punting_create(hc_sock_t *s, hc_punting_t *punting) { - return _hc_punting_create(s, punting, false); +static int _hc_punting_create(hc_sock_t *s, hc_punting_t *punting) { + return _hc_punting_create_internal(s, punting, false); } -int hc_punting_create_async(hc_sock_t *s, hc_punting_t *punting) { - return _hc_punting_create(s, punting, true); +static int _hc_punting_create_async(hc_sock_t *s, hc_punting_t *punting) { + return _hc_punting_create_internal(s, punting, true); } -int hc_punting_get(hc_sock_t *s, hc_punting_t *punting, +static int _hc_punting_get(hc_sock_t *s, hc_punting_t *punting, hc_punting_t **punting_found) { ERROR("hc_punting_get not (yet) implemented."); return -1; } -int hc_punting_delete(hc_sock_t *s, hc_punting_t *punting) { +static int _hc_punting_delete(hc_sock_t *s, hc_punting_t *punting) { ERROR("hc_punting_delete not (yet) implemented."); return -1; } -int hc_punting_list(hc_sock_t *s, hc_data_t **pdata) { +static int _hc_punting_list(hc_sock_t *s, hc_data_t **pdata) { ERROR("hc_punting_list not (yet) implemented."); return -1; } -int hc_punting_validate(const hc_punting_t *punting) { - if (!IS_VALID_FAMILY(punting->family)) return -1; - - /* - * We might use the zero value to add punting on all faces but this is not - * (yet) implemented - */ - if (punting->face_id == 0) { - ERROR("Punting on all faces is not (yet) implemented."); - return -1; - } - - return 0; -} - -int hc_punting_cmp(const hc_punting_t *p1, const hc_punting_t *p2) { - return ((p1->face_id == p2->face_id) && (p1->family == p2->family) && - (ip_address_cmp(&p1->prefix, &p2->prefix, p1->family) == 0) && - (p1->prefix_len == p2->prefix_len)) - ? 0 - : -1; -} - -int hc_punting_parse(void *in, hc_punting_t *punting) { - ERROR("hc_punting_parse not (yet) implemented."); - return -1; -} - -int hc_punting_snprintf(char *s, size_t size, hc_punting_t *punting) { - ERROR("hc_punting_snprintf not (yet) implemented."); - return -1; -} - /*----------------------------------------------------------------------------* * Cache *----------------------------------------------------------------------------*/ -int _hc_cache_set_store(hc_sock_t *s, int enabled, bool async) { +static int _hc_cache_set_store_internal(hc_sock_t *s, int enabled, bool async) { return 0; } -int hc_cache_set_store(hc_sock_t *s, int enabled) { - return _hc_cache_set_store(s, enabled, false); +static int _hc_cache_set_store(hc_sock_t *s, int enabled) { + return _hc_cache_set_store_internal(s, enabled, false); } -int hc_cache_set_store_async(hc_sock_t *s, int enabled) { - return _hc_cache_set_store(s, enabled, true); +static int _hc_cache_set_store_async(hc_sock_t *s, int enabled) { + return _hc_cache_set_store_internal(s, enabled, true); } -int _hc_cache_set_serve(hc_sock_t *s, int enabled, bool async) { +static int _hc_cache_set_serve_internal(hc_sock_t *s, int enabled, bool async) { return 0; } -int hc_cache_set_serve(hc_sock_t *s, int enabled) { - return _hc_cache_set_serve(s, enabled, false); +static int _hc_cache_set_serve(hc_sock_t *s, int enabled) { + return _hc_cache_set_serve_internal(s, enabled, false); } -int hc_cache_set_serve_async(hc_sock_t *s, int enabled) { - return _hc_cache_set_serve(s, enabled, true); +static int _hc_cache_set_serve_async(hc_sock_t *s, int enabled) { + return _hc_cache_set_serve_internal(s, enabled, true); } /*----------------------------------------------------------------------------* @@ -1293,55 +1117,189 @@ int hc_cache_set_serve_async(hc_sock_t *s, int enabled) { *----------------------------------------------------------------------------*/ // per prefix -int hc_strategy_set(hc_sock_t *s /* XXX */) { return 0; } - -#define ARRAY_SIZE(array) (sizeof(array) / sizeof(*array)) +static int _hc_strategy_set(hc_sock_t *s /* XXX */) { return 0; } -int hc_strategy_list(hc_sock_t *s, hc_data_t **data) { +static int _hc_strategy_list(hc_sock_t *s, hc_data_t **data) { return 0; } -/* /!\ Please update constants in header file upon changes */ -int hc_strategy_snprintf(char *s, size_t size, hc_strategy_t *strategy) { - return snprintf(s, size, "%s", strategy->name); -} - /*----------------------------------------------------------------------------* * WLDR *----------------------------------------------------------------------------*/ // per connection -int hc_wldr_set(hc_sock_t *s /* XXX */) { return 0; } +static int _hc_wldr_set(hc_sock_t *s /* XXX */) { return 0; } /*----------------------------------------------------------------------------* * MAP-Me *----------------------------------------------------------------------------*/ -int hc_mapme_set(hc_sock_t *s, int enabled) { return 0; } +static int _hc_mapme_set(hc_sock_t *s, int enabled) { return 0; } + +static int _hc_mapme_set_discovery(hc_sock_t *s, int enabled) { return 0; } + +static int _hc_mapme_set_timescale(hc_sock_t *s, double timescale) { return 0; } + +static int _hc_mapme_set_retx(hc_sock_t *s, double timescale) { return 0; } + +/*----------------------------------------------------------------------------* + * Policy + *----------------------------------------------------------------------------*/ + +#ifdef WITH_POLICY -int hc_mapme_set_discovery(hc_sock_t *s, int enabled) { return 0; } +/* POLICY CREATE */ -int hc_mapme_set_timescale(hc_sock_t *s, double timescale) { return 0; } +static int _hc_policy_create_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) { + return -1; +} -int hc_mapme_set_retx(hc_sock_t *s, double timescale) { return 0; } +static int +_hc_policy_create(hc_sock_t * s, hc_policy_t * policy) { + return _hc_policy_create_internal(s, policy, false); +} -/* Useless function defined to prevent undefined reference */ -hc_connection_type_t -connection_type_from_str(const char * str) -{ - if (strcasecmp(str, "TCP") == 0) - return CONNECTION_TYPE_TCP; - else if (strcasecmp(str, "UDP") == 0) - return CONNECTION_TYPE_UDP; - else if (strcasecmp(str, "HICN") == 0) - return CONNECTION_TYPE_HICN; - else - return CONNECTION_TYPE_UNDEFINED; +static int _hc_policy_create_async(hc_sock_t * s, hc_policy_t * policy) { + return _hc_policy_create_internal(s, policy, true); } -/*********************** Missing Symbol in vpp libraries *************************/ -u8 * -format_vl_api_address_union (u8 * s, va_list * args) -{ +/* POLICY DELETE */ + +static int _hc_policy_delete_internal(hc_sock_t * socket, hc_policy_t * policy, bool async) { + return -1; +} + +static int _hc_policy_delete(hc_sock_t * s, hc_policy_t * policy) { + return _hc_policy_delete_internal(s, policy, false); +} + +static int _hc_policy_delete_async(hc_sock_t * s, hc_policy_t * policy) { + return _hc_policy_delete_internal(s, policy, true); +} + +/* POLICY LIST */ + +static int +_hc_policy_list_internal(hc_sock_t * socket, hc_data_t ** pdata, bool async) { + return -1; +} + +static int _hc_policy_list(hc_sock_t * s, hc_data_t ** pdata) { + return _hc_policy_list_internal(s, pdata, false); +} + +static int _hc_policy_list_async(hc_sock_t * s, hc_data_t ** pdata) { + return _hc_policy_list_internal(s, pdata, true); +} + +#endif /* WITH_POLICY */ + +static hc_sock_t hc_sock_vpp_interface = (hc_sock_t) { + .hc_sock_get_next_seq = _hc_sock_vpp_get_next_seq, + .hc_sock_set_nonblocking = _hc_sock_vpp_set_nonblocking, + .hc_sock_get_fd = _hc_sock_vpp_get_fd, + .hc_sock_connect = _hc_sock_vpp_connect, + .hc_sock_get_available = _hc_sock_vpp_get_available, + .hc_sock_send = _hc_sock_vpp_send, + .hc_sock_recv = _hc_sock_vpp_recv, + .hc_sock_process = _hc_sock_vpp_process, + .hc_sock_callback = _hc_sock_vpp_callback, + .hc_sock_reset = _hc_sock_vpp_reset, + .hc_sock_free = _hc_sock_vpp_free, + .hc_listener_create = _hc_listener_create, + .hc_listener_create_async = _hc_listener_create_async, + .hc_listener_get = _hc_listener_get, + .hc_listener_delete = _hc_listener_delete, + .hc_listener_delete_async = _hc_listener_delete_async, + .hc_listener_list = _hc_listener_list, + .hc_listener_list_async = _hc_listener_list_async, + .hc_connection_create = _hc_connection_create, + .hc_connection_create_async = _hc_connection_create_async, + .hc_connection_get = _hc_connection_get, + .hc_connection_update_by_id = _hc_connection_update_by_id, + .hc_connection_update = _hc_connection_update, + .hc_connection_delete = _hc_connection_delete, + .hc_connection_delete_async = _hc_connection_delete_async, + .hc_connection_list = _hc_connection_list, + .hc_connection_list_async = _hc_connection_list_async, + .hc_connection_set_admin_state = _hc_connection_set_admin_state, + .hc_connection_set_admin_state_async = _hc_connection_set_admin_state_async, + +#ifdef WITH_POLICY + .hc_connection_set_priority = _hc_connection_set_priority, + .hc_connection_set_priority_async = _hc_connection_set_priority_async, + .hc_connection_set_tags = _hc_connection_set_tags, + .hc_connection_set_tags_async = _hc_connection_set_tags_async, +#endif // WITH_POLICY + + .hc_face_create = _hc_face_create, + .hc_face_get = _hc_face_get, + .hc_face_delete = _hc_face_delete, + .hc_face_list = _hc_face_list, + .hc_face_list_async = _hc_face_list_async, + .hc_face_set_admin_state = _hc_face_set_admin_state, + +#ifdef WITH_POLICY + .hc_face_set_priority = _hc_face_set_priority, + .hc_face_set_tags = _hc_face_set_tags, +#endif // WITH_POLICY + + .hc_route_create = _hc_route_create, + .hc_route_create_async = _hc_route_create_async, + .hc_route_delete = _hc_route_delete, + .hc_route_delete_async = _hc_route_delete_async, + .hc_route_list = _hc_route_list, + .hc_route_list_async = _hc_route_list_async, + + .hc_punting_create = _hc_punting_create, + .hc_punting_create_async = _hc_punting_create_async, + .hc_punting_get = _hc_punting_get, + .hc_punting_delete = _hc_punting_delete, + .hc_punting_list = _hc_punting_list, + + .hc_cache_set_store = _hc_cache_set_store, + .hc_cache_set_store_async = _hc_cache_set_store_async, + .hc_cache_set_serve = _hc_cache_set_serve, + .hc_cache_set_serve_async = _hc_cache_set_serve_async, + + .hc_strategy_list = _hc_strategy_list, + .hc_strategy_set = _hc_strategy_set, + .hc_wldr_set = _hc_wldr_set, + + .hc_mapme_set = _hc_mapme_set, + .hc_mapme_set_discovery = _hc_mapme_set_discovery, + .hc_mapme_set_timescale = _hc_mapme_set_timescale, + .hc_mapme_set_retx = _hc_mapme_set_retx, + +#ifdef WITH_POLICY + .hc_policy_create = _hc_policy_create, + .hc_policy_create_async = _hc_policy_create_async, + .hc_policy_delete = _hc_policy_delete, + .hc_policy_delete_async = _hc_policy_delete_async, + .hc_policy_list = _hc_policy_list, + .hc_policy_list_async = _hc_policy_list_async +#endif // WITH_POLICY +}; + +hc_sock_t *_hc_sock_create_url(const char *url) { + // NOT IMPLEMENTED return NULL; } + +hc_sock_t *_hc_sock_create(void) { + hc_sock_vpp_t *s = malloc(sizeof(hc_sock_vpp_t)); + + if (!s) goto ERR_SOCK; + + memset(s, 0, sizeof(hc_sock_vpp_t)); + + s->vft = hc_sock_vpp_interface; + + // By default the socket is blocking -- not async + s->async = 0; + + return (hc_sock_t *)(s); + +ERR_SOCK: + return NULL; +}
\ No newline at end of file diff --git a/ctrl/sysrepo-plugins/CMakeLists.txt b/ctrl/sysrepo-plugins/CMakeLists.txt index f1e1553dc..2412d5688 100644 --- a/ctrl/sysrepo-plugins/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/CMakeLists.txt @@ -13,7 +13,7 @@ # limitations under the License. # -cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +cmake_minimum_required(VERSION 3.10 FATAL_ERROR) project(hicn_sysrepo_plugin) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" diff --git a/ctrl/sysrepo-plugins/hicn-light/CMakeLists.txt b/ctrl/sysrepo-plugins/hicn-light/CMakeLists.txt index 6be257656..5ba7045c1 100644 --- a/ctrl/sysrepo-plugins/hicn-light/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/hicn-light/CMakeLists.txt @@ -20,7 +20,6 @@ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2") set(CMAKE_C_FLAGS_DEBUG "-g -O0") set (CMAKE_INSTALL_LIBDIR "/usr/lib") -cmake_minimum_required(VERSION 3.5) project(sysrepo-light-plugins) # Cmake find modules diff --git a/ctrl/sysrepo-plugins/hicn-light/plugin/CMakeLists.txt b/ctrl/sysrepo-plugins/hicn-light/plugin/CMakeLists.txt index 220809d71..85da0d3e9 100644 --- a/ctrl/sysrepo-plugins/hicn-light/plugin/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/hicn-light/plugin/CMakeLists.txt @@ -20,7 +20,6 @@ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2") set(CMAKE_C_FLAGS_DEBUG "-g -O0") set (CMAKE_INSTALL_LIBDIR "/usr/lib") -cmake_minimum_required(VERSION 3.5) project(sysrepo-light-plugins) # Cmake find modules diff --git a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt index a89936776..10e106f51 100644 --- a/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt +++ b/ctrl/sysrepo-plugins/hicn-plugin/CMakeLists.txt @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.5) - # Cmake find modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../../cmake/Modules" "${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules" |