little fixups

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 39f43018bd70a6f9025081611a56225a665c430f..18f106b3f87d5182d9dadd014f4006a8c1b1a122 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1993,7 +1993,7 @@ bgp_get_neighbor(rte *r)
     return as;
 
   /* If AS_PATH is not defined, we treat rte as locally originated */
-  struct bgp_route_ctx *p = (struct bgp_route_ctx *) ea_find(r->attrs->eattrs, EA_ROUTE_CONTEXT)->u.ptr;
+  struct bgp_route_ctx *p = SKIP_BACK(struct bgp_route_ctx, bgp_rte_ctx, rte_get_context(r));
   return p->confederation ?: p->local_as;
 }
 

diff --git a/proto/mrt/mrtload.c b/proto/mrt/mrtload.c
index e0de2c972e9801812d1a44ee35d1b311c91fd564..e5c4e1b7ed276ab7a8ce36e859b2098f0799e876 100644 (file)
--- a/proto/mrt/mrtload.c
+++ b/proto/mrt/mrtload.c
@@ -861,7 +861,7 @@ struct protocol proto_mrtload = {
   .template =          "mrtload%d",
   .class =             PROTOCOL_MRTLOAD,
   .proto_size =                sizeof(struct mrtload_proto),
-  .config_size =       sizeof(struct mrt_config),
+  .config_size =       sizeof(struct mrtload_config),
   .init =              mrtload_init,
   .start =             mrtload_start,
   .shutdown =          mrtload_shutdown,