diff options
Diffstat (limited to 'src/scvpp/src/sc_vpp_ip.c')
| -rw-r--r-- | src/scvpp/src/sc_vpp_ip.c | 117 |
1 files changed, 2 insertions, 115 deletions
diff --git a/src/scvpp/src/sc_vpp_ip.c b/src/scvpp/src/sc_vpp_ip.c index 77e79fb..0dfd108 100644 --- a/src/scvpp/src/sc_vpp_ip.c +++ b/src/scvpp/src/sc_vpp_ip.c @@ -53,25 +53,6 @@ bin_api_sw_interface_add_del_address(u32 sw_if_index, bool is_add, bool is_ipv6, return rv; } -static vapi_error_e -bin_api_sw_interface_del_all_address(u32 sw_if_index) -{ - vapi_msg_sw_interface_add_del_address *mp; - vapi_error_e rv; - - mp = vapi_alloc_sw_interface_add_del_address(g_vapi_ctx_instance); - assert(NULL != mp); - - mp->payload.sw_if_index = sw_if_index; - mp->payload.is_add = 0; - mp->payload.del_all = 1; - - VAPI_CALL(vapi_sw_interface_add_del_address(g_vapi_ctx_instance, mp, - sw_interface_add_del_address_cb, NULL)); - - return rv; -} - VAPI_COPY_CB(ip_add_del_route) static vapi_error_e @@ -115,104 +96,10 @@ bin_api_ip_add_del_route(vapi_payload_ip_add_del_route_reply * reply, } static vapi_error_e -ip_fib_dump_cb(struct vapi_ctx_s *ctx, void *callback_ctx, vapi_error_e rv, - bool is_last, vapi_payload_ip_fib_details * reply) -{ - if (is_last) - { - assert (NULL == reply); - } - else - { - assert (NULL != reply); - - /* - typedef struct __attribute__ ((__packed__)) { - u32 table_id; - u8 table_name[64]; - u8 address_length; - u8 address[4]; - u32 count; - u32 stats_index; - vapi_type_fib_path path[0]; - } vapi_payload_ip_fib_details; - */ - - for (u32 i = 0; i < reply->count; ++i) - { - /* - typedef struct __attribute__((__packed__)) { - u32 sw_if_index; - u32 table_id; - u8 weight; - u8 preference; - u8 is_local; - u8 is_drop; - u8 is_udp_encap; - u8 is_unreach; - u8 is_prohibit; - u8 is_resolve_host; - u8 is_resolve_attached; - u8 is_dvr; - u8 is_source_lookup; - u8 afi; - u8 next_hop[16]; - u32 next_hop_id; - u32 rpf_id; - u32 via_label; - u8 n_labels; - vapi_type_fib_mpls_label label_stack[16]; - } vapi_type_fib_path; - - │493 case FIB_PATH_TYPE_ATTACHED_NEXT_HOP: │ -b+>│494 s = format (s, "%U", format_ip46_address, │ - │495 &path->attached_next_hop.fp_nh, │ - │496 IP46_TYPE_ANY); - - */ - - } - } - - return VAPI_OK; -} - -static vapi_error_e -bin_api_ip_fib_dump() -{ - vapi_msg_ip_fib_dump *mp = vapi_alloc_ip_fib_dump (g_vapi_ctx_instance); - assert(NULL != mp); - - //ip route add 2.2.2.2/24 via 5.5.5.5 - //show ip fib table 0 2.2.2.0/24 detail - - vapi_error_e rv; - VAPI_CALL(vapi_ip_fib_dump(g_vapi_ctx_instance, mp, ip_fib_dump_cb, NULL)); - - return rv; -} - -VAPI_RETVAL_CB(ip_table_add_del) - -static vapi_error_e -bin_api_table_add_del(u8 is_add, u32 table_id) -{ - vapi_msg_ip_table_add_del *mp = vapi_alloc_ip_table_add_del(g_vapi_ctx_instance); - assert(NULL != mp); - - mp->payload.is_add = is_add; - mp->payload.table_id = table_id; - - vapi_error_e rv; - VAPI_CALL(vapi_ip_table_add_del(g_vapi_ctx_instance, mp, ip_table_add_del_cb, NULL)); - - return rv; -} - -static vapi_error_e ip_address_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx, vapi_error_e rv, bool is_last, vapi_payload_ip_address_details *reply) { + UNUSED(rv); ARG_CHECK3(VAPI_EINVAL, ctx, callback_ctx, reply); //copy dump reply in callback context @@ -262,7 +149,7 @@ int ipv46_address_dump(const char *interface_name, char *ip_addr, if (!get_interface_id(&query)) return -EINVAL; - rv = bin_api_ip_address_dump(query.sw_interface_details.sw_if_index, false, &dctx); + rv = bin_api_ip_address_dump(query.sw_interface_details.sw_if_index, is_ipv6, &dctx); if (rv != VAPI_OK) return -EAGAIN; |