From 7021c425a9f5bd9f62b934124becbaadd961cac0 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 15 Jul 2003 12:52:22 +0000 Subject: 2003-07-15 Paul Jakma * lib/version.h: add ZEBRA_URL (unused for now) * lib/vty.c: CMD_ERR_NOTHING_TODO when reading conf file should not be fatal. slight reformating. * ospfd/ospf_zebra.c: ignore reject/blackhole routes if zebra sends these type of routes. probably should be a new type of route to allow daemons to more easily choose whether to redistribute them - rathen than just a flag (eg for reject/blackhole). reorder the is_prefix_default test for ZEBRA_IPV4_ROUTE_DELETE to avoid the inverted test - slightly more readable. * redhat/zebra.spec.in: Add ospfapi port to services file, if with_ospfapi. * zebra/rib.h: Change nexthop types to an enum. * zebra/rt_netlink.c: run it through indent -nut. Add nexthop_types_desc[] descriptive array for nexthop types. (netlink_route_multipath) debug statements indicate which branch they are in and print out nexthop type. * zebra/zebra_rib.c: slight reformatting. * zebra/zebra_vty.c: Pass ZEBRA_FLAG_BLACKHOLE flag to static_add_ipv4() if Null0 route is configured. print out Null0 if STATIC_IPV4_BLACKHOLE route, and ignore flags (shouldnt be possible to set flags from vty) for config and show route. --- lib/version.h | 4 +++- lib/vty.c | 18 +++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/version.h b/lib/version.h index 9a90bf4e..028e1f8e 100644 --- a/lib/version.h +++ b/lib/version.h @@ -22,10 +22,12 @@ #ifndef _ZEBRA_VERSION_H #define _ZEBRA_VERSION_H -#define ZEBRA_VERSION "0.93b" +#define ZEBRA_VERSION "0.94" #define ZEBRA_BUG_ADDRESS "bug-zebra@gnu.org" +#define ZEBRA_URL "http://zebra.dishone.st" + extern char *host_name; void print_version(char *); diff --git a/lib/vty.c b/lib/vty.c index c38ae946..90e1dadb 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -2115,17 +2115,17 @@ vty_read_file (FILE *confp) /* Execute configuration file */ ret = config_from_file (vty, confp); - if (ret != CMD_SUCCESS) + if ( !((ret == CMD_SUCCESS) || (ret == CMD_ERR_NOTHING_TODO)) ) { switch (ret) - { - case CMD_ERR_AMBIGUOUS: - fprintf (stderr, "Ambiguous command.\n"); - break; - case CMD_ERR_NO_MATCH: - fprintf (stderr, "There is no such command.\n"); - break; - } + { + case CMD_ERR_AMBIGUOUS: + fprintf (stderr, "Ambiguous command.\n"); + break; + case CMD_ERR_NO_MATCH: + fprintf (stderr, "There is no such command.\n"); + break; + } fprintf (stderr, "Error occured during reading below line.\n%s\n", vty->buf); vty_close (vty); -- cgit v1.2.1