ip address: print stats with -s

Make ip address show accept the -s option similarly to ip link. This creates
an one command replacement for "ifconfig -a" useful for people who still
stay with ifconfig because of this feature.

Print the stats as the last thing for the interface. This requires some code
shuffling.

Signed-off-by: Jiri Benc <jbenc@redhat.com>

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 245df39179a911cc28ddde5fa3201d22d238224b..45729d890abdeb30b2401c786e3675f86f07a28c 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -322,7 +322,6 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
 static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
                                const struct rtattr *carrier_changes)
 {
-       fprintf(fp, "%s", _SL_);
        fprintf(fp, "    RX: bytes  packets  errors  dropped overrun mcast   %s%s",
                s->rx_compressed ? "compressed" : "", _SL_);
        fprintf(fp, "    %-10"PRIu64" %-8"PRIu64" %-7"PRIu64" %-7"PRIu64" %-7"PRIu64" %-7"PRIu64"",
@@ -375,10 +374,9 @@ static void print_link_stats64(FILE *fp, const struct rtnl_link_stats64 *s,
        }
 }
 
-static void print_link_stats(FILE *fp, const struct rtnl_link_stats *s,
-                            const struct rtattr *carrier_changes)
+static void print_link_stats32(FILE *fp, const struct rtnl_link_stats *s,
+                              const struct rtattr *carrier_changes)
 {
-       fprintf(fp, "%s", _SL_);
        fprintf(fp, "    RX: bytes  packets  errors  dropped overrun mcast   %s%s",
                s->rx_compressed ? "compressed" : "", _SL_);
        fprintf(fp, "    %-10u %-8u %-7u %-7u %-7u %-7u",
@@ -425,6 +423,27 @@ static void print_link_stats(FILE *fp, const struct rtnl_link_stats *s,
        }
 }
 
+static void __print_link_stats(FILE *fp, struct rtattr **tb)
+{
+       if (tb[IFLA_STATS64])
+               print_link_stats64(fp, RTA_DATA(tb[IFLA_STATS64]),
+                                       tb[IFLA_CARRIER_CHANGES]);
+       else if (tb[IFLA_STATS])
+               print_link_stats32(fp, RTA_DATA(tb[IFLA_STATS]),
+                                       tb[IFLA_CARRIER_CHANGES]);
+}
+
+static void print_link_stats(FILE *fp, struct nlmsghdr *n)
+{
+       struct ifinfomsg *ifi = NLMSG_DATA(n);
+       struct rtattr * tb[IFLA_MAX+1];
+
+       parse_rtattr(tb, IFLA_MAX, IFLA_RTA(ifi),
+                    n->nlmsg_len - NLMSG_LENGTH(sizeof(*ifi)));
+       __print_link_stats(fp, tb);
+       fprintf(fp, "%s", _SL_);
+}
+
 int print_linkinfo(const struct sockaddr_nl *who,
                   struct nlmsghdr *n, void *arg)
 {
@@ -550,12 +569,8 @@ int print_linkinfo(const struct sockaddr_nl *who,
        }
 
        if (do_link && show_stats) {
-               if (tb[IFLA_STATS64])
-                       print_link_stats64(fp, RTA_DATA(tb[IFLA_STATS64]),
-                                          tb[IFLA_CARRIER_CHANGES]);
-               else if (tb[IFLA_STATS])
-                       print_link_stats(fp, RTA_DATA(tb[IFLA_STATS]),
-                                        tb[IFLA_CARRIER_CHANGES]);
+               fprintf(fp, "%s", _SL_);
+               __print_link_stats(fp, tb);
        }
 
        if (do_link && tb[IFLA_VFINFO_LIST] && tb[IFLA_NUM_VF]) {
@@ -567,7 +582,7 @@ int print_linkinfo(const struct sockaddr_nl *who,
 
        fprintf(fp, "\n");
        fflush(fp);
-       return 0;
+       return 1;
 }
 
 static int flush_update(void)
@@ -1282,11 +1297,15 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
        }
 
        for (l = linfo.head; l; l = l->next) {
-               if (no_link || print_linkinfo(NULL, &l->h, stdout) == 0) {
+               int res = 0;
+
+               if (no_link || (res = print_linkinfo(NULL, &l->h, stdout)) >= 0) {
                        struct ifinfomsg *ifi = NLMSG_DATA(&l->h);
                        if (filter.family != AF_PACKET)
                                print_selected_addrinfo(ifi->ifi_index,
                                                        ainfo.head, stdout);
+                       if (res > 0 && !do_link && show_stats)
+                               print_link_stats(stdout, &l->h);
                }
        }
        fflush(stdout);