WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-28 04:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Generalise inplace callback (de)registration

Browse Source 
- (de)register inplace callbacks for module id
- No unbound-control set_option for ECS options
- Deprecated client-subnet-opcode config option
- Introduced client-subnet-always-forward config option
- Changed max-client-subnet-ipv6 default to 56 (as in RFC)
- Removed extern ECS config options
- module_restart_next now calls clear on all following modules
- Also create ECS module qstate on module_event_pass event


git-svn-id: file:///svn/unbound/trunk@4092 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans
2017-04-06 13:13:06 +00:00
parent bdac428d79
commit a2bc93547f
27 changed files with 2479 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testdata/subnet_cached.crpl
Vendored
+5 -6
View File
@@ -6,7 +6,6 @@ server:
val-override-date: "20070916134226"
target-fetch-policy: "0 0 0 0 0"
send-client-subnet: 1.2.3.4
client-subnet-opcode: 20730
max-client-subnet-ipv4: 17
module-config: "subnetcache validator iterator"
verbosity: 3
@@ -138,7 +137,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
11 00 ; source mask, scopemask
@@ -159,7 +158,7 @@ ENTRY_BEGIN
01 00 00 29 10 00 00 00
80 00 00 0b
50 fa 00 07 ; OPC, optlen
00 08 00 07 ; OPC, optlen
00 01 11 00 ; ip4, scope 17, source 0
7f 00 00 ;127.0.0.0/17
HEX_ANSWER_END
@@ -180,7 +179,7 @@ ENTRY_BEGIN
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
11 11 ; source mask, scopemask
@@ -201,7 +200,7 @@ ENTRY_BEGIN
01 00 00 29 10 00 00 00
80 00 00 0b
50 fa 00 07 ; OPC, optlen
00 08 00 07 ; OPC, optlen
00 01 12 00 ; ip4, scope 18, source 0
7f 00 00 ;127.0.0.0/18
HEX_ANSWER_END
@@ -222,7 +221,7 @@ ENTRY_BEGIN
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
12 11 ; source mask, scopemask
testdata/subnet_derived.crpl
Vendored
+2 -3
View File
@@ -1,7 +1,6 @@
server:
send-client-subnet: 5.0.15.10
send-client-subnet: 193.0.14.129
client-subnet-opcode: 20730
max-client-subnet-ipv4: 21
verbosity: 3
module-config: "subnetcache validator iterator"
@@ -56,7 +55,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
15 00 ; source mask, scopemask
@@ -128,7 +127,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
15 00 ; source mask, scopemask
testdata/subnet_format_ip4.crpl
Vendored
+1 -2
View File
@@ -1,6 +1,5 @@
server:
send-client-subnet: 5.0.15.10
client-subnet-opcode: 20730
max-client-subnet-ipv4: 21
verbosity: 3
module-config: "subnetcache validator iterator"
@@ -125,7 +124,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
15 00 ; source mask, scopemask
testdata/subnet_nondefault_opc.crpl
Vendored
-161
View File
@@ -1,161 +0,0 @@
server:
send-client-subnet: 5.0.15.10
client-subnet-opcode: 99
max-client-subnet-ipv4: 21
verbosity: 3
module-config: "subnetcache validator iterator"
stub-zone:
name: "."
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
CONFIG_END
SCENARIO_BEGIN Works for other than default OPC
RANGE_BEGIN 0 100
ADDRESS 193.0.14.129
ENTRY_BEGIN
MATCH opcode qtype qname ednsdata
ADJUST copy_id
REPLY QR NOERROR
SECTION QUESTION
. IN NS
SECTION ANSWER
. IN NS K.ROOT-SERVERS.NET.
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
K.ROOT-SERVERS.NET. IN A 193.0.14.129
ENTRY_END
ENTRY_BEGIN
MATCH opcode qtype qname ednsdata
ADJUST copy_id
REPLY QR NOERROR
SECTION QUESTION
a.gtld-servers.net. IN AAAA
SECTION AUTHORITY
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
ENTRY_END
ENTRY_BEGIN
MATCH opcode qtype qname ednsdata
ADJUST copy_id
REPLY QR NOERROR
SECTION QUESTION
www.example.com. IN A
SECTION AUTHORITY
com. IN NS a.gtld-servers.net.
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
a.gtld-servers.net. IN A 192.5.6.30
ENTRY_END
RANGE_END
RANGE_BEGIN 0 100
ADDRESS 192.5.6.30
ENTRY_BEGIN
MATCH opcode subdomain ednsdata
ADJUST copy_id copy_query
REPLY QR NOERROR
SECTION QUESTION
example.com. IN A
SECTION AUTHORITY
example.com. IN NS ns.example.com.
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
ns.example.com. IN A 5.0.15.10
ENTRY_END
RANGE_END
RANGE_BEGIN 0 100
ADDRESS 5.0.15.10
ENTRY_BEGIN
MATCH opcode qtype qname ednsdata
ADJUST copy_id
REPLY QR NOERROR
SECTION QUESTION
example.com. IN NS
SECTION ANSWER
example.com. IN NS ns.example.com.
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
ns.example.com. IN A 5.0.15.10
ENTRY_END
ENTRY_BEGIN
MATCH opcode qtype qname ednsdata
ADJUST copy_id
REPLY QR NOERROR
SECTION QUESTION
ns.example.com. IN AAAA
SECTION ANSWER
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
;; we expect to receive empty
HEX_EDNSDATA_END
ENTRY_END
ENTRY_BEGIN
MATCH opcode subdomain ednsdata
ADJUST copy_id copy_query
REPLY QR NOERROR
SECTION QUESTION
www.example.com. IN A
SECTION ANSWER
www.example.com. IN A 4.3.2.1
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
00 63 ; OPC
00 07 ; option length
00 01 ; Family
15 00 ; source mask, scopemask
7f 00 00 ; address
HEX_EDNSDATA_END
ENTRY_END
RANGE_END
;; ----------------------------------------
STEP 1 QUERY
ENTRY_BEGIN
REPLY RD
SECTION QUESTION
www.example.com. IN A
ENTRY_END
STEP 10 CHECK_ANSWER
ENTRY_BEGIN
MATCH all
REPLY QR RD RA NOERROR
SECTION QUESTION
www.example.com. IN A
SECTION ANSWER
www.example.com. IN A 4.3.2.1
SECTION AUTHORITY
SECTION ADDITIONAL
ENTRY_END
SCENARIO_END
testdata/subnet_val_positive.crpl
Vendored
+1 -2
View File
@@ -5,7 +5,6 @@ server:
val-override-date: "20070916134226"
target-fetch-policy: "0 0 0 0 0"
send-client-subnet: 1.2.3.4
client-subnet-opcode: 20730
max-client-subnet-ipv4: 17
module-config: "subnetcache validator iterator"
verbosity: 3
@@ -142,7 +141,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
11 00 ; source mask, scopemask
testdata/subnet_val_positive_client.crpl
Vendored
+3 -4
View File
@@ -6,7 +6,6 @@ server:
val-override-date: "20070916134226"
target-fetch-policy: "0 0 0 0 0"
send-client-subnet: 1.2.3.4
client-subnet-opcode: 20730
max-client-subnet-ipv4: 17
module-config: "subnetcache validator iterator"
verbosity: 3
@@ -137,7 +136,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
11 00 ; source mask, scopemask
@@ -158,7 +157,7 @@ ENTRY_BEGIN
01 00 00 29 10 00 00 00
80 00 00 0b
50 fa 00 07 ; OPC, optlen
00 08 00 07 ; OPC, optlen
00 01 11 00 ; ip4, scope 17, source 0
7f 00 00 ;127.0.0.0/17
HEX_ANSWER_END
@@ -182,7 +181,7 @@ ENTRY_BEGIN
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
11 00 ; source mask, scopemask
testdata/subnet_without_validator.crpl
Vendored
+1 -2
View File
@@ -1,6 +1,5 @@
server:
send-client-subnet: 5.0.15.10
client-subnet-opcode: 20730
max-client-subnet-ipv4: 21
verbosity: 3
module-config: "subnetcache iterator"
@@ -125,7 +124,7 @@ RANGE_BEGIN 0 100
SECTION ADDITIONAL
HEX_EDNSDATA_BEGIN
; client is 127.0.0.1
50 fa ; OPC
00 08 ; OPC
00 07 ; option length
00 01 ; Family
15 00 ; source mask, scopemask