commit d57834f6e5f060924b92b9544070ecf5f145848a
author paul <paul> Tue Jul 12 20:04:22 2005 +0000
committer paul <paul> Tue Jul 12 20:04:22 2005 +0000
tree 25f7312efa2f711b2ebf1b17521e0aea9d83c10f
parent e37821068873e4256a5d44d6c81babe39befc8e7

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.

ospfd/ospf_vty.c

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 2f0824a..179464c 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2016,7 +2016,7 @@
 
 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 @@
   /* 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 @@
                  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);