diff options
| author |   Florin Coras <florin.coras@gmail.com> | 2017-10-15 17:41:21 +0000 |
|---|---|---|
| committer | Florin Coras <florin.coras@gmail.com> | 2017-10-15 18:28:43 +0000 |
| commit | d0a59722135ec77e637097ef99edb6865bc38929 (patch) | |
| tree | b29d413e86361f682a79f5c372c942256b90fde2 /src/vnet/ip | |
| parent | 46ade031466e0ee863668fd24981183e467d552f (diff) | |
Revert "Enforce FIB table creation before use"
This reverts commit f9342023c19887da656133e2688a90d70383b0c5.
Reverting to unblock master. No idea why jjb +1ed this patch! On closer inspection it looks like it -1ed it and subsequently changed opinion. CSIT tests should be fixed before re-merging.
Change-Id: I26608912a962c52083073e16c7c9d2cc44a3cc8d
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vnet/ip')
| -rw-r--r-- | src/vnet/ip/ip.api | 3 | ||||
| -rw-r--r-- | src/vnet/ip/ip_api.c | 37 |
2 files changed, 37 insertions, 3 deletions
diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api index f5341667892..8501eb26030 100644 --- a/src/vnet/ip/ip.api +++ b/src/vnet/ip/ip.api @@ -362,6 +362,7 @@ autoreply define sw_interface_ip6_set_link_local_address @param vrf_id - fib table /vrf associated with the route @param lookup_in_vrf - @param classify_table_index - + @param create_vrf_if_needed - @param is_add - 1 if adding the route, 0 if deleting @param is_drop - Drop the packet @param is_unreach - Drop the packet and rate limit send ICMP unreachable @@ -390,6 +391,7 @@ autoreply define ip_add_del_route u32 table_id; u32 classify_table_index; u32 next_hop_table_id; + u8 create_vrf_if_needed; u8 is_add; u8 is_drop; u8 is_unreach; @@ -432,6 +434,7 @@ autoreply define ip_mroute_add_del u32 itf_flags; u32 rpf_id; u16 grp_address_length; + u8 create_vrf_if_needed; u8 is_add; u8 is_ipv6; u8 is_local; diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c index 8a3ceb2a4e9..a64c5b7b55b 100644 --- a/src/vnet/ip/ip_api.c +++ b/src/vnet/ip/ip_api.c @@ -989,11 +989,23 @@ add_del_route_check (fib_protocol_t table_proto, { vnet_main_t *vnm = vnet_get_main (); + /* Temporaray whilst I do the CSIT dance */ + u8 create_missing_tables = 1; + *fib_index = fib_table_find (table_proto, ntohl (table_id)); if (~0 == *fib_index) { - /* No such VRF */ - return VNET_API_ERROR_NO_SUCH_FIB; + if (create_missing_tables) + { + *fib_index = fib_table_find_or_create_and_lock (table_proto, + ntohl (table_id), + FIB_SOURCE_API); + } + else + { + /* No such VRF, and we weren't asked to create one */ + return VNET_API_ERROR_NO_SUCH_FIB; + } } if (!is_rpf_id && ~0 != ntohl (next_hop_sw_if_index)) @@ -1022,7 +1034,26 @@ add_del_route_check (fib_protocol_t table_proto, if (~0 == *next_hop_fib_index) { - return VNET_API_ERROR_NO_SUCH_FIB; + if (create_missing_tables) + { + if (is_rpf_id) + *next_hop_fib_index = + mfib_table_find_or_create_and_lock (fib_nh_proto, + ntohl + (next_hop_table_id), + MFIB_SOURCE_API); + else + *next_hop_fib_index = + fib_table_find_or_create_and_lock (fib_nh_proto, + ntohl + (next_hop_table_id), + FIB_SOURCE_API); + } + else + { + /* No such VRF, and we weren't asked to create one */ + return VNET_API_ERROR_NO_SUCH_FIB; + } } } |