From nobody Thu Mar 23 16:48:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjBBW5WR6z41YTd; Thu, 23 Mar 2023 16:49:07 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjBBW3CGjz3KX9; Thu, 23 Mar 2023 16:49:07 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x32f.google.com with SMTP id d24-20020a9d72d8000000b0069fb53b68a3so592009otk.11; Thu, 23 Mar 2023 09:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679590146; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=BgljrIfYLRoA6+aOrMT0mdWNN//1sJ9n0f/aEpSMPRM=; b=DIyws6+s2r4zwvYrN314sKcswjT1S1JHnZhIhZJhoaLcIMLD8wakMQhsG37wOR3fqN EWUfljOlXVUYIOWdDKLnQd9azG9cz6SavBjVX9MlD7DYExJmn0h//9Q8KwtXsLHgWeo4 gneQkt1NUNzhnw8IMu7TY3frYvH4JdcRtQajXhr57a1xO5QflfVMIYjg/lXJk9El0Awb vUpLnVs/HkuhF9PSSUcXtH6K4waqatJ7Ec0LcIYbrO43YB1vzzGvKaz0DEjnqOzA5gGL PRhtk4EPUaRHJ/7ntrkzSI7WmAb0LZzogQxMa+6abK8J9rTc6vH1LK9idozVBIillaZi RMrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679590146; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BgljrIfYLRoA6+aOrMT0mdWNN//1sJ9n0f/aEpSMPRM=; b=gKTM+yaObegAGifjI6l+nl/87HpB6dvtWr4deEeTH73WWo6yWp0tZAfDM5ThAVy3v2 nOQgCSZ1RezHEnDSmn3DoGzzfLZ5I2cEHoHXzJr1IBbNVub2Bo81SdP3yAbLhcWeigs3 7WX1PMeIzn8ofY3Nvbb5bIomBRDf86J1eGlehIrST5eC5kIJU8ZNuZ8tpgTRk3SBd7gf m74iyIckXctbotCSxSc38Em5cbO4Ob6qo+IHnOBWKXkkmZsEJGXVihsQMjvaVxb2+3SB bHTGKgLUqpg4d2tIbKw3j/kwEa0R3C9m+WR9+8zSv3LbuWyOH3FwQX6Zm+Ow+JDxfz2M AVZA== X-Gm-Message-State: AO0yUKVcWKJBhu0YyjC2HSSorsOr8n+Y0Lt57YMMLb7Cp6E/1vmFoHUF Zbf0ZZUMFdm1opmTQO9VeFpHqgfAx8c= X-Google-Smtp-Source: AK7set82WY3XiIIXNt+XVQqHACCg5HUAqO8rZRDwgXv7VYQoSb++i3Q6xJqvaARQMyGmepeHU6cMVw== X-Received: by 2002:a9d:63c8:0:b0:69f:793a:57a4 with SMTP id e8-20020a9d63c8000000b0069f793a57a4mr102725otl.2.1679590145821; Thu, 23 Mar 2023 09:49:05 -0700 (PDT) Received: from smtpclient.apple (mlsrj200152099p037.mls.com.br. [200.152.99.37]) by smtp.gmail.com with ESMTPSA id f15-20020a9d5f0f000000b0068bd6cf405dsm5447929oti.1.2023.03.23.09.49.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Mar 2023 09:49:05 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: Re: git: 20b41303140e - main - ping: Print the IP options of the original packet From: =?utf-8?B?Sm9zw6kgTHVpcyBEdXLDoW4=?= In-Reply-To: <20230323090520.30554030@slippy> Date: Thu, 23 Mar 2023 13:48:52 -0300 Cc: Mark Johnston , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6AEF84FA-8055-4AD1-83F1-D89386C33092@gmail.com> References: <202303191633.32JGXPov003163@gitrepo.freebsd.org> <20230323090520.30554030@slippy> To: Cy Schubert X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Rspamd-Queue-Id: 4PjBBW3CGjz3KX9 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On Mar 23, 2023, at 1:05 PM, Cy Schubert = wrote: >=20 > On Sun, 19 Mar 2023 16:33:25 GMT > Mark Johnston wrote: >=20 >> The branch main has been updated by markj: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D20b41303140eee4dfb896558fb83600c= 5f013d39 >>=20 >> commit 20b41303140eee4dfb896558fb83600c5f013d39 >> Author: Jose Luis Duran >> AuthorDate: 2023-02-09 15:47:53 +0000 >> Commit: Mark Johnston >> CommitDate: 2023-03-19 16:23:06 +0000 >>=20 >> ping: Print the IP options of the original packet >>=20 >> When an ICMP packet contains an IP packet in its payload, and that >> original IP packet contains options, these options were not = displayed >> accordingly in pr_iph(). >>=20 >> pr_iph() is a function that prints the original "quoted packet" IP >> header, with only an IP struct as an argument. The IP struct does = not >> contain IP options, and it is not guaranteed that the options will = be >> contiguous in memory to the IP struct after >> d9cacf605e2ac0f704e1ce76357cbfbe6cb63d52. >>=20 >> Pass the raw ICMP data along with the IP struct, in order to print = the >> options, if any. >>=20 >> Reviewed by: markj >> MFC after: 1 week >> Differential Revision: https://reviews.freebsd.org/D38469 >> --- >> sbin/ping/ping.c | 19 ++++++++++--------- >> sbin/ping/tests/ping_test.sh | 2 +- >> sbin/ping/tests/test_ping.py | 1 - >> 3 files changed, 11 insertions(+), 11 deletions(-) >>=20 >> diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c >> index fe319bfb70a5..b1721ad72a5c 100644 >> --- a/sbin/ping/ping.c >> +++ b/sbin/ping/ping.c >> @@ -225,7 +225,7 @@ 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_iph(struct ip *); >> +static void pr_iph(struct ip *, const u_char *); >> 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); >> @@ -1157,7 +1157,6 @@ pr_pack(char *buf, ssize_t cc, struct = sockaddr_in *from, struct timespec *tv) >> struct ip oip; >> u_char oip_header_len; >> struct icmp oicmp; >> - const u_char *oicmp_raw; >>=20 >> /* >> * Get size of IP header of the received packet. >> @@ -1355,8 +1354,6 @@ pr_pack(char *buf, ssize_t cc, struct = sockaddr_in *from, struct timespec *tv) >> } >>=20 >> memcpy(&oip, icmp_data_raw, sizeof(struct ip)); >> - oicmp_raw =3D icmp_data_raw + oip_header_len; >> - memcpy(&oicmp, oicmp_raw, sizeof(struct icmp)); >=20 > Coverity is complaining about uninitialized oicmp due to the deletion > of the above two lines. Right. That is strange it happened, but I=E2=80=99ll submit a fix. Thank = you! >=20 >>=20 >> if (((options & F_VERBOSE) && uid =3D=3D 0) || >> (!(options & F_QUIET2) && >> @@ -1366,7 +1363,7 @@ pr_pack(char *buf, ssize_t cc, struct = sockaddr_in *from, struct timespec *tv) >> (oicmp.icmp_id =3D=3D ident))) { >> (void)printf("%zd bytes from %s: ", cc, >> pr_addr(from->sin_addr)); >> - pr_icmph(&icp, &oip, oicmp_raw); >> + pr_icmph(&icp, &oip, icmp_data_raw); >> } else >> return; >> } >> @@ -1663,14 +1660,13 @@ pr_icmph(struct icmp *icp, struct ip *oip, = const u_char *const oicmp_raw) >> * Print an IP header with options. >> */ >> static void >> -pr_iph(struct ip *ip) >> +pr_iph(struct ip *ip, const u_char *cp) >> { >> struct in_addr ina; >> - u_char *cp; >> int hlen; >>=20 >> hlen =3D ip->ip_hl << 2; >> - cp =3D (u_char *)ip + sizeof(struct ip); /* point = to options */ >> + cp =3D cp + sizeof(struct ip); /* point to options */ >>=20 >> (void)printf("Vr HL TOS Len ID Flg off TTL Pro cks Src = Dst\n"); >> (void)printf(" %1x %1x %02x %04x %04x", >> @@ -1723,7 +1719,12 @@ pr_addr(struct in_addr ina) >> static void >> pr_retip(struct ip *ip, const u_char *cp) >> { >> - pr_iph(ip); >> + int8_t hlen; >> + >> + pr_iph(ip, cp); >> + >> + hlen =3D ip->ip_hl << 2; >> + cp =3D cp + hlen; >>=20 >> if (ip->ip_p =3D=3D 6) >> (void)printf("TCP: from port %u, to port %u = (decimal)\n", >> diff --git a/sbin/ping/tests/ping_test.sh = b/sbin/ping/tests/ping_test.sh >> index 9f821ed96360..53383f2fb7bc 100644 >> --- a/sbin/ping/tests/ping_test.sh >> +++ b/sbin/ping/tests/ping_test.sh >> @@ -178,7 +178,7 @@ inject_pip_head() >> } >> inject_pip_body() >> { >> - atf_check -s exit:2 -o match:"Destination Host Unreachable" -o = not-match:"01010101" python3 $(atf_get_srcdir)/injection.py pip >> + atf_check -s exit:2 -o match:"Destination Host Unreachable" -o = match:"(01){40}" python3 $(atf_get_srcdir)/injection.py pip >> } >> inject_pip_cleanup() >> { >> diff --git a/sbin/ping/tests/test_ping.py = b/sbin/ping/tests/test_ping.py >> index a9b760ff7aca..79fd332f1c18 100644 >> --- a/sbin/ping/tests/test_ping.py >> +++ b/sbin/ping/tests/test_ping.py >> @@ -893,7 +893,6 @@ Vr HL TOS Len ID Flg off TTL Pro cks = Src Dst >> "stderr": "", >> "redacted": False, >> }, >> - marks=3Dpytest.mark.skip("XXX currently failing"), >> id=3D"_3_1_opts_NOP_40", >> ), >> pytest.param( >>=20 >=20 >=20 >=20 > --=20 > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org >=20 > e^(i*pi)+1=3D0