From 55d06ad1cd4f64fc7382bcaf14dc57c1f16db8fe Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 12 Dec 2022 16:19:35 +0000 Subject: feat: upgrade to VPP 22.10 Change-Id: I556bd8c44f0ff7a631a0df34b498ffd7952fcf4a Signed-off-by: Mauro Sardara --- hicn-plugin/includes/vpp_plugins/hicn/error.h | 158 ++++++++++++++++---------- 1 file changed, 95 insertions(+), 63 deletions(-) (limited to 'hicn-plugin/includes') diff --git a/hicn-plugin/includes/vpp_plugins/hicn/error.h b/hicn-plugin/includes/vpp_plugins/hicn/error.h index be4e53c27..717017564 100644 --- a/hicn-plugin/includes/vpp_plugins/hicn/error.h +++ b/hicn-plugin/includes/vpp_plugins/hicn/error.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Cisco and/or its affiliates. + * Copyright (c) 2021-2023 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: @@ -22,81 +22,113 @@ * Error codes for the hICN plugin. */ +#define PREFIX(x) HICN_ERROR_##x +#define NEXT(x) PREFIX (x) - 1 + #define foreach_hicn_error \ _ (NONE, 0, "Ok") \ _ (UNSPECIFIED, -128, "Unspecified Error") \ - _ (FACE_NOT_FOUND, -1000, "Face not found in Face table") \ - _ (FACE_NULL, -1001, "Face null") \ - _ (FACE_IP_ADJ_NOT_FOUND, -1002, "Ip adjacecny for face not found") \ - _ (FACE_HW_INT_NOT_FOUND, -1003, "Hardware interface not found") \ - _ (FACE_NOMEM, -1004, "Face table is full") \ - _ (FACE_NO_GLOBAL_IP, -1005, "No global ip address for face") \ - _ (FACE_NOT_FOUND_IN_ENTRY, -1006, "Face not found in entry") \ - _ (FACE_ALREADY_DELETED, -1007, "Face alredy deleted") \ - _ (FACE_ALREADY_CREATED, -1008, "Face alredy created") \ - _ (FWD_NOT_ENABLED, -2000, "hICN forwarder not enabled") \ - _ (FWD_ALREADY_ENABLED, -2001, "hICN forwarder alredy enabled") \ - _ (PARSER_UNSUPPORTED_PROTO, -3000, "Unsupported protocol") \ - _ (PARSER_PKT_INVAL, -3001, "Packet null") \ - _ (PARSER_MAPME_PACKET, -3002, "Packet is mapme") \ - _ (PIT_CONFIG_MINLT_OOB, -4000, "Min lifetime ouf of bounds") \ - _ (PIT_CONFIG_MAXLT_OOB, -4001, "Max lifetime ouf of bounds") \ - _ (PIT_CONFIG_MINMAXLT, -4002, "Min lifetime grater than max lifetime") \ - _ (PIT_CONFIG_DFTLT_OOB, -4003, "Default lifetime ouf of bounds") \ - _ (PIT_CONFIG_SIZE_OOB, -4004, "Pit size ouf of bounds") \ - _ (CS_CONFIG_SIZE_OOB, -5000, "CS size ouf of bounds") \ - _ (CS_CONFIG_RESERVED_OOB, -5001, \ + _ (FACE_NOT_FOUND, NEXT (UNSPECIFIED), "Face not found in Face table") \ + _ (FACE_NULL, NEXT (FACE_NOT_FOUND), "Face null") \ + _ (FACE_IP_ADJ_NOT_FOUND, NEXT (FACE_NULL), \ + "Ip adjacecny for face not found") \ + _ (FACE_HW_INT_NOT_FOUND, NEXT (FACE_IP_ADJ_NOT_FOUND), \ + "Hardware interface not found") \ + _ (FACE_NOMEM, NEXT (FACE_HW_INT_NOT_FOUND), "Face table is full") \ + _ (FACE_NO_GLOBAL_IP, NEXT (FACE_NOMEM), "No global ip address for face") \ + _ (FACE_NOT_FOUND_IN_ENTRY, NEXT (FACE_NO_GLOBAL_IP), \ + "Face not found in entry") \ + _ (FACE_ALREADY_DELETED, NEXT (FACE_NOT_FOUND_IN_ENTRY), \ + "Face alredy deleted") \ + _ (FACE_ALREADY_CREATED, NEXT (FACE_ALREADY_DELETED), \ + "Face alredy created") \ + _ (FWD_NOT_ENABLED, NEXT (FACE_ALREADY_CREATED), \ + "hICN forwarder not enabled") \ + _ (FWD_ALREADY_ENABLED, NEXT (FWD_NOT_ENABLED), \ + "hICN forwarder alredy enabled") \ + _ (PARSER_UNSUPPORTED_PROTO, NEXT (FWD_ALREADY_ENABLED), \ + "Unsupported protocol") \ + _ (PARSER_PKT_INVAL, NEXT (PARSER_UNSUPPORTED_PROTO), "Packet null") \ + _ (PARSER_MAPME_PACKET, NEXT (PARSER_PKT_INVAL), "Packet is mapme") \ + _ (PIT_CONFIG_MINLT_OOB, NEXT (PARSER_MAPME_PACKET), \ + "Min lifetime ouf of bounds") \ + _ (PIT_CONFIG_MAXLT_OOB, NEXT (PIT_CONFIG_MINLT_OOB), \ + "Max lifetime ouf of bounds") \ + _ (PIT_CONFIG_MINMAXLT, NEXT (PIT_CONFIG_MAXLT_OOB), \ + "Min lifetime grater than max lifetime") \ + _ (PIT_CONFIG_DFTLT_OOB, NEXT (PIT_CONFIG_MINMAXLT), \ + "Default lifetime ouf of bounds") \ + _ (PIT_CONFIG_SIZE_OOB, NEXT (PIT_CONFIG_DFTLT_OOB), \ + "Pit size ouf of bounds") \ + _ (CS_CONFIG_SIZE_OOB, NEXT (PIT_CONFIG_SIZE_OOB), "CS size ouf of bounds") \ + _ (CS_CONFIG_RESERVED_OOB, NEXT (CS_CONFIG_SIZE_OOB), \ "Reseved CS must be between 0 and 100 (excluded)") \ - _ (DPO_CTX_NHOPS_NS, -6000, "No space for additional next hop") \ - _ (DPO_CTX_NHOPS_EXISTS, -6001, "Next hop already in the route") \ - _ (DPO_CTX_NOT_FOUND, -6002, "Dpo context not found") \ - _ (DPO_MGR_ID_NOT_VALID, -6003, \ + _ (DPO_CTX_NHOPS_NS, NEXT (CS_CONFIG_RESERVED_OOB), \ + "No space for additional next hop") \ + _ (DPO_CTX_NHOPS_EXISTS, NEXT (DPO_CTX_NHOPS_NS), \ + "Next hop already in the route") \ + _ (DPO_CTX_NOT_FOUND, NEXT (DPO_CTX_NHOPS_EXISTS), "Dpo context not found") \ + _ (DPO_MGR_ID_NOT_VALID, NEXT (DPO_CTX_NOT_FOUND), \ "Dpo id for strategy and context not valid") \ - _ (HASHTB_HASH_NOT_FOUND, -7000, "Hash not found in hash table") \ - _ (HASHTB_HASH_INVAL, -7001, "Error while calculating the hash") \ - _ (HASHTB_NOMEM, -7002, "Unable to allocate new buckets or nodes") \ - _ (HASHTB_INVAL, -7003, "Invalid argument") \ - _ (HASHTB_KEY_INVAL, -7004, "Invalid hashtb key") \ - _ (HASHTB_EXIST, -7005, "Hash already in hashtable") \ - _ (ROUTE_INVAL, -8000, "Invalid face id and weight") \ - _ (ROUTE_NO_LD, -8001, "Expected load balance dpo") \ - _ (ROUTE_MLT_LD, -8002, "Unexpected mulitple buckets in load balance dpo") \ - _ (ROUTE_NO_INSERT, -8003, "Unable to insert a new FIB entry") \ - _ (ROUTE_DPO_NO_HICN, -8004, "Dpo is not of type hICN") \ - _ (ROUTE_NOT_FOUND, -8005, "Route not found in FIB") \ - _ (ROUTE_NOT_UPDATED, -8006, "Unable to update route") \ - _ (ROUTE_ALREADY_EXISTS, -8007, "Route already in FIB") \ - _ (CLI_INVAL, -9000, "Invalid input") \ - _ (IPS_ADDR_TYPE_NONUNIFORM, -10000, \ + _ (HASHTB_HASH_NOT_FOUND, NEXT (DPO_MGR_ID_NOT_VALID), \ + "Hash not found in hash table") \ + _ (HASHTB_HASH_INVAL, NEXT (HASHTB_HASH_NOT_FOUND), \ + "Error while calculating the hash") \ + _ (HASHTB_NOMEM, NEXT (HASHTB_HASH_INVAL), \ + "Unable to allocate new buckets or nodes") \ + _ (HASHTB_INVAL, NEXT (HASHTB_NOMEM), "Invalid argument") \ + _ (HASHTB_KEY_INVAL, NEXT (HASHTB_INVAL), "Invalid hashtb key") \ + _ (HASHTB_EXIST, NEXT (HASHTB_KEY_INVAL), "Hash already in hashtable") \ + _ (ROUTE_INVAL, NEXT (HASHTB_EXIST), "Invalid face id and weight") \ + _ (ROUTE_NO_LD, NEXT (ROUTE_INVAL), "Expected load balance dpo") \ + _ (ROUTE_MLT_LD, NEXT (ROUTE_NO_LD), \ + "Unexpected mulitple buckets in load balance dpo") \ + _ (ROUTE_NO_INSERT, NEXT (ROUTE_MLT_LD), \ + "Unable to insert a new FIB entry") \ + _ (ROUTE_DPO_NO_HICN, NEXT (ROUTE_NO_INSERT), "Dpo is not of type hICN") \ + _ (ROUTE_NOT_FOUND, NEXT (ROUTE_DPO_NO_HICN), "Route not found in FIB") \ + _ (ROUTE_NOT_UPDATED, NEXT (ROUTE_NOT_FOUND), "Unable to update route") \ + _ (ROUTE_ALREADY_EXISTS, NEXT (ROUTE_NOT_UPDATED), "Route already in FIB") \ + _ (CLI_INVAL, NEXT (ROUTE_ALREADY_EXISTS), "Invalid input") \ + _ (IPS_ADDR_TYPE_NONUNIFORM, NEXT (CLI_INVAL), \ "Src and dst addr have different ip types") \ - _ (FACE_TYPE_EXISTS, -11000, "Face type already registered") \ - _ (NO_BUFFERS, -12000, "No vlib_buffer available for packet cloning.") \ - _ (NOT_IMPLEMENTED, -13000, "Function not yet implemented") \ - _ (IFACE_IP_ADJ_NOT_FOUND, -14000, \ + _ (FACE_TYPE_EXISTS, NEXT (IPS_ADDR_TYPE_NONUNIFORM), \ + "Face type already registered") \ + _ (NO_BUFFERS, NEXT (FACE_TYPE_EXISTS), \ + "No vlib_buffer available for packet cloning.") \ + _ (NOT_IMPLEMENTED, NEXT (NO_BUFFERS), "Function not yet implemented") \ + _ (IFACE_IP_ADJ_NOT_FOUND, NEXT (NOT_IMPLEMENTED), \ "IP adjacency on incomplete face not available") \ - _ (APPFACE_ALREADY_ENABLED, -15000, \ + _ (APPFACE_ALREADY_ENABLED, NEXT (IFACE_IP_ADJ_NOT_FOUND), \ "Application face already enabled on interface") \ - _ (APPFACE_FEATURE, -15001, "Error while enabling app face feature") \ - _ (APPFACE_NOT_FOUND, -15002, "Application face not found") \ - _ (APPFACE_PROD_PREFIX_NULL, -15003, \ + _ (APPFACE_FEATURE, NEXT (APPFACE_ALREADY_ENABLED), \ + "Error while enabling app face feature") \ + _ (APPFACE_NOT_FOUND, NEXT (APPFACE_FEATURE), "Application face not found") \ + _ (APPFACE_PROD_PREFIX_NULL, NEXT (APPFACE_NOT_FOUND), \ "Prefix must not be null for producer face") \ - _ (STRATEGY_NH_NOT_FOUND, -16000, "Next hop not found") \ - _ (MW_STRATEGY_SET, -16001, "Error while setting weight for next hop") \ - _ (STRATEGY_NOT_FOUND, -16002, "Strategy not found") \ - _ (UDP_TUNNEL_NOT_FOUND, -17000, "Udp tunnel not found") \ - _ (UDP_TUNNEL_SRC_DST_TYPE, -17001, \ + _ (STRATEGY_NH_NOT_FOUND, NEXT (APPFACE_PROD_PREFIX_NULL), \ + "Next hop not found") \ + _ (MW_STRATEGY_SET, NEXT (STRATEGY_NH_NOT_FOUND), \ + "Error while setting weight for next hop") \ + _ (STRATEGY_NOT_FOUND, NEXT (MW_STRATEGY_SET), "Strategy not found") \ + _ (UDP_TUNNEL_NOT_FOUND, NEXT (STRATEGY_NOT_FOUND), "Udp tunnel not found") \ + _ (UDP_TUNNEL_SRC_DST_TYPE, NEXT (UDP_TUNNEL_NOT_FOUND), \ "Src and dst addresses have different type (ipv4 and ipv6)") \ - _ (MAPME_NEXT_HOP_ADDED, -18000, "Next hop added to mapme") \ - _ (MAPME_NEXT_HOP_NOT_ADDED, -18001, "Next hop added to mapme") \ - _ (PCS_NOT_FOUND, -19000, "Hash not found in hash table") \ - _ (PCS_HASH_INVAL, -19001, "Error while calculating the hash") \ - _ (PCS_INVAL, -19002, "Invalid argument") \ - _ (PCS_KEY_INVAL, -19003, "Invalid hashtb key") \ - _ (PCS_EXIST, -19004, "Hash already in hashtable") + _ (MAPME_NEXT_HOP_ADDED, NEXT (UDP_TUNNEL_SRC_DST_TYPE), \ + "Next hop added to mapme") \ + _ (MAPME_NEXT_HOP_NOT_ADDED, NEXT (MAPME_NEXT_HOP_ADDED), \ + "Next hop added to mapme") \ + _ (PCS_NOT_FOUND, NEXT (MAPME_NEXT_HOP_NOT_ADDED), \ + "Hash not found in hash table") \ + _ (PCS_HASH_INVAL, NEXT (PCS_NOT_FOUND), \ + "Error while calculating the hash") \ + _ (PCS_INVAL, NEXT (PCS_HASH_INVAL), "Invalid argument") \ + _ (PCS_KEY_INVAL, NEXT (PCS_INVAL), "Invalid hashtb key") \ + _ (PCS_EXIST, NEXT (PCS_KEY_INVAL), "Hash already in hashtable") typedef enum { -#define _(a, b, c) HICN_ERROR_##a = (b), +#define _(a, b, c) PREFIX (a) = (b), foreach_hicn_error #undef _ HICN_N_ERROR, -- cgit 1.2.3-korg