Page MenuHomeFreeBSD

D38475.1794827335.diff
No OneTemporary

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D38475.1794827335.diff

diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -224,10 +224,9 @@
static void pinger(void);
static char *pr_addr(struct in_addr);
static char *pr_ntime(n_time);
-static void pr_icmph(struct icmp *, struct ip *, const u_char *const);
+static void pr_icmph(struct icmp *, struct ip *);
static void pr_iph(struct ip *);
static void pr_pack(char *, ssize_t, struct sockaddr_in *, struct timespec *);
-static void pr_retip(struct ip *, const u_char *);
static void status(int);
static void stopit(int);
@@ -1370,7 +1369,7 @@
(oicmp.icmp_id == ident))) {
(void)printf("%zd bytes from %s: ", cc,
pr_addr(from->sin_addr));
- pr_icmph(&icp, oip, oicmp_raw);
+ pr_icmph(&icp, oip);
} else
return;
}
@@ -1542,7 +1541,7 @@
* Print a descriptive string about an ICMP header.
*/
static void
-pr_icmph(struct icmp *icp, struct ip *oip, const u_char *const oicmp_raw)
+pr_icmph(struct icmp *icp, struct ip *oip)
{
switch(icp->icmp_type) {
@@ -1580,11 +1579,11 @@
break;
}
/* Print returned IP header information */
- pr_retip(oip, oicmp_raw);
+ pr_iph(oip);
break;
case ICMP_SOURCEQUENCH:
(void)printf("Source Quench\n");
- pr_retip(oip, oicmp_raw);
+ pr_iph(oip);
break;
case ICMP_REDIRECT:
switch(icp->icmp_code) {
@@ -1605,7 +1604,7 @@
break;
}
(void)printf("(New addr: %s)\n", inet_ntoa(icp->icmp_gwaddr));
- pr_retip(oip, oicmp_raw);
+ pr_iph(oip);
break;
case ICMP_ECHO:
(void)printf("Echo Request\n");
@@ -1624,12 +1623,12 @@
icp->icmp_code);
break;
}
- pr_retip(oip, oicmp_raw);
+ pr_iph(oip);
break;
case ICMP_PARAMPROB:
(void)printf("Parameter problem: pointer = 0x%02x\n",
icp->icmp_hun.ih_pptr);
- pr_retip(oip, oicmp_raw);
+ pr_iph(oip);
break;
case ICMP_TSTAMP:
(void)printf("Timestamp\n");
@@ -1722,23 +1721,6 @@
return(buf);
}
-/*
- * pr_retip --
- * Dump some info on a returned (via ICMP) IP packet.
- */
-static void
-pr_retip(struct ip *ip, const u_char *cp)
-{
- pr_iph(ip);
-
- if (ip->ip_p == 6)
- (void)printf("TCP: from port %u, to port %u (decimal)\n",
- (*cp * 256 + *(cp + 1)), (*(cp + 2) * 256 + *(cp + 3)));
- else if (ip->ip_p == 17)
- (void)printf("UDP: from port %u, to port %u (decimal)\n",
- (*cp * 256 + *(cp + 1)), (*(cp + 2) * 256 + *(cp + 3)));
-}
-
static char *
pr_ntime(n_time timestamp)
{
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
@@ -1163,6 +1163,54 @@
marks=pytest.mark.skip("XXX currently failing"),
id="_3_1_flags_DF",
),
+ pytest.param(
+ {
+ "src": "192.0.2.1",
+ "dst": "192.0.2.2",
+ "icmp_type": 3,
+ "icmp_code": 1,
+ "special": "tcp",
+ },
+ {
+ "returncode": 2,
+ "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ "stderr": """\
+ping: quoted data too short (40 bytes) from 192.0.2.2
+""",
+ "redacted": False,
+ },
+ id="_3_1_special_tcp",
+ ),
+ pytest.param(
+ {
+ "src": "192.0.2.1",
+ "dst": "192.0.2.2",
+ "icmp_type": 3,
+ "icmp_code": 1,
+ "special": "udp",
+ },
+ {
+ "returncode": 2,
+ "stdout": """\
+PATTERN: 0x01
+PING 192.0.2.2 (192.0.2.2): 56 data bytes
+
+--- 192.0.2.2 ping statistics ---
+1 packets transmitted, 0 packets received, 100.0% packet loss
+""",
+ "stderr": """\
+ping: quoted data too short (28 bytes) from 192.0.2.2
+""",
+ "redacted": False,
+ },
+ id="_3_1_special_udp",
+ ),
]
@pytest.mark.parametrize("pinger_kargs, expected", pinger_testdata)

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 11:08 AM (3 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41774825
Default Alt Text
D38475.1794827335.diff (4 KB)

Event Timeline