Page MenuHomeFreeBSD
Differential D57925

libc/resolv: Reimplement the sortlist parser
ClosedPublic
Actions

Authored by des on Sun, Jun 28, 8:13 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Jul 6, 7:10 PM
Unknown Object (File)
Mon, Jul 6, 3:30 PM
Unknown Object (File)
Mon, Jul 6, 12:26 AM
Unknown Object (File)
Mon, Jul 6, 12:23 AM
Unknown Object (File)
Sun, Jul 5, 11:32 PM
Unknown Object (File)
Sun, Jul 5, 11:27 PM
Unknown Object (File)
Sun, Jul 5, 9:28 PM
Unknown Object (File)
Sun, Jul 5, 9:25 PM
View All Files
Subscribers
imp
ziaee

Details

Reviewers
kevans
markj
Commits
rGfbe0257b5613: libc/resolv: Reimplement the sortlist parser
Summary

When we switched from the BIND4 resolver to the BIND9 resolver, the
sortlist parser was inadvertently disabled due to a missing #define, and
nobody seemed to notice. The sorting code remained enabled in the
resolver, but there was no way to set a sort order.

Reimplement the sortlist parser, but correctly, and update the manual
accordingly. The new parser accepts IPv4 and IPv6 addresses with or
without a mask or prefix length, just like the old one, except IPv6
support was a bit wonky in the original code.

Fixes: 5342d17f09a8 ("Update the resolver in libc to BIND9's one.")
Relnotes: yes

Diff Detail

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

Event Timeline

des created this revision.Sun, Jun 28, 8:13 AM
Herald added subscribers: ziaee, imp. · View Herald TranscriptSun, Jun 28, 8:13 AM
des requested review of this revision.Sun, Jun 28, 8:13 AM
des added a parent revision: D57924: libc/resolv: Refactor the configuration parser.
des added a child revision: D57926: libc/resolv: Add no-debug and no-rotate options.
Harbormaster completed remote builds in B74352: Diff 180854.Sun, Jun 28, 8:14 AM
markj accepted this revision.Tue, Jun 30, 2:53 PM

the sortlist parser was inadvertently disabled, and nobody noticed

Presumably because res_init.c didn't include res_config.h? It'd be nice to mention that in the commit log message.

lib/libc/resolv/res_init.c
583
share/man/man5/resolver.5
115
This revision is now accepted and ready to land.Tue, Jun 30, 2:53 PM
des marked an inline comment as done.Tue, Jun 30, 9:31 PM
des updated this revision to Diff 181123.Tue, Jun 30, 9:52 PM

rf, add netmask support

This revision now requires review to proceed.Tue, Jun 30, 9:52 PM
Harbormaster completed remote builds in B74438: Diff 181123.Tue, Jun 30, 9:52 PM
des edited the summary of this revision. (Show Details)Tue, Jun 30, 9:52 PM
des updated this revision to Diff 181124.Tue, Jun 30, 10:14 PM

fix sortlist debug

Harbormaster completed remote builds in B74439: Diff 181124.Tue, Jun 30, 10:14 PM
markj added inline comments.Wed, Jul 1, 12:42 AM
lib/libc/resolv/res_init.c
632

Is 0 a valid mask?

des added inline comments.Wed, Jul 1, 9:04 AM
lib/libc/resolv/res_init.c
632

Yes, you could use

sortlist ::/0 0.0.0/0

to always prioritize IPv6 responses over IPv4 responses (or the reverse). But I have to special-case 0 because I can't left-shift a number by its entire width.

des updated this revision to Diff 181158.Wed, Jul 1, 9:15 AM

prefixlen 0

Harbormaster completed remote builds in B74451: Diff 181158.Wed, Jul 1, 9:15 AM
markj accepted this revision.Wed, Jul 1, 3:49 PM
This revision is now accepted and ready to land.Wed, Jul 1, 3:49 PM
Closed by commit rGfbe0257b5613: libc/resolv: Reimplement the sortlist parser (authored by des). · Explain WhyMon, Jul 6, 12:24 PM
This revision was automatically updated to reflect the committed changes.
des added a commit: rGfbe0257b5613: libc/resolv: Reimplement the sortlist parser.

Revision Contents
Changeset List

PathSize
lib/
libc/
resolv/
1 line
232 lines
share/
man/
man5/
33 lines

Diff 180854

View Options

lib/libc/resolv/Makefile.inc

Loading...
View Options

lib/libc/resolv/res_init.c

Loading...
View Options

share/man/man5/resolver.5

Loading...