diff options
| author |   Neale Ranns <neale.ranns@cisco.com> | 2018-07-30 08:04:40 -0700 |
|---|---|---|
| committer | Neale Ranns <neale.ranns@cisco.com> | 2018-07-30 08:04:40 -0700 |
| commit | c5d4317ad0425d01893dbb4afad9f16c2cde077d (patch) | |
| tree | 2bbb6b86a5bf9f051cacc5065a6b6c58be7cbcb6 /src/plugins | |
| parent | 1f895c9a40f446ca9f1b7803f350c70ebb3ad0fa (diff) | |
FIB: return entry prefix by const reference to avoid the copy
Change-Id: I09b8406168df4b6b28df3ede24ee839681be0195
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gbp/gbp_subnet.c | 10 | ||||
| -rw-r--r-- | src/plugins/map/map.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/gbp/gbp_subnet.c b/src/plugins/gbp/gbp_subnet.c index b6990844cd3..3819a51595b 100644 --- a/src/plugins/gbp/gbp_subnet.c +++ b/src/plugins/gbp/gbp_subnet.c @@ -97,13 +97,13 @@ static fib_table_walk_rc_t gbp_subnet_fib_table_walk (fib_node_index_t fei, void *arg) { gbp_subnet_fib_table_walk_ctx_t *ctx = arg; + const fib_prefix_t *pfx; const dpo_id_t *dpo; - fib_prefix_t pfx; u32 table_id; - fib_entry_get_prefix (fei, &pfx); + pfx = fib_entry_get_prefix (fei); table_id = fib_table_get_table_id (fib_entry_get_fib_index (fei), - pfx.fp_proto); + pfx->fp_proto); dpo = fib_entry_contribute_ip_forwarding (fei); if (DPO_LOAD_BALANCE == dpo->dpoi_type) @@ -117,7 +117,7 @@ gbp_subnet_fib_table_walk (fib_node_index_t fei, void *arg) gpd = gbp_policy_dpo_get (dpo->dpoi_index); /* *INDENT-OFF* */ - ctx->cb (table_id, &pfx, + ctx->cb (table_id, pfx, gpd->gpd_sw_if_index, gpd->gpd_epg, 0, // is_internal @@ -127,7 +127,7 @@ gbp_subnet_fib_table_walk (fib_node_index_t fei, void *arg) else if (dpo->dpoi_type == gbp_fwd_dpo_get_type ()) { /* *INDENT-OFF* */ - ctx->cb (table_id, &pfx, + ctx->cb (table_id, pfx, ~0, // sw_if_index ~0, // epg 1, // is_internal diff --git a/src/plugins/map/map.c b/src/plugins/map/map.c index 6d9730f3b06..63d6e1a3965 100644 --- a/src/plugins/map/map.c +++ b/src/plugins/map/map.c @@ -363,12 +363,12 @@ format_map_pre_resolve (u8 * s, va_list * ap) if (FIB_NODE_INDEX_INVALID != pr->fei) { - fib_prefix_t pfx; + const fib_prefix_t *pfx; - fib_entry_get_prefix (pr->fei, &pfx); + pfx = fib_entry_get_prefix (pr->fei); return (format (s, "%U (%u)", - format_ip46_address, &pfx.fp_addr, IP46_TYPE_ANY, + format_ip46_address, &pfx->fp_addr, IP46_TYPE_ANY, pr->dpo.dpoi_index)); } else |