Raw pings output time in usec. Correct args and docs.

(An alternate solution is to correct https://github.com/traviscross/mtr/blob/master/ui/net.c#L319, but that would potentially break workflows for users, so this is likely a more acceptable fix)

diff --git a/FORMATS b/FORMATS
index cae643df413a6906d6493167146f798df17bf3d1..a09cf6d59e91759759e8a32064809ac0f4b7a33f 100644 (file)
--- a/FORMATS
+++ b/FORMATS
@@ -20,7 +20,7 @@ xmitline:
 x <pos> <seqnum>
 
 pingline:
-p <pos> <pingtime (ms)> <seqnum>
+p <pos> <pingtime (usec)> <seqnum>
 
 dnsline:
 d <pos> <hostname>

diff --git a/ui/display.c b/ui/display.c
index 6761b19072fa468dcb5d6bd5de87162deef0cfb1..a076154fe8da1cbd70843c2213b108541ac3abd3 100644 (file)
--- a/ui/display.c
+++ b/ui/display.c
@@ -218,11 +218,11 @@ void display_rawxmit(
 void display_rawping(
     struct mtr_ctl *ctl,
     int host,
-    int msec,
+    int usec,
     int seq)
 {
     if (ctl->DisplayMode == DisplayRaw)
-        raw_rawping(ctl, host, msec, seq);
+        raw_rawping(ctl, host, usec, seq);
 }
 
 

diff --git a/ui/display.h b/ui/display.h
index ad74e63220f4e2e512b630d59370da5cf4acd501..bfe1aa3616686aa6ef505d65b381f11238de0485 100644 (file)
--- a/ui/display.h
+++ b/ui/display.h
@@ -79,7 +79,7 @@ extern void display_rawxmit(
 extern void display_rawping(
     struct mtr_ctl *ctl,
     int hostnum,
-    int msec,
+    int usec,
     int seq);
 extern void display_rawhost(
     struct mtr_ctl *ctl,

diff --git a/ui/raw.c b/ui/raw.c
index 74ed35fca2f6dd5ffd3428f32217ecd79b74161e..aef1ad14884193379a67b1a27c1fab49995c0e8d 100644 (file)
--- a/ui/raw.c
+++ b/ui/raw.c
@@ -47,7 +47,7 @@ void raw_rawxmit(
 void raw_rawping(
     struct mtr_ctl *ctl,
     int host,
-    int msec,
+    int usec,
     int seq)
 {
     static int havename[MaxHost];
@@ -60,7 +60,7 @@ void raw_rawping(
             printf("d %d %s\n", host, name);
         }
     }
-    printf("p %d %d %d\n", host, msec, seq);
+    printf("p %d %d %d\n", host, usec, seq);
     fflush(stdout);
 }
 

diff --git a/ui/raw.h b/ui/raw.h
index f3fde96692798335353add1e4961622f2b627636..41ac8f12271f964f11785307852b2f0442c2223c 100644 (file)
--- a/ui/raw.h
+++ b/ui/raw.h
@@ -25,7 +25,7 @@ extern void raw_rawxmit(
 extern void raw_rawping(
     struct mtr_ctl *ctl,
     int host,
-    int msec,
+    int usec,
     int seq);
 extern void raw_rawhost(
     struct mtr_ctl *ctl,