Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
teib: fix segv during failed deletion of entry
[vpp.git]
/
src
/
vnet
/
teib
/
teib.c
diff --git
a/src/vnet/teib/teib.c
b/src/vnet/teib/teib.c
index
69ed416
..
44bbc7c
100644
(file)
--- a/
src/vnet/teib/teib.c
+++ b/
src/vnet/teib/teib.c
@@
-225,9
+225,6
@@
teib_entry_add (u32 sw_if_index,
.tk_sw_if_index = sw_if_index,
};
teib_entry_t *te;
.tk_sw_if_index = sw_if_index,
};
teib_entry_t *te;
- u32 fib_index;
-
- fib_index = fib_table_get_index_for_sw_if_index (nh_proto, sw_if_index);
pool_get_zero (teib_pool, te);
pool_get_zero (teib_pool, te);
@@
-282,8
+279,7
@@
teib_entry_del (u32 sw_if_index, const ip_address_t * peer)
}
else
{
}
else
{
- TEIB_INFO ("no such entry: %U, %U, %U",
- format_vnet_sw_if_index_name,
+ TEIB_INFO ("no such entry: %U, %U", format_vnet_sw_if_index_name,
vnet_get_main (), sw_if_index, format_ip_address, peer);
return (VNET_API_ERROR_NO_SUCH_ENTRY);
}
vnet_get_main (), sw_if_index, format_ip_address, peer);
return (VNET_API_ERROR_NO_SUCH_ENTRY);
}
@@
-317,10
+313,10
@@
teib_walk (teib_walk_cb_t fn, void *ctx)
index_t tei;
/* *INDENT-OFF* */
index_t tei;
/* *INDENT-OFF* */
- pool_foreach_index
(tei, teib_pool,
-
(
{
+ pool_foreach_index
(tei, teib_pool)
+
{
fn(tei, ctx);
fn(tei, ctx);
- }
));
+ }
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}
@@
-330,11
+326,11
@@
teib_walk_itf (u32 sw_if_index, teib_walk_cb_t fn, void *ctx)
index_t tei;
/* *INDENT-OFF* */
index_t tei;
/* *INDENT-OFF* */
- pool_foreach_index
(tei, teib_pool,
-
(
{
+ pool_foreach_index
(tei, teib_pool)
+
{
if (sw_if_index == teib_entry_get_sw_if_index(teib_entry_get(tei)))
fn(tei, ctx);
if (sw_if_index == teib_entry_get_sw_if_index(teib_entry_get(tei)))
fn(tei, ctx);
- }
));
+ }
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}
@@
-345,12
+341,12
@@
teib_walk_itf_proto (u32 sw_if_index,
index_t tei;
/* *INDENT-OFF* */
index_t tei;
/* *INDENT-OFF* */
- pool_foreach_index
(tei, teib_pool,
-
(
{
+ pool_foreach_index
(tei, teib_pool)
+
{
if (sw_if_index == teib_entry_get_sw_if_index(teib_entry_get(tei)) &&
af == teib_entry_get_af(teib_entry_get(tei)))
fn(tei, ctx);
if (sw_if_index == teib_entry_get_sw_if_index(teib_entry_get(tei)) &&
af == teib_entry_get_af(teib_entry_get(tei)))
fn(tei, ctx);
- }
));
+ }
/* *INDENT-ON* */
}
/* *INDENT-ON* */
}