From 5e88d7302599b7ac521624c77adf0b3c72601670 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Fri, 19 May 2000 11:01:41 +0000 Subject: [PATCH] BGP now reports originating AS and origin type in get_route_info(). --- TODO | 2 -- proto/bgp/attrs.c | 15 +++++++++++++++ proto/bgp/bgp.c | 3 --- proto/bgp/bgp.h | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index ed32e6b0..6950365d 100644 --- a/TODO +++ b/TODO @@ -6,8 +6,6 @@ Core - table: ocassional core dumps in rt_prune() -- bgp: get_route_info - Documentation ~~~~~~~~~~~~~ - write doctool diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 4dda0ac0..b074eb21 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -911,3 +911,18 @@ bgp_attr_init(struct bgp_proto *p) p->withdraw_bucket = NULL; fib_init(&p->prefix_fib, p->p.pool, sizeof(struct bgp_prefix), 0, bgp_init_prefix); } + +void +bgp_get_route_info(rte *e, byte *buf, ea_list *attrs) +{ + eattr *p = ea_find(attrs, EA_CODE(EAP_BGP, BA_AS_PATH)); + eattr *o = ea_find(attrs, EA_CODE(EAP_BGP, BA_ORIGIN)); + int origas; + + buf += bsprintf(buf, " (%d) [", e->pref); + if (p && (origas = as_path_get_first(p->u.ptr)) >= 0) + buf += bsprintf(buf, "AS%d", origas); + if (o) + buf += bsprintf(buf, "%c", "ie?"[o->u.data]); + strcpy(buf, "]"); +} diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c index c6dc4e90..610436f9 100644 --- a/proto/bgp/bgp.c +++ b/proto/bgp/bgp.c @@ -531,8 +531,5 @@ struct protocol proto_bgp = { get_status: bgp_get_status, get_attr: bgp_get_attr, reconfigure: bgp_reconfigure, -#if 0 - dump: bgp_dump, get_route_info: bgp_get_route_info, -#endif }; diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h index 397928c4..03f47f99 100644 --- a/proto/bgp/bgp.h +++ b/proto/bgp/bgp.h @@ -123,6 +123,7 @@ int bgp_import_control(struct proto *, struct rte **, struct ea_list **, struct void bgp_attr_init(struct bgp_proto *); unsigned int bgp_encode_attrs(byte *w, struct ea_list *attrs, int remains); void bgp_free_bucket(struct bgp_proto *p, struct bgp_bucket *buck); +void bgp_get_route_info(struct rte *, byte *buf, struct ea_list *attrs); /* packets.c */