pimd, pim6d: Using ttable for displaying "show ip/ipv6 mroute" command output.

Signed-off-by: Abhishek N R <abnr@vmware.com>

diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c
index 45726b4e569feb5b9a1ef1a237e4da73488d505f..7fc04f734e8a9eeebc070e5e66f4e5561eebf83d 100644 (file)
--- a/pimd/pim_cmd_common.c
+++ b/pimd/pim_cmd_common.c
@@ -3412,6 +3412,8 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
        struct listnode *node;
        struct channel_oil *c_oil;
        struct static_route *s_route;
+       struct ttable *tt = NULL;
+       char *table = NULL;
        time_t now;
        json_object *json_group = NULL;
        json_object *json_source = NULL;
@@ -3434,8 +3436,14 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
                vty_out(vty, "Flags: S - Sparse, C - Connected, P - Pruned\n");
                vty_out(vty,
                        "       R - SGRpt Pruned, F - Register flag, T - SPT-bit set\n");
-               vty_out(vty,
-                       "\nSource          Group           Flags    Proto  Input            Output           TTL  Uptime\n");
+
+               /* Prepare table. */
+               tt = ttable_new(&ttable_styles[TTSTYLE_BLANK]);
+               ttable_add_row(
+                       tt, "Source|Group|Flags|Proto|Input|Output|TTL|Uptime");
+               tt->style.cell.rpad = 2;
+               tt->style.corner = '+';
+               ttable_restyle(tt);
        }
 
        now = pim_time_monotonic_sec();
@@ -3639,11 +3647,10 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
                                        strlcpy(proto, "STAR", sizeof(proto));
                                }
 
-                               vty_out(vty,
-                                       "%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
-                                       src_str, grp_str, state_str, proto,
-                                       in_ifname, out_ifname, ttl,
-                                       mroute_uptime);
+                               ttable_add_row(tt, "%s|%s|%s|%s|%s|%s|%d|%s",
+                                              src_str, grp_str, state_str,
+                                              proto, in_ifname, out_ifname,
+                                              ttl, mroute_uptime);
 
                                if (first) {
                                        src_str[0] = '\0';
@@ -3657,11 +3664,10 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
                }
 
                if (!json && !found_oif) {
-                       vty_out(vty,
-                               "%-15pPAs %-15pPAs %-8s %-6s %-16s %-16s %-3d  %8s\n",
-                               oil_origin(c_oil), oil_mcastgrp(c_oil),
-                               state_str, "none", in_ifname, "none", 0,
-                               "--:--:--");
+                       ttable_add_row(tt, "%pPAs|%pPAs|%s|%s|%s|%s|%d|%s",
+                                      oil_origin(c_oil), oil_mcastgrp(c_oil),
+                                      state_str, "none", in_ifname, "none", 0,
+                                      "--:--:--");
                }
        }
 
@@ -3765,8 +3771,8 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
                                json_object_object_add(json_oil, out_ifname,
                                                       json_ifp_out);
                        } else {
-                               vty_out(vty,
-                                       "%-15pPAs %-15pPAs %-8s %-6s %-16s %-16s %-3d  %8s\n",
+                               ttable_add_row(
+                                       tt, "%pPAs|%pPAs|%s|%s|%s|%s|%d|%s",
                                        &s_route->source, &s_route->group, "-",
                                        proto, in_ifname, out_ifname, ttl,
                                        oif_uptime);
@@ -3780,12 +3786,18 @@ void show_mroute(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg,
                }
 
                if (!json && !found_oif) {
-                       vty_out(vty,
-                               "%-15pPAs %-15pPAs %-8s %-6s %-16s %-16s %-3d  %8s\n",
-                               &s_route->source, &s_route->group, "-", proto,
-                               in_ifname, "none", 0, "--:--:--");
+                       ttable_add_row(tt, "%pPAs|%pPAs|%s|%s|%s|%s|%d|%s",
+                                      &s_route->source, &s_route->group, "-",
+                                      proto, in_ifname, "none", 0, "--:--:--");
                }
        }
+       /* Dump the generated table. */
+       if (!json) {
+               table = ttable_dump(tt, "\n");
+               vty_out(vty, "%s\n", table);
+               XFREE(MTYPE_TMP, table);
+               ttable_del(tt);
+       }
 }
 
 static void show_mroute_count_per_channel_oil(struct channel_oil *c_oil,