From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Thu, 29 Sep 2016 17:37:07 +0000 (+0000)
Subject: ospfd: minor parser fixes
X-Git-Tag: frr-3.0-branchpoint~129^2~131
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ff788d089ac145ac06b99018811f46a9f6b69dda;p=matthieu%2Ffrr.git

ospfd: minor parser fixes

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index bf71c7be6a..f2b332053c 100644
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -962,6 +962,8 @@ DEFUN (debug_ospf_ism,
       else if (strmatch (dbgparam, "timers"))
         TERM_DEBUG_ON (ism, ISM_TIMERS);
     }
+
+  return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ospf_ism,
@@ -1013,6 +1015,8 @@ DEFUN (no_debug_ospf_ism,
       else if (strmatch (dbgparam, "timers"))
         TERM_DEBUG_OFF (ism, ISM_TIMERS);
     }
+
+  return CMD_SUCCESS;
 }
 
 static int
@@ -2070,7 +2074,6 @@ debug_init ()
   install_node (&debug_node, config_write_debug);
 
   install_element (ENABLE_NODE, &show_debugging_ospf_cmd);
-  install_element (ENABLE_NODE, &debug_ospf_packet_all_cmd);
   install_element (ENABLE_NODE, &debug_ospf_ism_cmd);
   install_element (ENABLE_NODE, &debug_ospf_nsm_cmd);
   install_element (ENABLE_NODE, &debug_ospf_lsa_cmd);
@@ -2078,7 +2081,6 @@ debug_init ()
   install_element (ENABLE_NODE, &debug_ospf_event_cmd);
   install_element (ENABLE_NODE, &debug_ospf_nssa_cmd);
   install_element (ENABLE_NODE, &debug_ospf_te_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf_packet_all_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_ism_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_nsm_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_lsa_cmd);
@@ -2118,7 +2120,6 @@ debug_init ()
   install_element (CONFIG_NODE, &debug_ospf_event_cmd);
   install_element (CONFIG_NODE, &debug_ospf_nssa_cmd);
   install_element (CONFIG_NODE, &debug_ospf_te_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf_packet_all_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_ism_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_nsm_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_lsa_cmd);
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
index 151adadb9a..bcb1cd8e20 100644
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@ -1183,7 +1183,7 @@ DEFUN (router_info,
        "OSPF area ID in IP format")
 {
   int idx_ipv4 = 2;
-  char *area = (argc == 3) ? argv[2]->arg : NULL;
+  char *area = (argc == 3) ? argv[idx_ipv4]->arg : NULL;
 
   u_int8_t scope;
 
diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c
index 21dca9546c..33ddc67fcc 100644
--- a/ospfd/ospf_routemap.c
+++ b/ospfd/ospf_routemap.c
@@ -799,8 +799,8 @@ DEFUN (no_match_ip_address_prefix_list,
        MATCH_STR
        IP_STR
        "Match address of route\n"
-       "Match entries of prefix-lists\n")
-       "IP prefix-list name\n"
+       "Match entries of prefix-lists\n"
+       "IP prefix-list name\n")
 {
   char *pl = (argc == 6) ? argv[5]->arg : NULL;
   return ospf_route_match_delete (vty, vty->index, "ip address prefix-list", pl);
@@ -892,9 +892,9 @@ DEFUN (no_set_metric_type,
        "no set metric-type [<type-1|type-2>]",
        NO_STR
        SET_STR
-       "Type of metric for destination routing protocol\n")
+       "Type of metric for destination routing protocol\n"
        "OSPF[6] external type 1 metric\n"
-       "OSPF[6] external type 2 metric\n"
+       "OSPF[6] external type 2 metric\n")
 {
   char *ext = (argc == 4) ? argv[3]->text : NULL;
   return ospf_route_set_delete (vty, vty->index, "metric-type", ext);