tcp: Avoid conditionally defined fields in union lro_address
ClosedPublic
Actions

Authored by markj on Feb 10 2022, 6:04 PM.

Details

Reviewers

• hselasky
rscheff
tuexen

Group Reviewers

transport

Commits

rGb4f60fab5d3f: tcp: Avoid conditionally defined fields in union lro_address

Summary

The layout of the structure ends up depending on whether the including
file includes opt_inet.h and opt_inet6.h, so different compilation units
can end up seeing different versions of the structure. Fix this by
unconditionally defining the address fields.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 44391
Build 41279: arc lint + arc unit

Event Timeline

markj created this revision.Feb 10 2022, 6:04 PM

Herald added 1 blocking reviewer(s): transport. · View Herald TranscriptFeb 10 2022, 6:04 PM

Herald added subscribers: glebius, melifaro, imp. · View Herald Transcript

markj requested review of this revision.Feb 10 2022, 6:04 PM

Harbormaster completed remote builds in B44391: Diff 102612.Feb 10 2022, 6:05 PM

I found this because there are multiple definitions of lro_address, lro_parser, etc. in the CTF info for the kernel, caused by this mismatch. In general it's a bad idea to conditionally define fields in header files, unless it is guaranteed that all compilation units will evaluate the condition the same way.