Page MenuHomeFreeBSD
Differential D25046

Fix IPSEC_DEBUG in ipsec.ko
ClosedPublic
Actions

Authored by jhb on May 29 2020, 5:48 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 29, 9:35 AM
Unknown Object (File)
Sat, Mar 28, 5:28 AM
Unknown Object (File)
Thu, Mar 26, 9:55 AM
Unknown Object (File)
Tue, Mar 24, 9:53 AM
Unknown Object (File)
Tue, Mar 24, 9:53 AM
Unknown Object (File)
Mon, Mar 16, 3:14 AM
Unknown Object (File)
Feb 8 2026, 9:09 AM
Unknown Object (File)
Feb 8 2026, 4:20 AM
View All Files
Subscribers
ae
melifaro

Details

Reviewers
imp
Commits
rS361633: Consistently include opt_ipsec.h for consumers of <netipsec/ipsec.h>.
rS361632: Honor opt_ipsec.h from kernel builds.
Summary

Honor opt_ipsec.h from kernel builds.

To make this simpler, set the default contents of opt_ipsec.h
for standalone modules in sys/conf/config.mk.

Consistently include opt_ipsec.h for consumers of <netipsec/ipsec.h>.

This fixes ipsec.ko to include all of IPSEC_DEBUG.

Test Plan
  • tried to debug an OCF regression caught by ipsec and found that debug traces in xform_esp.c weren't working in ipsec.ko

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 31362
Build 28989: arc lint + arc unit

Event Timeline

jhb created this revision.May 29 2020, 5:48 AM
Herald added subscribers: melifaro, ae. · View Herald TranscriptMay 29 2020, 5:48 AM
jhb requested review of this revision.May 29 2020, 5:48 AM
Harbormaster completed remote builds in B31362: Diff 72394.May 29 2020, 5:48 AM
jhb added a comment.May 29 2020, 5:48 AM

This would be two commits, with logs as in the description, one to change opt_ipsec.h generation for modules and one to fix the #includes.

imp accepted this revision.May 29 2020, 6:51 AM
This revision is now accepted and ready to land.May 29 2020, 6:51 AM
Closed by commit rS361632: Honor opt_ipsec.h from kernel builds. (authored by jhb). · Explain WhyMay 29 2020, 7:21 PM
This revision was automatically updated to reflect the committed changes.
jhb added a commit: rS361632: Honor opt_ipsec.h from kernel builds..
jhb added a commit: rS361633: Consistently include opt_ipsec.h for consumers of <netipsec/ipsec.h>..

Revision Contents
Changeset List

PathSize
sys/
conf/
2 lines
modules/
ipsec/
3 lines
tcp/
tcpmd5/
3 lines
net/
1 line
1 line
netipsec/
5 lines
2 lines
1 line
1 line
1 line

Diff 72394

View Options

sys/conf/config.mk

Loading...
View Options

sys/modules/ipsec/Makefile

Loading...
View Options

sys/modules/tcp/tcpmd5/Makefile

Loading...
View Options

sys/net/if_enc.c

Loading...
View Options

sys/net/if_ipsec.c

Loading...
View Options

sys/netipsec/ipsec.h

Loading...
View Options

sys/netipsec/ipsec_mbuf.c

Loading...
View Options

sys/netipsec/xform_ah.c

Loading...
View Options

sys/netipsec/xform_esp.c

Loading...
View Options

sys/netipsec/xform_ipcomp.c

Loading...