Skip to content

Commit

Permalink
fix: build v1.31 (#105)
Browse files Browse the repository at this point in the history
Signed-off-by: Mike Beaumont <[email protected]>
  • Loading branch information
michaelbeaumont authored Jul 22, 2024
1 parent ee4590f commit 9128ab9
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
27 changes: 27 additions & 0 deletions patches/v1.31-0001-dns-don-t-error-if-header-id-is-0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From db432303b88ef5197ad6ed330a15173bf7967e1d Mon Sep 17 00:00:00 2001
From: Mike Beaumont <[email protected]>
Date: Tue, 9 Jul 2024 10:14:29 +0200
Subject: [PATCH] dns: don't error if header id is 0

---
source/extensions/filters/udp/dns_filter/dns_parser.cc | 4 ----
1 file changed, 4 deletions(-)

diff --git a/source/extensions/filters/udp/dns_filter/dns_parser.cc b/source/extensions/filters/udp/dns_filter/dns_parser.cc
index b63f69278d..9be5917d9b 100644
--- a/source/extensions/filters/udp/dns_filter/dns_parser.cc
+++ b/source/extensions/filters/udp/dns_filter/dns_parser.cc
@@ -212,10 +212,6 @@ bool DnsMessageParser::parseDnsObject(DnsQueryContextPtr& context,
}

context->id_ = static_cast<uint16_t>(context->header_.id);
- if (context->id_ == 0) {
- ENVOY_LOG(debug, "No ID in DNS query");
- return false;
- }

// Almost always, we will have only one query here. Per the RFC, QDCOUNT is usually 1
context->queries_.reserve(context->header_.questions);
--
2.45.2

1 change: 1 addition & 0 deletions scripts/fetch_sources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ patches_per_version[v1.27]="$(realpath "patches/v1.27-0001-dns-don-t-error-if-he
patches_per_version[v1.28]="$(realpath "patches/v1.28-0001-dns-don-t-error-if-header-id-is-0.patch")"
patches_per_version[v1.29]="$(realpath "patches/v1.29-0001-dns-don-t-error-if-header-id-is-0.patch")"
patches_per_version[v1.30]="$(realpath "patches/v1.30-0001-dns-don-t-error-if-header-id-is-0.patch")"
patches_per_version[v1.31]="$(realpath "patches/v1.31-0001-dns-don-t-error-if-header-id-is-0.patch")"

PATCH_FILES_1_26=(
"$(realpath "scripts/dns_filter_resolver.h.patch")"
Expand Down

0 comments on commit 9128ab9

Please sign in to comment.