diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-08-01 15:55:58 +0200 |
|---|---|---|
| committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-08-01 15:55:58 +0200 |
| commit | 7b373ed0c6d287aa61c65be2ddc7da1817e1757a (patch) | |
| tree | 433f9d367290e4cd932040c5fe86e41f2f5c6da1 /hicn-plugin/src/faces/udp/face_udp.c | |
| parent | 0a1c6b5565e20167d1f1f33a5a8b597f420b18b0 (diff) | |
[HICN-255] the api vnet_get_sw_interface_safe is now vnet_get_sw_interface_or_null
Change-Id: I080e7e216b779ce8beb292edadff0cc6c468549b
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'hicn-plugin/src/faces/udp/face_udp.c')
| -rw-r--r-- | hicn-plugin/src/faces/udp/face_udp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hicn-plugin/src/faces/udp/face_udp.c b/hicn-plugin/src/faces/udp/face_udp.c index 19a9d1e56..751065f82 100644 --- a/hicn-plugin/src/faces/udp/face_udp.c +++ b/hicn-plugin/src/faces/udp/face_udp.c @@ -145,7 +145,7 @@ hicn_face_udp_add (const ip46_address_t * local_addr, fib_prefix_t fib_pfx; fib_node_index_t fib_entry_index; fib_prefix_from_ip46_addr (remote_addr, &fib_pfx); - fib_pfx.fp_len = 32; + fib_pfx.fp_len = ip46_address_is_ip4(remote_addr)? 32 : 128; u32 fib_index = fib_table_find_or_create_and_lock (fib_pfx.fp_proto, HICN_FIB_TABLE, @@ -211,7 +211,7 @@ hicn_face_udp_add (const ip46_address_t * local_addr, fib_prefix_t fib_pfx; fib_node_index_t fib_entry_index; fib_prefix_from_ip46_addr (remote_addr, &fib_pfx); - fib_pfx.fp_len = 128; + fib_pfx.fp_len = ip46_address_is_ip4(remote_addr)? 32 : 128; u32 fib_index = fib_table_find_or_create_and_lock (fib_pfx.fp_proto, HICN_FIB_TABLE, @@ -352,7 +352,7 @@ format_hicn_face_udp (u8 * s, va_list * args) s = format (s, "%U", format_vnet_link, adj->ia_link); vnet_sw_interface_t *sw_int = - vnet_get_sw_interface_safe (vnm, face->shared.sw_if); + vnet_get_sw_interface_or_null (vnm, face->shared.sw_if); if (sw_int != NULL) s = format (s, " dev %U", format_vnet_sw_interface_name, vnm, sw_int); @@ -372,7 +372,7 @@ format_hicn_face_udp (u8 * s, va_list * args) s = format (s, "%U", format_vnet_link, adj->ia_link); vnet_sw_interface_t *sw_int = - vnet_get_sw_interface_safe (vnm, face->shared.sw_if); + vnet_get_sw_interface_or_null (vnm, face->shared.sw_if); if (sw_int != NULL) s = format (s, " dev %U", format_vnet_sw_interface_name, vnm, sw_int); @@ -395,7 +395,7 @@ format_hicn_face_udp (u8 * s, va_list * args) clib_net_to_host_u16 (udp_face->hdrs.ip4.udp.dst_port)); vnet_sw_interface_t *sw_int = - vnet_get_sw_interface_safe (vnm, face->shared.sw_if); + vnet_get_sw_interface_or_null (vnm, face->shared.sw_if); if (sw_int != NULL) s = format (s, " dev %U", format_vnet_sw_interface_name, vnm, sw_int); @@ -414,7 +414,7 @@ format_hicn_face_udp (u8 * s, va_list * args) clib_net_to_host_u16 (udp_face->hdrs.ip6.udp.dst_port)); vnet_sw_interface_t *sw_int = - vnet_get_sw_interface_safe (vnm, face->shared.sw_if); + vnet_get_sw_interface_or_null (vnm, face->shared.sw_if); if (sw_int != NULL) s = format (s, " dev %U", format_vnet_sw_interface_name, vnm, sw_int); |