Merge pull request #373 from qlyoung/fix-no-pim-rp

pimd: fix some pim commands

pimd/pim_cmd.c

@@ -3640,10 +3640,10 @@ DEFUN (no_ip_pim_rp,
  "ip address of RP\n"
  "Group Address range to cover\n")
 {
- int idx_ipv4 = 4;
+ int idx_ipv4 = 4, idx_group = 0;
 
- if (argc == (idx_ipv4 + 1))
- return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL);
+ if (argv_find (argv, argc, "A.B.C.D/M", &idx_group))
+ return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_group]->arg, NULL);
  else
  return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, NULL, NULL);
 }
@@ -6212,13 +6212,16 @@ DEFUN (show_ip_msdp_sa_sg,
  "JavaScript Object Notation\n")
 {
  u_char uj = use_json(argc, argv);
- if (uj)
- argc--;
 
- if (argc == 5)
- ip_msdp_show_sa_sg(vty, argv[4]->arg, argv[5]->arg, uj);
- else if (argc == 4)
- ip_msdp_show_sa_addr(vty, argv[4]->arg, uj);
+ int idx = 0;
+ char *src_ip = argv_find (argv, argc, "A.B.C.D", &idx) ? argv[idx++]->arg : NULL;
+ char *grp_ip = idx < argc && argv_find (argv, argc, "A.B.C.D", &idx) ?
+ argv[idx]->arg : NULL;
+
+ if (src_ip && grp_ip)
+ ip_msdp_show_sa_sg(vty, src_ip, grp_ip, uj);
+ else if (src_ip)
+ ip_msdp_show_sa_addr(vty, src_ip, uj);
  else
  ip_msdp_show_sa(vty, uj);