ipng/lcpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

if sub_interface fails to create, return error and don't continue (fixes a crash)

Browse Source
This commit is contained in:
Pim van Pelt
2021-09-08 19:50:27 +00:00
parent 3c806d586d
commit 8b3356cd86
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lcpng_interface.c
View File

@ -809,7 +809,7 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
if (1 == sw->sub.eth.flags.dot1ad) outer_proto = ETH_P_8021AD; if (1 == sw->sub.eth.flags.dot1ad) outer_proto = ETH_P_8021AD;
LCP_ITF_PAIR_INFO ( LCP_ITF_PAIR_INFO (
"pair_create: createing dot1%s %d inner-dot1q %d on %U", "pair_create: creating dot1%s %d inner-dot1q %d on %U",
sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan, inner_vlan, sw->sub.eth.flags.dot1ad ? "ad" : "q", outer_vlan, inner_vlan,
format_vnet_sw_if_index_name, vnet_get_main (), hw->sw_if_index); format_vnet_sw_if_index_name, vnet_get_main (), hw->sw_if_index);
@ -907,13 +907,20 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
/* /*
* create a sub-interface on the tap * create a sub-interface on the tap
*/ */
if (!err && vnet_create_sub_interface (lip->lip_host_sw_if_index, if (!err &&
sw->sub.id, sw->sub.eth.raw_flags, vnet_create_sub_interface (lip->lip_host_sw_if_index, sw->sub.id,
inner_vlan, outer_vlan, sw->sub.eth.raw_flags, inner_vlan,
&host_sw_if_index)) outer_vlan, &host_sw_if_index))
LCP_ITF_PAIR_ERR ("pair_create: failed to create tap subint: %d.%d on %U", outer_vlan, inner_vlan, {
format_vnet_sw_if_index_name, vnet_get_main (), LCP_ITF_PAIR_ERR (
"pair_create: failed to create tap subint: %d.%d on %U",
outer_vlan, inner_vlan, format_vnet_sw_if_index_name,
vnet_get_main (), lip->lip_host_sw_if_index);
err = clib_error_return (
0, "failed to create tap subint: %d.%d on %U", outer_vlan,
inner_vlan, format_vnet_sw_if_index_name, vnet_get_main (),
lip->lip_host_sw_if_index); lip->lip_host_sw_if_index);
}
socket_close: socket_close:
if (orig_ns_fd != -1) if (orig_ns_fd != -1)