diff options
| -rw-r--r-- | ospfd/ChangeLog | 10 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 6 | ||||
| -rw-r--r-- | ospfd/ospfd.c | 2 | ||||
| -rw-r--r-- | ospfd/ospfd.h | 1 |
4 files changed, 15 insertions, 4 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index 9d1b2fa1..d0cc5455 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,3 +1,13 @@ +2005-07-12 Paul Jakma <paul.jakma@sun.com> + + * ospfd.h: add OSPF_ABR_DEFAULT for convenience, make + OSPF_ABR_CISCO be the default ABR type. + * ospfd.c: (ospf_new) initialise abr_type to OSPF_ABR_DEFAULT + * ospf_vty.c: (no_ospf_abr_type_cmd) add standard as a negatable + abr_type. default abr_type should be OSPF_ABR_DEFAULT. + (ospf_config_write) test whether default abr_type against + OSPF_ABR_DEFAULT, rather than any specific ABR_TYPE. + 2005-06-20 Hasso Tepper <hasso at quagga.net> * ospf_nsm.c: Make database exchange for NSSA database work. diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 2f0824a7..179464cc 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -2016,7 +2016,7 @@ DEFUN (ospf_abr_type, DEFUN (no_ospf_abr_type, no_ospf_abr_type_cmd, - "no ospf abr-type (cisco|ibm|shortcut)", + "no ospf abr-type (cisco|ibm|shortcut|standard)", NO_STR "OSPF specific commands\n" "Set OSPF ABR type\n" @@ -2039,7 +2039,7 @@ DEFUN (no_ospf_abr_type, /* If ABR type value is changed, schedule ABR task. */ if (ospf->abr_type == abr_type) { - ospf->abr_type = OSPF_ABR_STAND; + ospf->abr_type = OSPF_ABR_DEFAULT; ospf_schedule_abr_task (ospf); } @@ -7290,7 +7290,7 @@ ospf_config_write (struct vty *vty) inet_ntoa (ospf->router_id_static), VTY_NEWLINE); /* ABR type print. */ - if (ospf->abr_type != OSPF_ABR_STAND) + if (ospf->abr_type != OSPF_ABR_DEFAULT) vty_out (vty, " ospf abr-type %s%s", ospf_abr_type_str[ospf->abr_type], VTY_NEWLINE); diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index 30164d02..189805b3 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -157,7 +157,7 @@ ospf_new (void) new->router_id.s_addr = htonl (0); new->router_id_static.s_addr = htonl (0); - new->abr_type = OSPF_ABR_STAND; + new->abr_type = OSPF_ABR_DEFAULT; new->oiflist = list_new (); new->vlinks = list_new (); new->areas = list_new (); diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index 8dae8f80..30d276f8 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -168,6 +168,7 @@ struct ospf #define OSPF_ABR_IBM 2 #define OSPF_ABR_CISCO 3 #define OSPF_ABR_SHORTCUT 4 +#define OSPF_ABR_DEFAULT OSPF_ABR_CISCO /* NSSA ABR */ u_char anyNSSA; /* Bump for every NSSA attached. */ |