ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Account for pool realloc when importing FIB entries during VRF export

Browse Source 
Change-Id: I8ec6d53fa9c0790f85802663f70a6b3630239f8d
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
This commit is contained in:
Neale Ranns
2017-01-10 18:13:41 +01:00
parent bf2fcad04a
commit 257d5e25bf
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vnet/vnet/fib/fib_attached_export.c
View File

@ -244,6 +244,12 @@ fib_attached_export_import (fib_entry_t *fib_entry,
{ {
fib_entry_delegate_t *fed; fib_entry_delegate_t *fed;
fib_ae_import_t *import; fib_ae_import_t *import;
fib_node_index_t fei;
/*
* save index for later post-realloc retreival
*/
fei = fib_entry_get_index(fib_entry);
pool_get(fib_ae_import_pool, import); pool_get(fib_ae_import_pool, import);
@ -292,11 +298,13 @@ fib_attached_export_import (fib_entry_t *fib_entry,
/* /*
* track the entry in the export table so we can update appropriately * track the entry in the export table so we can update appropriately
* when it changes * when it changes.
* Exporting prefixes will have allocated new fib_entry_t objects, so the pool
* may have realloc'd.
*/ */
fib_entry = fib_entry_get(fei);
import->faei_export_sibling = import->faei_export_sibling =
fib_entry_cover_track(fib_entry_get(import->faei_export_entry), fib_entry_cover_track(fib_entry_get(import->faei_export_entry), fei);
fib_entry_get_index(fib_entry));
fed = fib_entry_delegate_find_or_add(fib_entry, fed = fib_entry_delegate_find_or_add(fib_entry,
FIB_ENTRY_DELEGATE_ATTACHED_IMPORT); FIB_ENTRY_DELEGATE_ATTACHED_IMPORT);