Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix vector index range checks
[vpp.git]
/
src
/
vnet
/
mpls
/
interface.c
diff --git
a/src/vnet/mpls/interface.c
b/src/vnet/mpls/interface.c
index
692a2d1
..
ec541f7
100644
(file)
--- a/
src/vnet/mpls/interface.c
+++ b/
src/vnet/mpls/interface.c
@@
-18,6
+18,7
@@
#include <vnet/vnet.h>
#include <vnet/pg/pg.h>
#include <vnet/mpls/mpls.h>
#include <vnet/vnet.h>
#include <vnet/pg/pg.h>
#include <vnet/mpls/mpls.h>
+#include <vnet/fib/mpls_fib.h>
#include <vnet/fib/ip4_fib.h>
#include <vnet/adj/adj_midchain.h>
#include <vnet/dpo/classify_dpo.h>
#include <vnet/fib/ip4_fib.h>
#include <vnet/adj/adj_midchain.h>
#include <vnet/dpo/classify_dpo.h>
@@
-28,31
+29,39
@@
mpls_sw_interface_is_enabled (u32 sw_if_index)
{
mpls_main_t * mm = &mpls_main;
{
mpls_main_t * mm = &mpls_main;
- if (vec_len(mm->mpls_enabled_by_sw_if_index) < sw_if_index)
+ if (vec_len(mm->mpls_enabled_by_sw_if_index) <
=
sw_if_index)
return (0);
return (mm->mpls_enabled_by_sw_if_index[sw_if_index]);
}
return (0);
return (mm->mpls_enabled_by_sw_if_index[sw_if_index]);
}
-void
+int
mpls_sw_interface_enable_disable (mpls_main_t * mm,
u32 sw_if_index,
mpls_sw_interface_enable_disable (mpls_main_t * mm,
u32 sw_if_index,
- u8 is_enable)
+ u8 is_enable,
+ u8 is_api)
{
fib_node_index_t lfib_index;
vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
{
fib_node_index_t lfib_index;
vec_validate_init_empty (mm->mpls_enabled_by_sw_if_index, sw_if_index, 0);
+ lfib_index = fib_table_find(FIB_PROTOCOL_MPLS,
+ MPLS_FIB_DEFAULT_TABLE_ID);
+
+ if (~0 == lfib_index)
+ return VNET_API_ERROR_NO_SUCH_FIB;
+
/*
* enable/disable only on the 1<->0 transition
*/
if (is_enable)
{
if (1 != ++mm->mpls_enabled_by_sw_if_index[sw_if_index])
/*
* enable/disable only on the 1<->0 transition
*/
if (is_enable)
{
if (1 != ++mm->mpls_enabled_by_sw_if_index[sw_if_index])
- return;
+ return (0);
+
+ fib_table_lock(lfib_index, FIB_PROTOCOL_MPLS,
+ (is_api? FIB_SOURCE_API: FIB_SOURCE_CLI));
- lfib_index = fib_table_find_or_create_and_lock(FIB_PROTOCOL_MPLS,
- MPLS_FIB_DEFAULT_TABLE_ID);
vec_validate(mm->fib_index_by_sw_if_index, 0);
mm->fib_index_by_sw_if_index[sw_if_index] = lfib_index;
}
vec_validate(mm->fib_index_by_sw_if_index, 0);
mm->fib_index_by_sw_if_index[sw_if_index] = lfib_index;
}
@@
-60,15
+69,17
@@
mpls_sw_interface_enable_disable (mpls_main_t * mm,
{
ASSERT(mm->mpls_enabled_by_sw_if_index[sw_if_index] > 0);
if (0 != --mm->mpls_enabled_by_sw_if_index[sw_if_index])
{
ASSERT(mm->mpls_enabled_by_sw_if_index[sw_if_index] > 0);
if (0 != --mm->mpls_enabled_by_sw_if_index[sw_if_index])
-
return
;
+
return (0)
;
fib_table_unlock(mm->fib_index_by_sw_if_index[sw_if_index],
fib_table_unlock(mm->fib_index_by_sw_if_index[sw_if_index],
- FIB_PROTOCOL_MPLS);
+ FIB_PROTOCOL_MPLS,
+ (is_api? FIB_SOURCE_API: FIB_SOURCE_CLI));
}
}
- vnet_feature_enable_disable ("mpls-input", "mpls-
lookup", sw_if_index
,
- is_enable, 0, 0);
+ vnet_feature_enable_disable ("mpls-input", "mpls-
not-enabled"
,
+
sw_if_index, !
is_enable, 0, 0);
+ return (0);
}
static clib_error_t *
}
static clib_error_t *
@@
-79,6
+90,7
@@
mpls_interface_enable_disable (vlib_main_t * vm,
vnet_main_t * vnm = vnet_get_main();
clib_error_t * error = 0;
u32 sw_if_index, enable;
vnet_main_t * vnm = vnet_get_main();
clib_error_t * error = 0;
u32 sw_if_index, enable;
+ int rv;
sw_if_index = ~0;
sw_if_index = ~0;
@@
-100,7
+112,10
@@
mpls_interface_enable_disable (vlib_main_t * vm,
goto done;
}
goto done;
}
- mpls_sw_interface_enable_disable(&mpls_main, sw_if_index, enable);
+ rv = mpls_sw_interface_enable_disable(&mpls_main, sw_if_index, enable, 0);
+
+ if (VNET_API_ERROR_NO_SUCH_FIB == rv)
+ error = clib_error_return (0, "default MPLS table must be created first");
done:
return error;
done:
return error;