From 058f80a04fb24404c3f4396a45051fbc4ba05b62 Mon Sep 17 00:00:00 2001 From: Alberto Compagno Date: Tue, 17 Mar 2020 11:21:40 +0100 Subject: [HICN-551] Removed source code that uses acl - Removed punting from the sysrepo-plugin - Removed calls to the punting functions of binary api in the libhicnctrl - Added documentation in vpp-plugin.md and doxygen related to pg Change-Id: I8936156d51524797441ec49f0d5e801a1ad3643a Signed-off-by: Alberto Compagno --- hicn-plugin/src/hicn_api_test.c | 185 ++-------------------------------------- 1 file changed, 6 insertions(+), 179 deletions(-) (limited to 'hicn-plugin/src/hicn_api_test.c') diff --git a/hicn-plugin/src/hicn_api_test.c b/hicn-plugin/src/hicn_api_test.c index 3e93300d7..08a579914 100644 --- a/hicn-plugin/src/hicn_api_test.c +++ b/hicn-plugin/src/hicn_api_test.c @@ -226,9 +226,7 @@ _(hicn_api_face_ip_del_reply) \ _(hicn_api_face_del_reply) \ _(hicn_api_route_nhops_add_reply) \ _(hicn_api_route_del_reply) \ -_(hicn_api_route_nhop_del_reply) \ -_(hicn_api_punting_add_reply) \ -_(hicn_api_punting_del_reply) +_(hicn_api_route_nhop_del_reply) #define _(n) \ static void vl_api_##n##_t_handler \ @@ -270,7 +268,6 @@ _(HICN_API_ROUTE_DEL_REPLY, hicn_api_route_del_reply) \ _(HICN_API_ROUTE_NHOP_DEL_REPLY, hicn_api_route_nhop_del_reply) \ _(HICN_API_STRATEGIES_GET_REPLY, hicn_api_strategies_get_reply) \ _(HICN_API_STRATEGY_GET_REPLY, hicn_api_strategy_get_reply) \ -_(HICN_API_PUNTING_ADD_REPLY, hicn_api_punting_add_reply) \ _(HICN_API_REGISTER_PROD_APP_REPLY, hicn_api_register_prod_app_reply) \ _(HICN_API_FACE_PROD_DEL_REPLY, hicn_api_face_prod_del_reply) \ _(HICN_API_REGISTER_CONS_APP_REPLY, hicn_api_register_cons_app_reply) \ @@ -488,7 +485,7 @@ api_hicn_api_face_ip_add (vat_main_t * vam) } /* Construct the API message */ M (HICN_API_FACE_ADD, mp); - mp->type = clib_host_to_net_u32(IP_FACE); + mp->type = clib_host_to_net_u32 (IP_FACE); ip_address_encode (&local_addr, IP46_TYPE_ANY, &mp->face.ip.local_addr); ip_address_encode (&remote_addr, IP46_TYPE_ANY, &mp->face.ip.remote_addr); mp->face.ip.swif = clib_host_to_net_u32 (sw_if); @@ -565,7 +562,7 @@ api_hicn_api_face_udp_add (vat_main_t * vam) } /* Construct the API message */ M (HICN_API_FACE_ADD, mp); - mp->type = clib_host_to_net_u32(UDP_FACE); + mp->type = clib_host_to_net_u32 (UDP_FACE); ip_address_encode (&local_addr, IP46_TYPE_ANY, &mp->face.udp.local_addr); ip_address_encode (&remote_addr, IP46_TYPE_ANY, &mp->face.udp.remote_addr); mp->face.udp.lport = clib_host_to_net_u16 (sport); @@ -591,8 +588,7 @@ api_hicn_api_face_add (vat_main_t * vam) /* Parse args required to build the message */ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat - (input, "type %d", &type)); + if (unformat (input, "type %d", &type)); else { break; @@ -602,9 +598,9 @@ api_hicn_api_face_add (vat_main_t * vam) vam->input = input; if (type == IP_FACE) - ret = api_hicn_api_face_ip_add(vam); + ret = api_hicn_api_face_ip_add (vam); else if (type == UDP_FACE) - ret = api_hicn_api_face_udp_add(vam); + ret = api_hicn_api_face_udp_add (vam); return ret; } @@ -1418,175 +1414,6 @@ static void fformat (vam->ofp, "%s", mp->description); } -static int -api_hicn_api_ip_punting_add (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_hicn_api_punting_add_t *mp; - fib_prefix_t prefix; - u32 swif = ~0; - int ret; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "prefix %U/%d", unformat_ip46_address, - &prefix.fp_addr, IP46_TYPE_ANY, &prefix.fp_len)) - {; - } - else if (unformat (input, "intfc %d", &swif)) - {; - } - else - { - break; - } - } - - /* Check parse */ - if (((prefix.fp_addr.as_u64[0] == 0) && (prefix.fp_addr.as_u64[1] == 0)) - || (prefix.fp_len == 0)) - { - clib_warning ("Please specify prefix..."); - return 1; - } - - if (swif == ~0) - { - clib_warning ("Please specify interface..."); - return 1; - } - /* Construct the API message */ - M (HICN_API_PUNTING_ADD, mp); - mp->type = IP_PUNT; - if (!ip46_address_is_ip4 (&(prefix.fp_addr))) - { - prefix.fp_proto = fib_proto_from_ip46 (IP46_TYPE_IP6); - } - ip_prefix_encode (&prefix, &mp->rule.ip.prefix); - - mp->rule.ip.swif = clib_host_to_net_u32 (swif); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return ret; -} - -static int -api_hicn_api_udp_punting_add (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - vl_api_hicn_api_punting_add_t *mp; - fib_prefix_t prefix; - u32 swif = ~0; - u16 sport = 0; - u16 dport = 0; - vl_api_address_family_t ip_version = ~0; - int ret; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "prefix %U/%d", unformat_ip46_address, - &prefix.fp_addr, IP46_TYPE_ANY, &prefix.fp_len)) - {; - } - else if (unformat (input, "sport %u", &sport)); - else if (unformat (input, "dport %u", &dport)); - else if (unformat (input, "ip4")) - { - ip_version = ADDRESS_IP4; - } - else if (unformat (input, "ip6")) - { - ip_version = ADDRESS_IP6; - } - else if (unformat (input, "intfc %d", &swif)) - {; - } - else - { - break; - } - } - - /* Check parse */ - if (((prefix.fp_addr.as_u64[0] == 0) && (prefix.fp_addr.as_u64[1] == 0)) - || (prefix.fp_len == 0)) - { - clib_warning ("Please specify prefix..."); - return 1; - } - - if (swif == ~0) - { - clib_warning ("Please specify interface..."); - return 1; - } - if (ip_version == ~0) - { - clib_warning ("Please specify ip version of the udp tunnel..."); - return 1; - } - /* Construct the API message */ - M (HICN_API_PUNTING_ADD, mp); - mp->type = UDP_PUNT; - if (!ip46_address_is_ip4 (&(prefix.fp_addr))) - { - prefix.fp_proto = fib_proto_from_ip46 (IP46_TYPE_IP6); - } - ip_prefix_encode (&prefix, &mp->rule.ip.prefix); - - mp->rule.udp.ip_version = ip_version; - - mp->rule.udp.swif = clib_host_to_net_u32 (swif); - mp->rule.udp.sport = clib_host_to_net_u16 (sport); - mp->rule.udp.sport = clib_host_to_net_u16 (dport); - - /* send it... */ - S (mp); - - /* Wait for a reply... */ - W (ret); - - return ret; -} - -static int -api_hicn_api_punting_add (vat_main_t * vam) -{ - unformat_input_t *input = vam->input; - u32 type = ~0; - int ret = 0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "type %d", &type)) - {; - } - else - { - break; - } - } - - vam->input = input; - if (type == IP_PUNT) - ret = api_hicn_api_ip_punting_add (vam); - else if (type == UDP_PUNT) - ret = api_hicn_api_udp_punting_add (vam); - - return ret; -} - -static int -api_hicn_api_punting_del (vat_main_t * vam) -{ - return 0; -} - static int api_hicn_api_register_prod_app (vat_main_t * vam) { -- cgit 1.2.3-korg