Skip to contentSkip to conversation

tcp_cmds/ping/ping02: Make it compatible with Busybox

PATCH Superseded Kory Maincent 3 participants 5 messages Nov 9, 2020 – Nov 10, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 tcp_cmds/ping/ping02: Make it compatible with Busybox

The ping from busybox does not have -f parameter, use -i parameter instead. BusyBox does not accept pattern longer than 2 bytes.

---

Changes since v1:
- Use "-i 0.01 -p aa" parameter instead of "-f"

Changes since v2:
- Use "-i 0.01 -p aa" only in the case of "-f" parameter is not valid

 testcases/network/tcp_cmds/ping/ping02.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
testcases/network/tcp_cmds/ping/ping02.sh +6 -5
index e0a63c5f6..80346c552 100755
@@ -20,15 +20,16 @@ do_setup()
 
 do_test()
 {
-	local pat="000102030405060708090a0b0c0d0e0f"
-
-	tst_res TINFO "flood $PING: ICMP packets filled with pattern '$pat'"
-
+	local ping_opts="-f -p 000102030405060708090a0b0c0d0e0f"
 	local ipaddr=$(tst_ipaddr rhost)
 	local s
 
+	$PING -c 1 -f $ipaddr >/dev/null 2>&1 || ping_opts="-i 0.01 -p aa"
+
+	tst_res TINFO "flood $PING: ICMP packets with options '$ping_opts'"
+
 	for s in $PACKETSIZES; do
-		EXPECT_PASS $PING -c $COUNT -f -s $s $ipaddr -p "$pat" \>/dev/null
+		EXPECT_PASS $PING -c $COUNT -s $s $ipaddr $ping_opts \>/dev/null
 	done
 }
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/1 tcp_cmds/ping/ping02: Make it compatible with Busybox

Hi Kory, Alexey,

Quoted 11 lines

The ping from busybox does not have -f parameter, use -i parameter instead. BusyBox does not accept pattern longer than 2 bytes.

---

Changes since v1:
- Use "-i 0.01 -p aa" parameter instead of "-f"

Changes since v2:
- Use "-i 0.01 -p aa" only in the case of "-f" parameter is not valid

-i option was added in busybox 1.30 (2 years old), it'd be good to note that in the commit message.

I have in my TODO list C/shell API helper which would help to verify command version.

Kind regards,
Petr

#2 lore raw

PATCH v3 1/1 tcp_cmds/ping/ping02: Make it compatible with Busybox

Hi Kory, Alexey,

Quoted 2 lines

-i option was added in busybox 1.30 (2 years old), it'd be good to note that in the commit message.

Actually, maybe also test -i option and if even -i not working run?

tst_brk TCONF "unsupported ping version (old busybox?)"

Kind regards,
Petr

#3 lore raw

PATCH v3 1/1 tcp_cmds/ping/ping02: Make it compatible with Busybox

Quoted 7 lines · Petr Vorel

Hi Kory, Alexey,

Quoted 2 lines

-i option was added in busybox 1.30 (2 years old), it'd be good to note that in the commit message.

Actually, maybe also test -i option and if even -i not working run?

tst_brk TCONF "unsupported ping version (old busybox?)"

Hi Petr,

What if it failed for some other reason, it would be a wrong assumption that ping doesn't support -i...

#4 lore raw

PATCH v3 1/1 tcp_cmds/ping/ping02: Make it compatible with Busybox

Hi Kory, Alexey,

Quoted 5 lines · Petr Vorel
Quoted 4 lines

Hi Kory, Alexey,

Quoted 2 lines

-i option was added in busybox 1.30 (2 years old), it'd be good to note that in the commit message.

Quoted 8 lines
Quoted 3 lines

Actually, maybe also test -i option and if even -i not working run?

tst_brk TCONF "unsupported ping version (old busybox?)"

Hi Petr,

What if it failed for some other reason, it would be a wrong assumption that ping doesn't support -i...

Yep, that'd be bad.
Thus maybe just check
$PING 2>&1 |grep -q -- -i

in case of busybox?

If you don't like it, at least put tst_res TINFO message in case of busybox. (but I'd prefer this check).

And maybe move $ping_opts and this check to setup.

Kind regards,
Petr