summaryrefslogtreecommitdiffstats
path: root/proto
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2009-11-17 14:17:23 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2009-11-17 14:17:23 +0100
commitd0e2d6d1e05455cf1ec4e71135edaa659fe96dac (patch)
tree04b2b4cdbf7c8a30ad0d4b13490e579aea99cabb /proto
parent3228c72cc030f409914134440a7e55bbcfc9ff6a (diff)
downloadbird-d0e2d6d1e05455cf1ec4e71135edaa659fe96dac.tar
bird-d0e2d6d1e05455cf1ec4e71135edaa659fe96dac.zip
Show both IPv6 next hop addresses in BGP.
Diffstat (limited to 'proto')
-rw-r--r--proto/bgp/attrs.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 9c7bc30..7b49bdf 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -165,6 +165,22 @@ bgp_check_next_hop(struct bgp_proto *p UNUSED, byte *a, int len)
#endif
}
+static void
+bgp_format_next_hop(eattr *a, byte *buf, int buflen UNUSED)
+{
+ ip_addr *ipp = (ip_addr *) a->u.ptr->data;
+#ifdef IPV6
+ /* in IPv6, we might have two addresses in NEXT HOP */
+ if ((a->u.ptr->length == NEXT_HOP_LENGTH) && ipa_nonzero(ipp[1]))
+ {
+ bsprintf(buf, "%I %I", ipp[0], ipp[1]);
+ return;
+ }
+#endif
+
+ bsprintf(buf, "%I", ipp[0]);
+}
+
static int
bgp_check_aggregator(struct bgp_proto *p, byte *a UNUSED, int len)
{
@@ -234,7 +250,7 @@ static struct attr_desc bgp_attr_table[] = {
{ "as_path", -1, BAF_TRANSITIVE, EAF_TYPE_AS_PATH, 1, /* BA_AS_PATH */
NULL, NULL }, /* is checked by validate_as_path() as a special case */
{ "next_hop", 4, BAF_TRANSITIVE, EAF_TYPE_IP_ADDRESS, 1, /* BA_NEXT_HOP */
- bgp_check_next_hop, NULL },
+ bgp_check_next_hop, bgp_format_next_hop },
{ "med", 4, BAF_OPTIONAL, EAF_TYPE_INT, 1, /* BA_MULTI_EXIT_DISC */
NULL, NULL },
{ "local_pref", 4, BAF_TRANSITIVE, EAF_TYPE_INT, 0, /* BA_LOCAL_PREF */