diff options
Diffstat (limited to 'ctrl/libhicnctrl/includes')
| -rw-r--r-- | ctrl/libhicnctrl/includes/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/includes/hicn/ctrl/api.h | 2 | ||||
| -rw-r--r-- | ctrl/libhicnctrl/includes/hicn/ctrl/route.h | 46 |
3 files changed, 49 insertions, 2 deletions
diff --git a/ctrl/libhicnctrl/includes/CMakeLists.txt b/ctrl/libhicnctrl/includes/CMakeLists.txt index a85489a0c..50cfa4ad5 100644 --- a/ctrl/libhicnctrl/includes/CMakeLists.txt +++ b/ctrl/libhicnctrl/includes/CMakeLists.txt @@ -22,5 +22,6 @@ set(TO_INSTALL_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/hicn/ctrl/api.h ${CMAKE_CURRENT_SOURCE_DIR}/hicn/ctrl/commands.h ${CMAKE_CURRENT_SOURCE_DIR}/hicn/ctrl/face.h + ${CMAKE_CURRENT_SOURCE_DIR}/hicn/ctrl/route.h PARENT_SCOPE -)
\ 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 7b57a6323..f522010cd 100644 --- a/ctrl/libhicnctrl/includes/hicn/ctrl/api.h +++ b/ctrl/libhicnctrl/includes/hicn/ctrl/api.h @@ -213,7 +213,7 @@ hc_ ## TYPE ## _find(hc_data_t * data, const hc_ ## TYPE ## _t * element, \ hc_ ## TYPE ## _t **found) \ { \ foreach_type(hc_ ## TYPE ## _t, x, data) { \ - if (hc_ ## TYPE ## _cmp(x, element) >= 0) { \ + if (hc_ ## TYPE ## _cmp(x, element) == 0) { \ *found = x; \ return 0; \ } \ diff --git a/ctrl/libhicnctrl/includes/hicn/ctrl/route.h b/ctrl/libhicnctrl/includes/hicn/ctrl/route.h new file mode 100644 index 000000000..f67cccf93 --- /dev/null +++ b/ctrl/libhicnctrl/includes/hicn/ctrl/route.h @@ -0,0 +1,46 @@ +/* + * 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 route.h + * \brief hICN route + */ +#ifndef HICN_ROUTE_H +#define HICN_ROUTE_H + +#include <hicn/util/ip_address.h> + +typedef u8 face_id_t; +typedef u16 route_cost_t; + +typedef struct hicn_route_s hicn_route_t; + +#define MAXSZ_ROUTE_ MAXSZ_PREFIX + 3 + MAXSZ_COST +#define MAXSZ_ROUTE MAXSZ_ROUTE_ + NULLTERM + +hicn_route_t * hicn_route_create(ip_prefix_t * prefix, face_id_t face_id, route_cost_t cost); +void hicn_route_free(hicn_route_t * route); + +int hicn_route_cmp(const hicn_route_t * route1, const hicn_route_t * route2); + +int hicn_route_get_prefix(const hicn_route_t * route, ip_prefix_t * prefix); +int hicn_route_set_prefix(hicn_route_t * route, const ip_prefix_t prefix); + +int hicn_route_get_cost(const hicn_route_t * route, int * cost); +int hicn_route_set_cost(hicn_route_t * route, const int cost); + +size_t hicn_route_snprintf(char * s, size_t size, const hicn_route_t * route); + +#endif |