diff options
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 803e7bb013..6432c0da75 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -432,7 +432,7 @@ static void pim_show_membership_helper(struct vty *vty, json_object_object_add(json_iface, ch_grp_str, json_row); } static void pim_show_membership(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct pim_interface *pim_ifp; struct pim_ifchannel *ch; @@ -549,7 +549,7 @@ static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp, } static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct interface *ifp; time_t now; @@ -634,7 +634,7 @@ static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty, static void igmp_show_interfaces_single(struct pim_instance *pim, struct vty *vty, const char *ifname, - u_char uj) + uint8_t uj) { struct igmp_sock *igmp; struct interface *ifp; @@ -894,7 +894,7 @@ static void igmp_show_interface_join(struct pim_instance *pim, struct vty *vty) static void pim_show_interfaces_single(struct pim_instance *pim, struct vty *vty, const char *ifname, - u_char uj) + uint8_t uj) { struct in_addr ifaddr; struct interface *ifp; @@ -1295,7 +1295,7 @@ static void pim_show_interfaces_single(struct pim_instance *pim, } static void pim_show_interfaces(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct interface *ifp; struct listnode *upnode; @@ -1388,7 +1388,7 @@ static void pim_show_interfaces(struct pim_instance *pim, struct vty *vty, } static void pim_show_interface_traffic(struct pim_instance *pim, - struct vty *vty, u_char uj) + struct vty *vty, uint8_t uj) { struct interface *ifp = NULL; struct pim_interface *pim_ifp = NULL; @@ -1468,7 +1468,7 @@ static void pim_show_interface_traffic(struct pim_instance *pim, static void pim_show_interface_traffic_single(struct pim_instance *pim, struct vty *vty, - const char *ifname, u_char uj) + const char *ifname, uint8_t uj) { struct interface *ifp = NULL; struct pim_interface *pim_ifp = NULL; @@ -1557,7 +1557,7 @@ static void pim_show_interface_traffic_single(struct pim_instance *pim, static void pim_show_join_helper(struct vty *vty, struct pim_interface *pim_ifp, struct pim_ifchannel *ch, json_object *json, - time_t now, u_char uj) + time_t now, uint8_t uj) { char ch_src_str[INET_ADDRSTRLEN]; char ch_grp_str[INET_ADDRSTRLEN]; @@ -1620,7 +1620,7 @@ static void pim_show_join_helper(struct vty *vty, struct pim_interface *pim_ifp, } } -static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj) +static void pim_show_join(struct pim_instance *pim, struct vty *vty, uint8_t uj) { struct pim_interface *pim_ifp; struct pim_ifchannel *ch; @@ -1654,7 +1654,7 @@ static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj) } static void pim_show_neighbors_single(struct pim_instance *pim, struct vty *vty, - const char *neighbor, u_char uj) + const char *neighbor, uint8_t uj) { struct listnode *neighnode; struct interface *ifp; @@ -1864,7 +1864,7 @@ static void pim_show_neighbors_single(struct pim_instance *pim, struct vty *vty, static void pim_show_state(struct pim_instance *pim, struct vty *vty, const char *src_or_group, const char *group, - u_char uj) + uint8_t uj) { struct channel_oil *c_oil; struct listnode *node; @@ -2065,7 +2065,7 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, } static void pim_show_neighbors(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *neighnode; struct interface *ifp; @@ -2261,7 +2261,7 @@ static const char *pim_reg_state2brief_str(enum pim_reg_state reg_state, } static void pim_show_upstream(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *upnode; struct pim_upstream *up; @@ -2406,7 +2406,7 @@ static void pim_show_join_desired_helper(struct pim_instance *pim, struct vty *vty, struct pim_interface *pim_ifp, struct pim_ifchannel *ch, - json_object *json, u_char uj) + json_object *json, uint8_t uj) { struct pim_upstream *up = ch->upstream; json_object *json_group = NULL; @@ -2462,7 +2462,7 @@ static void pim_show_join_desired_helper(struct pim_instance *pim, } static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct pim_interface *pim_ifp; struct pim_ifchannel *ch; @@ -2498,7 +2498,7 @@ static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty, } static void pim_show_upstream_rpf(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *upnode; struct pim_upstream *up; @@ -2631,7 +2631,7 @@ static void show_scan_oil_stats(struct pim_instance *pim, struct vty *vty, uptime_mroute_del, (long long)pim->mroute_del_events); } -static void pim_show_rpf(struct pim_instance *pim, struct vty *vty, u_char uj) +static void pim_show_rpf(struct pim_instance *pim, struct vty *vty, uint8_t uj) { struct listnode *up_node; struct pim_upstream *up; @@ -2755,7 +2755,7 @@ static void pim_show_nexthop(struct pim_instance *pim, struct vty *vty) } static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct interface *ifp; time_t now; @@ -3306,7 +3306,7 @@ DEFUN (show_ip_igmp_interface, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3333,7 +3333,7 @@ DEFUN (show_ip_igmp_interface_vrf_all, JSON_STR) { int idx = 2; - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3389,7 +3389,7 @@ DEFUN (show_ip_igmp_join_vrf_all, VRF_CMD_HELP_STR "IGMP static join information\n") { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3423,7 +3423,7 @@ DEFUN (show_ip_igmp_groups, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3443,7 +3443,7 @@ DEFUN (show_ip_igmp_groups_vrf_all, IGMP_GROUP_STR JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3621,7 +3621,7 @@ DEFUN (show_ip_pim_interface, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3648,7 +3648,7 @@ DEFUN (show_ip_pim_interface_vrf_all, JSON_STR) { int idx = 6; - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3687,7 +3687,7 @@ DEFUN (show_ip_pim_join, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3707,7 +3707,7 @@ DEFUN (show_ip_pim_join_vrf_all, "PIM interface join information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3741,7 +3741,7 @@ DEFUN (show_ip_pim_local_membership, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3765,7 +3765,7 @@ DEFUN (show_ip_pim_neighbor, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3792,7 +3792,7 @@ DEFUN (show_ip_pim_neighbor_vrf_all, JSON_STR) { int idx = 2; - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3855,7 +3855,7 @@ DEFUN (show_ip_pim_state, const char *group = NULL; int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3889,7 +3889,7 @@ DEFUN (show_ip_pim_state_vrf_all, const char *src_or_group = NULL; const char *group = NULL; int idx = 2; - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3932,7 +3932,7 @@ DEFUN (show_ip_pim_upstream, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -3952,7 +3952,7 @@ DEFUN (show_ip_pim_upstream_vrf_all, "PIM upstream information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -3984,7 +3984,7 @@ DEFUN (show_ip_pim_upstream_join_desired, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -4006,7 +4006,7 @@ DEFUN (show_ip_pim_upstream_rpf, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -4028,7 +4028,7 @@ DEFUN (show_ip_pim_rp, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -4048,7 +4048,7 @@ DEFUN (show_ip_pim_rp_vrf_all, "PIM RP information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -4082,7 +4082,7 @@ DEFUN (show_ip_pim_rpf, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -4102,7 +4102,7 @@ DEFUN (show_ip_pim_rpf_vrf_all, "PIM cached source rpf information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -4249,7 +4249,7 @@ DEFUN (show_ip_pim_interface_traffic, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -4373,7 +4373,7 @@ DEFUN (show_ip_multicast_vrf_all, VRF_CMD_HELP_STR "Multicast global information\n") { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -4396,7 +4396,7 @@ DEFUN (show_ip_multicast_vrf_all, } static void show_mroute(struct pim_instance *pim, struct vty *vty, bool fill, - u_char uj) + uint8_t uj) { struct listnode *node; struct channel_oil *c_oil; @@ -4730,7 +4730,7 @@ DEFUN (show_ip_mroute, "Fill in Assumed data\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); bool fill = false; int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); @@ -4755,7 +4755,7 @@ DEFUN (show_ip_mroute_vrf_all, "Fill in Assumed data\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); int idx = 4; struct vrf *vrf; bool first = true; @@ -4863,7 +4863,7 @@ DEFUN (show_ip_mroute_count_vrf_all, VRF_CMD_HELP_STR "Route and packet count data\n") { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -5454,7 +5454,7 @@ DEFUN (no_ip_pim_ssm_prefix_list_name, } static void ip_pim_ssm_show_group_range(struct pim_instance *pim, - struct vty *vty, u_char uj) + struct vty *vty, uint8_t uj) { struct pim_ssm *ssm = pim->ssm_info; const char *range_str = @@ -5483,7 +5483,7 @@ DEFUN (show_ip_pim_ssm_range, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -5494,7 +5494,7 @@ DEFUN (show_ip_pim_ssm_range, } static void ip_pim_ssm_show_group_type(struct pim_instance *pim, - struct vty *vty, u_char uj, + struct vty *vty, uint8_t uj, const char *group) { struct in_addr group_addr; @@ -5536,7 +5536,7 @@ DEFUN (show_ip_pim_group_type, { int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); if (!vrf) return CMD_WARNING; @@ -7439,9 +7439,9 @@ DEFUN (ip_pim_bfd_param, int idx_number = 3; int idx_number_2 = 4; int idx_number_3 = 5; - u_int32_t rx_val; - u_int32_t tx_val; - u_int8_t dm_val; + uint32_t rx_val; + uint32_t tx_val; + uint8_t dm_val; int ret; struct pim_interface *pim_ifp = ifp->info; @@ -7787,7 +7787,7 @@ static void print_empty_json_obj(struct vty *vty) } static void ip_msdp_show_mesh_group(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *mbrnode; struct pim_msdp_mg_mbr *mbr; @@ -7864,7 +7864,7 @@ DEFUN (show_ip_msdp_mesh_group, "MSDP mesh-group information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); @@ -7886,7 +7886,7 @@ DEFUN (show_ip_msdp_mesh_group_vrf_all, "MSDP mesh-group information\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -7909,7 +7909,7 @@ DEFUN (show_ip_msdp_mesh_group_vrf_all, } static void ip_msdp_show_peers(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *mpnode; struct pim_msdp_peer *mp; @@ -7963,7 +7963,7 @@ static void ip_msdp_show_peers(struct pim_instance *pim, struct vty *vty, } static void ip_msdp_show_peers_detail(struct pim_instance *pim, struct vty *vty, - const char *peer, u_char uj) + const char *peer, uint8_t uj) { struct listnode *mpnode; struct pim_msdp_peer *mp; @@ -8079,7 +8079,7 @@ DEFUN (show_ip_msdp_peer_detail, "peer ip address\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); @@ -8114,7 +8114,7 @@ DEFUN (show_ip_msdp_peer_detail_vrf_all, JSON_STR) { int idx = 2; - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -8142,7 +8142,7 @@ DEFUN (show_ip_msdp_peer_detail_vrf_all, } static void ip_msdp_show_sa(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *sanode; struct pim_msdp_sa *sa; @@ -8219,7 +8219,7 @@ static void ip_msdp_show_sa(struct pim_instance *pim, struct vty *vty, static void ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa, const char *src_str, const char *grp_str, struct vty *vty, - u_char uj, json_object *json) + uint8_t uj, json_object *json) { char rp_str[INET_ADDRSTRLEN]; char peer_str[INET_ADDRSTRLEN]; @@ -8283,7 +8283,7 @@ static void ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa, } static void ip_msdp_show_sa_detail(struct pim_instance *pim, struct vty *vty, - u_char uj) + uint8_t uj) { struct listnode *sanode; struct pim_msdp_sa *sa; @@ -8320,7 +8320,7 @@ DEFUN (show_ip_msdp_sa_detail, "Detailed output\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); int idx = 2; struct vrf *vrf = pim_cmd_lookup_vrf(vty, argv, argc, &idx); @@ -8343,7 +8343,7 @@ DEFUN (show_ip_msdp_sa_detail_vrf_all, "Detailed output\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; @@ -8366,7 +8366,7 @@ DEFUN (show_ip_msdp_sa_detail_vrf_all, } static void ip_msdp_show_sa_addr(struct pim_instance *pim, struct vty *vty, - const char *addr, u_char uj) + const char *addr, uint8_t uj) { struct listnode *sanode; struct pim_msdp_sa *sa; @@ -8395,7 +8395,7 @@ static void ip_msdp_show_sa_addr(struct pim_instance *pim, struct vty *vty, } static void ip_msdp_show_sa_sg(struct pim_instance *pim, struct vty *vty, - const char *src, const char *grp, u_char uj) + const char *src, const char *grp, uint8_t uj) { struct listnode *sanode; struct pim_msdp_sa *sa; @@ -8435,7 +8435,7 @@ DEFUN (show_ip_msdp_sa_sg, "group ip\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; int idx = 2; @@ -8472,7 +8472,7 @@ DEFUN (show_ip_msdp_sa_sg_vrf_all, "group ip\n" JSON_STR) { - u_char uj = use_json(argc, argv); + uint8_t uj = use_json(argc, argv); struct vrf *vrf; bool first = true; int idx = 2; |