lib: Add parse_one_of(), parse_on_off()

[mirror_iproute2.git] / ip / tcp_metrics.c

diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index 72dc980c92a64c6a6453ee5eae32565ca1c8ba4e..acbd745ab09ed596f01c0a9f6a11b3e00342b05a 100644 (file)
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -28,10 +28,11 @@
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip tcp_metrics/tcpmetrics { COMMAND | help }\n");
-       fprintf(stderr, "       ip tcp_metrics { show | flush } SELECTOR\n");
-       fprintf(stderr, "       ip tcp_metrics delete [ address ] ADDRESS\n");
-       fprintf(stderr, "SELECTOR := [ [ address ] PREFIX ]\n");
+       fprintf(stderr,
+               "Usage: ip tcp_metrics/tcpmetrics { COMMAND | help }\n"
+               "       ip tcp_metrics { show | flush } SELECTOR\n"
+               "       ip tcp_metrics delete [ address ] ADDRESS\n"
+               "SELECTOR := [ [ address ] PREFIX ]\n");
        exit(-1);
 }
 
@@ -139,25 +140,24 @@ static void print_tcp_metrics(struct rtattr *a)
 
                print_uint(PRINT_JSON, name, NULL, val);
                print_string(PRINT_FP, NULL, " %s ", name);
-               print_uint(PRINT_FP, NULL, "%lu", val);
+               print_uint(PRINT_FP, NULL, "%u", val);
        }
 
        if (rtt) {
                print_float(PRINT_JSON, "rtt", NULL,
                            (double)rtt / usec_per_sec);
-               print_uint(PRINT_FP, NULL,
+               print_u64(PRINT_FP, NULL,
                           " rtt %luus", rtt);
        }
        if (rttvar) {
                print_float(PRINT_JSON, "rttvar", NULL,
                            (double) rttvar / usec_per_sec);
-               print_uint(PRINT_FP, NULL,
+               print_u64(PRINT_FP, NULL,
                           " rttvar %luus", rttvar);
        }
 }
 
-static int process_msg(const struct sockaddr_nl *who, struct nlmsghdr *n,
-                      void *arg)
+static int process_msg(struct nlmsghdr *n, void *arg)
 {
        FILE *fp = (FILE *) arg;
        struct genlmsghdr *ghdr;
@@ -501,7 +501,7 @@ static int tcpm_do_cmd(int cmd, int argc, char **argv)
        } else if (atype >= 0) {
                if (rtnl_talk(&grth, &req.n, &answer) < 0)
                        return -2;
-               if (process_msg(NULL, answer, stdout) < 0) {
+               if (process_msg(answer, stdout) < 0) {
                        fprintf(stderr, "Dump terminated\n");
                        exit(1);
                }