zebra: Ensure SRv6 SID length does not exceed 128

[mirror_frr.git] / eigrpd / eigrp_dump.c

diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index 0874ce3f195a32f4df1be465716fe95e43d021cf..b0d34f55e619ccf2c917edef02a16df6ac0aa706 100644 (file)
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -122,8 +122,8 @@ void eigrp_ip_header_dump(struct ip *iph)
        zlog_debug("ip_ttl %u", iph->ip_ttl);
        zlog_debug("ip_p %u", iph->ip_p);
        zlog_debug("ip_sum 0x%x", (uint32_t)iph->ip_sum);
-       zlog_debug("ip_src %s", inet_ntoa(iph->ip_src));
-       zlog_debug("ip_dst %s", inet_ntoa(iph->ip_dst));
+       zlog_debug("ip_src %pI4", &iph->ip_src);
+       zlog_debug("ip_dst %pI4", &iph->ip_dst);
 }
 
 /*
@@ -154,7 +154,7 @@ void show_ip_eigrp_interface_header(struct vty *vty, struct eigrp *eigrp)
 {
 
        vty_out(vty,
-               "\nEIGRP interfaces for AS(%d)\n\n %-10s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s\n %-39s %-12s %-7s %-14s %-12s %-8s\n",
+               "\nEIGRP interfaces for AS(%d)\n\n%-16s %-10s %-10s %-6s %-12s %-7s %-14s %-12s %-8s %-8s %-8s\n %-44s %-12s %-7s %-14s %-12s %-8s\n",
                eigrp->AS, "Interface", "Bandwidth", "Delay", "Peers",
                "Xmit Queue", "Mean", "Pacing Time", "Multicast", "Pending",
                "Hello", "Holdtime", "", "Un/Reliable", "SRTT", "Un/Reliable",
@@ -164,7 +164,7 @@ void show_ip_eigrp_interface_header(struct vty *vty, struct eigrp *eigrp)
 void show_ip_eigrp_interface_sub(struct vty *vty, struct eigrp *eigrp,
                                 struct eigrp_interface *ei)
 {
-       vty_out(vty, "%-11s ", IF_NAME(ei));
+       vty_out(vty, "%-16s ", IF_NAME(ei));
        vty_out(vty, "%-11u", ei->params.bandwidth);
        vty_out(vty, "%-11u", ei->params.delay);
        vty_out(vty, "%-7u", ei->nbrs->count);
@@ -204,8 +204,7 @@ void show_ip_eigrp_neighbor_sub(struct vty *vty, struct eigrp_neighbor *nbr,
                                int detail)
 {
 
-       vty_out(vty, "%-3u %-17s %-21s", 0, eigrp_neigh_ip_string(nbr),
-               IF_NAME(nbr->ei));
+       vty_out(vty, "%-3u %-17pI4 %-21s", 0, &nbr->src, IF_NAME(nbr->ei));
        if (nbr->t_holddown)
                vty_out(vty, "%-7lu",
                        thread_timer_remain_second(nbr->t_holddown));
@@ -231,21 +230,20 @@ void show_ip_eigrp_neighbor_sub(struct vty *vty, struct eigrp_neighbor *nbr,
  */
 void show_ip_eigrp_topology_header(struct vty *vty, struct eigrp *eigrp)
 {
-       vty_out(vty, "\nEIGRP Topology Table for AS(%d)/ID(%s)\n\n", eigrp->AS,
-               inet_ntoa(eigrp->router_id));
+       vty_out(vty, "\nEIGRP Topology Table for AS(%d)/ID(%pI4)\n\n",
+               eigrp->AS, &eigrp->router_id);
        vty_out(vty,
                "Codes: P - Passive, A - Active, U - Update, Q - Query, R - Reply\n       r - reply Status, s - sia Status\n\n");
 }
 
-void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
+void show_ip_eigrp_prefix_descriptor(struct vty *vty,
+                                    struct eigrp_prefix_descriptor *tn)
 {
        struct list *successors = eigrp_topology_get_successor(tn);
-       char buffer[PREFIX_STRLEN];
 
        vty_out(vty, "%-3c", (tn->state > 0) ? 'A' : 'P');
 
-       vty_out(vty, "%s, ",
-               prefix2str(tn->destination, buffer, PREFIX_STRLEN));
+       vty_out(vty, "%pFX, ", tn->destination);
        vty_out(vty, "%u successors, ", (successors) ? successors->count : 0);
        vty_out(vty, "FD is %u, serno: %" PRIu64 " \n", tn->fdistance,
                tn->serno);
@@ -254,14 +252,15 @@ void show_ip_eigrp_prefix_entry(struct vty *vty, struct eigrp_prefix_entry *tn)
                list_delete(&successors);
 }
 
-void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,
-                                struct eigrp_nexthop_entry *te, bool *first)
+void show_ip_eigrp_route_descriptor(struct vty *vty, struct eigrp *eigrp,
+                                   struct eigrp_route_descriptor *te,
+                                   bool *first)
 {
        if (te->reported_distance == EIGRP_MAX_METRIC)
                return;
 
        if (*first) {
-               show_ip_eigrp_prefix_entry(vty, te->prefix);
+               show_ip_eigrp_prefix_descriptor(vty, te->prefix);
                *first = false;
        }
 
@@ -269,8 +268,8 @@ void show_ip_eigrp_nexthop_entry(struct vty *vty, struct eigrp *eigrp,
                vty_out(vty, "%-7s%s, %s\n", " ", "via Connected",
                        IF_NAME(te->ei));
        else {
-               vty_out(vty, "%-7s%s%s (%u/%u), %s\n", " ", "via ",
-                       inet_ntoa(te->adv_router->src), te->distance,
+               vty_out(vty, "%-7s%s%pI4 (%u/%u), %s\n", " ", "via ",
+                       &te->adv_router->src, te->distance,
                        te->reported_distance, IF_NAME(te->ei));
        }
 }
@@ -323,6 +322,7 @@ DEFUN_NOSH (show_debugging_eigrp,
                }
        }
 
+       cmd_show_lib_debugs(vty);
        return CMD_SUCCESS;
 }