ping tests: fix for scapy-2.6.0
ClosedPublic
Actions

Authored by kp on Oct 16 2024, 8:09 AM.

Details

Reviewers

jlduran
bofh

Group Reviewers

network

Commits

rGd261971e7d58: ping tests: fix for scapy-2.6.0
rG2926c2594249: ping tests: fix for scapy-2.6.0

Summary

Scapy 2.6.0 now appears to parse the IPOption during construction, and it then
gets confused at a single-byte option. IP Options typically contain at least a 1
byte type and 1 byte length. Avoid this by just returning the raw bytes, rather
than an IPOption object.

MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 60031
Build 56915: arc lint + arc unit

Event Timeline

kp created this revision.Oct 16 2024, 8:09 AM

Herald added a subscriber: imp. · View Herald TranscriptOct 16 2024, 8:09 AM

kp requested review of this revision.Oct 16 2024, 8:09 AM

Harbormaster completed remote builds in B60031: Diff 144981.Oct 16 2024, 8:09 AM

Thank you!

This revision is now accepted and ready to land.Oct 16 2024, 1:11 PM

The unk-40 below also has an unknown option, but is not tested in this file (tested on the atf-sh based test).
There are a couple other minor fixes I would like to add to this file, but this is just about making the tests pass.
Thanks for the heads up!

Closed by commit rG2926c2594249: ping tests: fix for scapy-2.6.0 (authored by kp). · Explain WhyOct 16 2024, 3:31 PM

This revision was automatically updated to reflect the committed changes.

kp added a commit: rG2926c2594249: ping tests: fix for scapy-2.6.0.

kp added a commit: rGd261971e7d58: ping tests: fix for scapy-2.6.0.Oct 21 2024, 12:53 PM