From fbf5d033041e406ecefd27c2deebf5a4953d1155 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 29 Sep 2005 11:25:50 +0000 Subject: 2005-09-29 Alain Ritoux * lib/filer.c: show protocol name in filter_show() * lib/plist.c: show protocol name in vty_show_prefix_entry() * routemap.c: show protocol name in vty_show_route_map_entry() * lib/vty.c: in vty_command(), show protocol name if command unknown * zebra/zserv.c: Always provide distance fo route add * ripd/rip_snmp.c: rip2IfConfReceive() sends values in conformance with RFC. Also PeerDomain is now set to a STRING type. * ripd/ripd.h: rip_redistribute_add() API includes metric and distance * ripd/ripd.c: rip_redistribute_add() API i.e. stores metric and distance Now allows a RIP-route to overcome a redistributed route coming from a protocol with worse (higher) administrative distance Metrics from redistribution are shown in show ip rip * ripd/rip_zebra.c: adapt to the rip_redistribute_add() API, i.e. provide distance and metric * ripd/rip_interface.c: adapt to the rip_redistribute_add() API * ripd/rip_routemap.c: no RMAP_COMPILE_ERROR on (metric > 16) usage rather a CMD_WARNING, because set metric ius shared with other protocols using larger values (such as OSPF) The match metric action takes first external metric if present (from redistribution) then RIP metric. --- zebra/ChangeLog | 4 ++++ zebra/zserv.c | 2 ++ 2 files changed, 6 insertions(+) (limited to 'zebra') diff --git a/zebra/ChangeLog b/zebra/ChangeLog index 1e453ae8..c3c88e85 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -1,4 +1,8 @@ +2005-09-28 Alain Ritoux + + * zserv.c: Always provied distance for route add + 2005-09-28 Alain Ritoux * connected.c: flag connected_up_ipv6() and connected_down_ipv6() diff --git a/zebra/zserv.c b/zebra/zserv.c index 872ddb85..abd99cdc 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -486,6 +486,8 @@ zsend_route_multipath (int cmd, struct zserv *client, struct prefix *p, /* Metric */ if (cmd == ZEBRA_IPV4_ROUTE_ADD || ZEBRA_IPV6_ROUTE_ADD) { + SET_FLAG (zapi_flags, ZAPI_MESSAGE_DISTANCE); + stream_putc (s, rib->distance); SET_FLAG (zapi_flags, ZAPI_MESSAGE_METRIC); stream_putl (s, rib->metric); } -- cgit v1.2.1