diff options
Diffstat (limited to 'hicn-plugin')
| -rw-r--r-- | hicn-plugin/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | hicn-plugin/README.md | 10 | ||||
| -rw-r--r-- | hicn-plugin/src/data_fwd.h | 4 | ||||
| -rw-r--r-- | hicn-plugin/src/strategy.c | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/hicn-plugin/CMakeLists.txt b/hicn-plugin/CMakeLists.txt index 04ca6df9b..15df64952 100644 --- a/hicn-plugin/CMakeLists.txt +++ b/hicn-plugin/CMakeLists.txt @@ -209,11 +209,9 @@ endif() execute_process(COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/hicn) # These files are missing from vpp binary distribution execute_process( - COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_json_parser.py?h=stable/1904 -o ${CMAKE_BINARY_DIR}/vapi_json_parser.py - COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_c_gen.py?h=stable/1904 -o ${CMAKE_BINARY_DIR}/vapi_c_gen.py - COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_cpp_gen.py?h=stable/1904 -o ${CMAKE_BINARY_DIR}/vapi_cpp_gen.py - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/vnet/adj - COMMAND curl https://git.fd.io/vpp/plain/src/vnet/adj/adj_midchain.h?h=stable/1904 -o ${CMAKE_CURRENT_BINARY_DIR}/vnet/adj/adj_midchain.h + COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_json_parser.py?h=stable/1908 -o ${CMAKE_BINARY_DIR}/vapi_json_parser.py + COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_c_gen.py?h=stable/1908 -o ${CMAKE_BINARY_DIR}/vapi_c_gen.py + COMMAND curl https://git.fd.io/vpp/plain/src/vpp-api/vapi/vapi_cpp_gen.py?h=stable/1908 -o ${CMAKE_BINARY_DIR}/vapi_cpp_gen.py ) add_custom_command( diff --git a/hicn-plugin/README.md b/hicn-plugin/README.md index d6a4dbc2d..8a9acae1c 100644 --- a/hicn-plugin/README.md +++ b/hicn-plugin/README.md @@ -64,14 +64,14 @@ hICN-plugin has been tested in: Build dependencies: -- VPP 19.04 +- VPP 19.08 - DEB packages (can be found https://packagecloud.io/fdio/release/install): - libvppinfra-dev - vpp-dev Running dependencies: -- VPP 19.04 +- VPP 19.08 - DEB packages (can be found https://packagecloud.io/fdio/release/install): - vpp - vpp-plugin-core @@ -209,9 +209,9 @@ hicn face app {add intfc <sw_if> {prod prefix <hicn_prefix> cs_size <size_in_pac `hicn face ip`: manipulates ip application faces in the forwarder. ``` -hicn face ip {add local <src_address> remote <dst_address> intfc <sw_if>} | {del id <face_id>} - <src_address> :the IPv4 or IPv6 local IP address to bind to - <dst_address> :the IPv4 or IPv6 address of the remote system +hicn face ip {[add local <src_address>] remote <dst_address> intfc <sw_if>} | {del id <face_id>} + <src_address> :the IPv4 or IPv6 local IP address to bind to (not mandatory, if not specified the local address is one of the address assigned to sw_if) + <dst_address> :the IPv4 or IPv6 address of the remote system <sw_if> :software interface on thop of which we create the face <face_id> :id of the face to remove ``` diff --git a/hicn-plugin/src/data_fwd.h b/hicn-plugin/src/data_fwd.h index c001e5af5..55434a024 100644 --- a/hicn-plugin/src/data_fwd.h +++ b/hicn-plugin/src/data_fwd.h @@ -83,7 +83,7 @@ vlib_buffer_clone_256_2 (vlib_main_t * vm, u32 src_buffer, u32 * buffers, vlib_buffer_t *d = vlib_get_buffer (vm, buffers[i]); d->current_data = s->current_data; d->current_length = head_end_offset; - d->trace_index = s->trace_index; + d->trace_handle = s->trace_handle; d->total_length_not_including_first_buffer = s->current_length - head_end_offset; @@ -94,7 +94,7 @@ vlib_buffer_clone_256_2 (vlib_main_t * vm, u32 src_buffer, u32 * buffers, } d->flags = s->flags | VLIB_BUFFER_NEXT_PRESENT; d->flags &= ~VLIB_BUFFER_EXT_HDR_VALID; - d->trace_index = s->trace_index; + d->trace_handle = s->trace_handle; clib_memcpy_fast (d->opaque, s->opaque, sizeof (s->opaque)); clib_memcpy_fast (d->opaque2, s->opaque2, sizeof (s->opaque2)); clib_memcpy_fast (vlib_buffer_get_current (d), diff --git a/hicn-plugin/src/strategy.c b/hicn-plugin/src/strategy.c index 747e155b1..a6c058e4f 100644 --- a/hicn-plugin/src/strategy.c +++ b/hicn-plugin/src/strategy.c @@ -186,7 +186,7 @@ hicn_forward_interest_fn (vlib_main_t * vm, vlib_buffer_t *b1; b1 = vlib_get_buffer (vm, from[1]); CLIB_PREFETCH (b1, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (&b1->trace_index, 2 * CLIB_CACHE_LINE_BYTES, + CLIB_PREFETCH (&b1->trace_handle, 2 * CLIB_CACHE_LINE_BYTES, STORE); } /* Dequeue a packet buffer */ |