Page MenuHomeFreeBSD
Files F109360141

D38480.diff
No OneTemporary
Actions

D38480.diff
View Options

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1212,8 +1212,14 @@
tv1.tv_sec = ntohl(tv32.tv32_sec);
tv1.tv_nsec = ntohl(tv32.tv32_nsec);
timespecsub(tv, &tv1, tv);
- triptime = ((double)tv->tv_sec) * 1000.0 +
+ triptime = ((double)tv->tv_sec) * 1000.0 +
((double)tv->tv_nsec) / 1000000.0;
+ if (triptime < 0) {
+ warnx("time of day goes back (%.3f ms),"
+ " clamping time to 0",
+ triptime);
+ triptime = 0;
+ }
tsum += triptime;
tsumsq += triptime * triptime;
if (triptime < tmin)
diff --git a/sbin/ping/tests/test_ping.py b/sbin/ping/tests/test_ping.py
--- a/sbin/ping/tests/test_ping.py
+++ b/sbin/ping/tests/test_ping.py
@@ -268,6 +268,7 @@
("hlim=[0-9]*", "hlim="),
("ttl=[0-9]*", "ttl="),
("time=[0-9.-]*", "time="),
+ ("\(-[0-9\.]+[0-9]+ ms\)", "(- ms)"),
("[0-9\.]+/[0-9.]+", "/"),
]
for pattern, repl in pattern_replacements:
@@ -1209,6 +1210,32 @@
},
id="_3_1_special_udp",
),
+ pytest.param(
+ {
+ "src": "192.0.2.1",
+ "dst": "192.0.2.2",
+ "icmp_type": 0,
+ "icmp_code": 0,
+ "special": "warp",
+ },
+ {
+ "returncode": 0,
+ "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+64 bytes from: icmp_seq=0 ttl= time= ms
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 1 packets received, 0.0% packet loss
+round-trip min/avg/max/stddev = /// ms
+""",
+ "stderr": """\
+ping: time of day goes back (- ms), clamping time to 0
+""",
+ "redacted": True,
+ },
+ id="_0_0_special_warp",
+ ),
]
@pytest.mark.parametrize("pinger_kargs, expected", pinger_testdata)
@@ -1221,6 +1248,7 @@
assert ping.returncode == expected["returncode"]
if expected["redacted"]:
assert redact(ping.stdout) == expected["stdout"]
+ assert redact(ping.stderr) == expected["stderr"]
else:
assert ping.stdout == expected["stdout"]
- assert ping.stderr == expected["stderr"]
+ assert ping.stderr == expected["stderr"]

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 5, 1:20 AM (21 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16464359
Default Alt Text
D38480.diff (2 KB)

Event Timeline