Page MenuHomeFreeBSD
Differential D47650

syslogd: Detect INET/INET6 support using kern.features
AcceptedPublic
Actions

Authored by jfree on Sun, Nov 17, 7:57 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 20, 3:17 AM
Unknown Object (File)
Wed, Nov 20, 12:04 AM
Unknown Object (File)
Tue, Nov 19, 3:18 PM
Unknown Object (File)
Tue, Nov 19, 12:22 PM
Unknown Object (File)
Tue, Nov 19, 8:48 AM
Unknown Object (File)
Tue, Nov 19, 8:20 AM
Unknown Object (File)
Tue, Nov 19, 8:17 AM
Unknown Object (File)
Tue, Nov 19, 8:00 AM
View All 11 Files
Subscribers
imp
zlei

Details

Reviewers
markj
zlei
Summary

Previously, INET and INET6 support was determined by fetching the kernel
configuration (kern.conftxt) and grep'ing through it. This approach fails
if the kernel was compiled without an embedded conftxt.

Use the kern.features.inet and kern.features.inet6 sysctls instead to
determine INET and INET6 support. These knobs return non-zero if the
feature is supported.

This lets us call one less command (since grep is no longer needed) and
works on systems without conftxt.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 60648
Build 57532: arc lint + arc unit

Event Timeline

jfree created this revision.Sun, Nov 17, 7:57 PM
Herald added a subscriber: imp. · View Herald TranscriptSun, Nov 17, 7:57 PM
jfree requested review of this revision.Sun, Nov 17, 7:57 PM
Harbormaster completed remote builds in B60648: Diff 146625.Sun, Nov 17, 7:58 PM
markj added inline comments.Sun, Nov 17, 10:11 PM
usr.sbin/syslogd/tests/syslogd_test.sh
122
131
138

I would suggest calling atf_skip if both inet and inet6 are not set.

zlei added a subscriber: zlei.Mon, Nov 18, 3:01 AM
zlei added inline comments.
usr.sbin/syslogd/tests/syslogd_test.sh
138

I would suggest calling atf_skip if both inet and inet6 are not set.

Or maybe it is better to have separate test cases, aka test_unix, test_inet and test_inet6 ?

jfree updated this revision to Diff 146631.Mon, Nov 18, 3:02 AM
jfree marked 3 inline comments as done.
jfree removed a subscriber: zlei.
  • Use sysctl's -n flag to print value without variable name. Silly mistake on my part.
  • Skip test if INET and INET6 are unsupported by kernel.
Harbormaster completed remote builds in B60654: Diff 146631.Mon, Nov 18, 3:02 AM
jfree marked an inline comment as done.Mon, Nov 18, 3:02 AM
jfree marked an inline comment as not done.
jfree updated this revision to Diff 146632.Mon, Nov 18, 3:14 AM
jfree added a subscriber: zlei.

Separate the "basic" test into three separate tests:

  • unix
  • inet
  • inet6

Thanks to @zlei for the suggestion.

Harbormaster completed remote builds in B60655: Diff 146632.Mon, Nov 18, 3:14 AM
jfree marked an inline comment as done.Mon, Nov 18, 3:14 AM
zlei accepted this revision.Mon, Nov 18, 3:18 AM

Looks good to me.

This revision is now accepted and ready to land.Mon, Nov 18, 3:18 AM
markj added inline comments.Mon, Nov 18, 2:34 PM
usr.sbin/syslogd/tests/syslogd_test.sh
132

Unfortunately, the way this works is that the sysctl simply doesn't exist if the feature isn't there. So you have to write something like:

if [ "$(sysctl -n kern.features.inet)" -ne 1 ]; then
    atf_skip
fi

You might also want to make sure that atf_skip can be used in the test case head. It might be fine, but it should be double-checked if you haven't already.

Revision Contents
Changeset List

PathSize
usr.sbin/
syslogd/
tests/
18 lines

Diff 146625

View Options

usr.sbin/syslogd/tests/syslogd_test.sh

Loading...