Repository navigation
feat: sync daeuniverse/dae main (e3fee8f) into fork main - #40
Merged
Merged
Conversation
daeuniverse#1103) Co-authored-by: Markson Hon <50002150+MarksonHon@users.noreply.github.com>
… a local service (daeuniverse#1110) Co-authored-by: kix <olices@9up.in>
…tns/daens (daeuniverse#1111) Co-authored-by: kix <olices@9up.in> Co-authored-by: Markson Hon <50002150+MarksonHon@users.noreply.github.com>
Co-authored-by: Markson Hon <50002150+MarksonHon@users.noreply.github.com>
…erse#1130) Co-authored-by: Markson Hon <50002150+MarksonHon@users.noreply.github.com>
…cts too (daeuniverse#1125) Co-authored-by: Markson Hon <50002150+MarksonHon@users.noreply.github.com>
Brings the fork from v2.1.1 (dbae2e8) to upstream main e3fee8f: daeuniverse#1103, daeuniverse#1110, daeuniverse#1115, daeuniverse#1111, daeuniverse#1117, daeuniverse#1122, daeuniverse#1124, daeuniverse#1130, daeuniverse#1125. No file overlaps with the fork's changes; the merge is conflict-free. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BYykYRdT6p8qLLe4RMiV7s
DNS Benchmark Compare
Suite Status
control_dns_cacheDNS Benchmark Compare
benchstatcomponent_upstream_hotpathDNS Benchmark Compare
benchstat |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Background
The fork's last upstream base is v2.1.1 (
dbae2e8), integrated in #38. Upstreammainhas since gained 9 commits. This PR merges upstreammainate3fee8finto forkmainwith a merge commit.Checklist
Full Changelogs
Upstream commits brought in:
eea4596docs: turn the external DNS page into a how-to and fix its DHCP advice (docs: turn the external DNS page into a how-to and fix its DHCP advice daeuniverse/dae#1103)fb5eae6fix(kern): require an exact address match before bypassing LAN UDP to a local service (fix(kern): require an exact address match before bypassing LAN UDP to a local service daeuniverse/dae#1110)17cc1defix(control): flush short TCP splice writes without corking (fix(control): flush short TCP splice writes without corking daeuniverse/dae#1115)2649d5bfix(control): fail fast and auto-recover from a kernel-locked /run/netns/daens (fix(control): fail fast and auto-recover from a kernel-locked /run/netns/daens daeuniverse/dae#1111)6f2f2aafix(config): restore Marshaller.Bytes (fix(config): restore Marshaller.Bytes daeuniverse/dae#1117)b59e375ci: add nightly releases and bundle source dependencies (ci: add nightly releases and bundle source dependencies daeuniverse/dae#1122)5a5473dfix(config): make the digit-prefix hint actionable and validate fixed_domain_ttl (fix(config): make the digit-prefix hint actionable and validate fixed_domain_ttl daeuniverse/dae#1124)e6e52bbfix(daedns): dial the bootstrap resolver family-agnostically (fix(daedns): dial the bootstrap resolver family-agnostically daeuniverse/dae#1130)e3fee8ffix(control): stop LAN ICMP redirects by writing conf/all/send_redirects too (fix(control): stop LAN ICMP redirects by writing conf/all/send_redirects too daeuniverse/dae#1125)The 34 files upstream changed do not overlap with any file the fork changed since
dbae2e8, so the merge (9e56302) needed no conflict resolution.Note: daeuniverse#1122 adds
.github/workflows/nightly.yml, which is scheduled daily at 12:00 UTC and has no repository guard. It is merged unchanged. The repository owner will disable it in this fork's Actions settings so the fork does not publish anightlyprerelease.Issue Reference
Follow-up to #38 and #39.
Test Result
Local checks used go1.26.0, the CI
GOEXPERIMENTset, and-tags dae_stub_ebpf:go build ./...andgo vet ./...pass.go mod tidyare clean.go testpasses for./cmd ./config ./component/daedns/... ./pkg/... ./common/... ./component/outbound/...../control: everything passes except 9 environment-bound cases. They fail identically on the base40dd125in the same container and pass in this fork's CI:TestTCPOffloadHeaderContractneeds thecontrol/kern/headerssubmodule, which is not checked out locally.TestListenerClone*andTestUDPIngressRealIPv6Datagramsneed IPv6, which the container's kernel lacks.The full Linux suites (go-test, bpf-test, kernel-test, ebpf-audit) run in CI on this PR.
🤖 Generated with Claude Code
https://claude.ai/code/session_01BYykYRdT6p8qLLe4RMiV7s
Generated by Claude Code