Merge branch 'master' of ssh://stash.cumulusnetworks.com:7999/frr/frr…

… into master-frr-upstream-sync-2017-07

Conflicts:
	eigrpd/eigrp_main.c
	pimd/pim_cmd.c

eigrpd/eigrp_main.c

@@ -185,33 +185,33 @@ int main(int argc, char **argv, char **envp)
 #endif /* HAVE_SNMP */
 
  /* Access list install. */
- access_list_init();
- access_list_add_hook(eigrp_distribute_update_all_wrapper);
- access_list_delete_hook(eigrp_distribute_update_all_wrapper);
+ access_list_init ();
+ access_list_add_hook (eigrp_distribute_update_all_wrapper);
+ access_list_delete_hook (eigrp_distribute_update_all_wrapper);
 
  /* Prefix list initialize.*/
- prefix_list_init();
- prefix_list_add_hook(eigrp_distribute_update_all);
- prefix_list_delete_hook(eigrp_distribute_update_all);
+ prefix_list_init ();
+ prefix_list_add_hook (eigrp_distribute_update_all);
+ prefix_list_delete_hook (eigrp_distribute_update_all);
 
  /*
  * XXX: This is just to get the CLI installed to suppress VTYSH errors.
  * Routemaps in EIGRP are not yet functional.
  */
  route_map_init();
  /*eigrp_route_map_init();
-  route_map_add_hook (eigrp_rmap_update);
-  route_map_delete_hook (eigrp_rmap_update);*/
+ route_map_add_hook (eigrp_rmap_update);
+ route_map_delete_hook (eigrp_rmap_update);*/
  /*if_rmap_init (EIGRP_NODE);
-  if_rmap_hook_add (eigrp_if_rmap_update);
-  if_rmap_hook_delete (eigrp_if_rmap_update);*/
+ if_rmap_hook_add (eigrp_if_rmap_update);
+ if_rmap_hook_delete (eigrp_if_rmap_update);*/
 
  /* Distribute list install. */
- distribute_list_init(EIGRP_NODE);
- distribute_list_add_hook(eigrp_distribute_update);
- distribute_list_delete_hook(eigrp_distribute_update);
+ distribute_list_init (EIGRP_NODE);
+ distribute_list_add_hook (eigrp_distribute_update);
+ distribute_list_delete_hook (eigrp_distribute_update);
 
- frr_config_fork();
+ frr_config_fork ();
  frr_run(master);
 
  /* Not reached. */

pimd/pim_cmd.c

@@ -7989,12 +7989,19 @@ DEFUN (show_ip_msdp_peer_detail,
 {
  u_char uj = use_json(argc, argv);
  int idx = 2;
- struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx);
- if (uj)
- argc--;
+ struct vrf *vrf = pim_cmd_lookup_vrf (vty, argv, argc, &idx);
 
- if (argv_find(argv, argc, "detail", &idx)
- || argv_find(argv, argc, "A.B.C.D", &idx))
+ if (!vrf)
+ return CMD_WARNING;
+
+ char *arg = NULL;
+
+ if (argv_find (argv, argc, "detail", &idx))
+ arg = argv[idx]->text;
+ else if (argv_find (argv, argc, "A.B.C.D", &idx))
+ arg = argv[idx]->arg;
+
+ if (arg)
  ip_msdp_show_peers_detail(vrf->info, vty, argv[idx]->arg, uj);
  else
  ip_msdp_show_peers(vrf->info, vty, uj);