Page MenuHomeFreeBSD

D38479.diff
No OneTemporary

D38479.diff

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1680,9 +1680,9 @@
(void)printf(" %1x %1x %02x %04x %04x",
ip->ip_v, ip->ip_hl, ip->ip_tos, ntohs(ip->ip_len),
ntohs(ip->ip_id));
- (void)printf(" %1lx %04lx",
- (u_long) (ntohl(ip->ip_off) & 0xe000) >> 13,
- (u_long) ntohl(ip->ip_off) & 0x1fff);
+ (void)printf(" %1x %04x",
+ (ntohs(ip->ip_off) & 0xe000) >> 13,
+ ntohs(ip->ip_off) & 0x1fff);
(void)printf(" %02x %02x %04x", ip->ip_ttl, ip->ip_p,
ntohs(ip->ip_sum));
memcpy(&ina, &ip->ip_src.s_addr, sizeof ina);
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
@@ -919,7 +919,6 @@
"stderr": "",
"redacted": False,
},
- marks=pytest.mark.skip("XXX currently failing"),
id="_3_1_flags_DF",
),
]

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 9:30 AM (12 h, 21 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27799214
Default Alt Text
D38479.diff (977 B)

Event Timeline