Date: Wed, 16 Oct 2024 05:18:42 +0000 (UTC) From: Pedro Giffuni <pfg@freebsd.org> To: "maxim@freebsd.org" <maxim@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org> Subject: Re: git: 80a5b26871e9 - main - sbin/ping: allow normal users to specify larger packets Message-ID: <1108313894.2410377.1729055922813@mail.yahoo.com> In-Reply-To: <4c41b78e-b560-08ef-0070-017f21d4c8eb@maxim.int.ru> References: <202410160106.49G16qS7012339@gitrepo.freebsd.org> <4c41b78e-b560-08ef-0070-017f21d4c8eb@maxim.int.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi;
Yes sorry .. I will be reverting the commit.
Pedro.
On Tuesday, October 15, 2024 at 09:43:00 PM GMT-5, <maxim@freebsd.org> wrote:
Hi Pedro,
> index d9d544bc75c8..e6b1247af497 100644
> --- a/sbin/ping/ping.c
> +++ b/sbin/ping/ping.c
> @@ -96,8 +96,8 @@
> #define DEFDATALEN 56 /* default data length */
> #define FLOOD_BACKOFF 20000 /* usecs to back off if F_FLOOD mode */
> /* runs out of buffer space */
> -#define MAXIPLEN (sizeof(struct ip) + MAX_IPOPTLEN)
> -#define MAXICMPLEN (ICMP_ADVLENMIN + MAX_IPOPTLEN)
> +#define MAXIPLEN ((int)sizeof(struct ip) + MAX_IPOPTLEN)
> +#define MAXPAYLOAD (IP_MAXPACKET - MAXIPLEN - ICMP_MINLEN)
This doesn't look right.
Before:
# ping -s 65507 -c 1 127.0.0.1
ING 127.0.0.1 (127.0.0.1): 65507 data bytes
65515 bytes from 127.0.0.1: icmp_seq=0 ttl=64 time=0.194 ms
..
Now:
# /usr/obj/usr/home/maxim/fbsd/src/amd64.amd64/sbin/ping/ping -s 65507
-c 1 127.0.0.1
ping: packet size too large: 65507 > 65467
Not sure if the tests catch this.
Maxim
--
Maxim Konovalov
[-- Attachment #2 --]
<html><head></head><body><div class="ydp43ce26adyahoo-style-wrap" style="font-family:Helvetica Neue, Helvetica, Arial, sans-serif;font-size:16px;"><div></div>
<div dir="ltr" data-setdir="false">Hi;</div><div dir="ltr" data-setdir="false"><br></div><div dir="ltr" data-setdir="false">Yes sorry .. I will be reverting the commit.</div><div dir="ltr" data-setdir="false"><br></div><div dir="ltr" data-setdir="false">Pedro.</div><div><br></div>
</div><div id="ydp92a3cb3ayahoo_quoted_9467095958" class="ydp92a3cb3ayahoo_quoted">
<div style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;color:#26282a;">
<div>
On Tuesday, October 15, 2024 at 09:43:00 PM GMT-5, <maxim@freebsd.org> wrote:
</div>
<div><br></div>
<div><br></div>
<div><div dir="ltr">Hi Pedro,<div class="ydp92a3cb3ayqt4056528455" id="ydp92a3cb3ayqtfd75193"><br clear="none"><br clear="none">> index d9d544bc75c8..e6b1247af497 100644<br clear="none">> --- a/sbin/ping/ping.c<br clear="none">> +++ b/sbin/ping/ping.c<br clear="none">> @@ -96,8 +96,8 @@<br clear="none">> #define DEFDATALEN 56 /* default data length */<br clear="none">> #define FLOOD_BACKOFF 20000 /* usecs to back off if F_FLOOD mode */<br clear="none">> /* runs out of buffer space */<br clear="none">> -#define MAXIPLEN (sizeof(struct ip) + MAX_IPOPTLEN)<br clear="none">> -#define MAXICMPLEN (ICMP_ADVLENMIN + MAX_IPOPTLEN)<br clear="none">> +#define MAXIPLEN ((int)sizeof(struct ip) + MAX_IPOPTLEN)<br clear="none">> +#define MAXPAYLOAD (IP_MAXPACKET - MAXIPLEN - ICMP_MINLEN)</div><br clear="none"><br clear="none">This doesn't look right.<br clear="none"><br clear="none">Before:<br clear="none"><br clear="none"># ping -s 65507 -c 1 127.0.0.1<br clear="none">ING 127.0.0.1 (127.0.0.1): 65507 data bytes<br clear="none">65515 bytes from 127.0.0.1: icmp_seq=0 ttl=64 time=0.194 ms<br clear="none">..<br clear="none"><br clear="none">Now:<br clear="none"><br clear="none"># /usr/obj/usr/home/maxim/fbsd/src/amd64.amd64/sbin/ping/ping -s 65507<br clear="none">-c 1 127.0.0.1<br clear="none">ping: packet size too large: 65507 > 65467<br clear="none"><br clear="none">Not sure if the tests catch this.<br clear="none"><br clear="none">Maxim<br clear="none"><br clear="none">-- <br clear="none">Maxim Konovalov<div class="ydp92a3cb3ayqt4056528455" id="ydp92a3cb3ayqtfd17163"><br clear="none"></div></div></div>
</div>
</div></body></html>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1108313894.2410377.1729055922813>