NLnetLabs
diff --git a/‎daemon/daemon.c
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎daemon/daemon.c
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎doc/unbound.conf.5.in
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions b/‎doc/unbound.conf.5.in
Copy file name to clipboard
+8-8Lines changed: 8 additions & 8 deletions
diff --git a/‎libunbound/context.c
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎libunbound/context.c
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎libunbound/libunbound.c
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions b/‎libunbound/libunbound.c
Copy file name to clipboard
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎services/outside_network.c
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎services/outside_network.c
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎testcode/fake_event.c
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions b/‎testcode/fake_event.c
Copy file name to clipboard
+6-6Lines changed: 6 additions & 6 deletions
diff --git a/‎testdata/edns_client_tag.rpl renamed to ‎testdata/edns_client_string.rpl
Copy file name to clipboard
+24-23Lines changed: 24 additions & 23 deletions b/‎testdata/edns_client_tag.rpl renamed to ‎testdata/edns_client_string.rpl
Copy file name to clipboard
+24-23Lines changed: 24 additions & 23 deletions
@@ -291,7 +291,7 @@ daemon_init(void)
 		free(daemon);
 		return NULL;
 	}
-	if(!(daemon->env->edns_tags = edns_tags_create())) {
+	if(!(daemon->env->edns_strings = edns_strings_create())) {
 		auth_zones_delete(daemon->env->auth_zones);
 		acl_list_delete(daemon->acl);
 		tcl_list_delete(daemon->tcl);
@@ -638,9 +638,9 @@ daemon_fork(struct daemon* daemon)
 		&daemon->use_rpz))
 		fatal_exit("auth_zones could not be setup");
 
-	/* Set-up EDNS tags */
-	if(!edns_tags_apply_cfg(daemon->env->edns_tags, daemon->cfg))
-		fatal_exit("Could not set up EDNS tags");
+	/* Set-up EDNS strings */
+	if(!edns_strings_apply_cfg(daemon->env->edns_strings, daemon->cfg))
+		fatal_exit("Could not set up EDNS strings");
 
 	/* setup modules */
 	daemon_setup_modules(daemon);
@@ -773,7 +773,7 @@ daemon_delete(struct daemon* daemon)
 		rrset_cache_delete(daemon->env->rrset_cache);
 		infra_delete(daemon->env->infra_cache);
 		edns_known_options_delete(daemon->env);
-		edns_tags_delete(daemon->env->edns_tags);
+		edns_strings_delete(daemon->env->edns_strings);
 		auth_zones_delete(daemon->env->auth_zones);
 	}
 	ub_randfree(daemon->rand);
 
@@ -1550,15 +1550,15 @@ Set the number of servers that should be used for fast server selection. Only
 use the fastest specified number of servers with the fast\-server\-permil
 option, that turns this on or off. The default is to use the fastest 3 servers.
 .TP 5
-.B edns\-client\-tag: \fI<IP netblock> <tag data>
-Include an edns-client-tag option in queries with destination address matching
-the configured IP netblock. This configuration option can be used multiple
-times. The most specific match will be used. The tag data is configured in
-decimal format, from 0 to 65535.
+.B edns\-client\-string: \fI<IP netblock> <string>
+Include an EDNS0 option containing configured ascii string in queries with
+destination address matching the configured IP netblock.  This configuration
+option can be used multiple times. The most specific match will be used.
 .TP 5
-.B edns\-client\-tag\-opcode: \fI<opcode>
-EDNS0 option code for the edns-client-tag option, from 0 to 65535. Default is
-16, as assigned by IANA.
+.B edns\-client\-string\-opcode: \fI<opcode>
+EDNS0 option code for the \fIedns\-client\-string\fR option, from 0 to 65535.
+A value from the `Reserved for Local/Experimental` range (65001-65534) should
+be used.  Default is 65001.
 .SS "Remote Control Options"
 In the
 .B remote\-control:
 
@@ -80,7 +80,7 @@ context_finalize(struct ub_ctx* ctx)
 		return UB_INITFAIL;
 	if(!auth_zones_apply_cfg(ctx->env->auth_zones, cfg, 1, &is_rpz))
 		return UB_INITFAIL;
-	if(!edns_tags_apply_cfg(ctx->env->edns_tags, cfg))
+	if(!edns_strings_apply_cfg(ctx->env->edns_strings, cfg))
 		return UB_INITFAIL;
 	if(!slabhash_is_size(ctx->env->msg_cache, cfg->msg_cache_size,
 		cfg->msg_cache_slabs)) {
 
@@ -154,8 +154,8 @@ static struct ub_ctx* ub_ctx_create_nopipe(void)
 		errno = ENOMEM;
 		return NULL;
 	}
-	ctx->env->edns_tags = edns_tags_create();
-	if(!ctx->env->edns_tags) {
+	ctx->env->edns_strings = edns_strings_create();
+	if(!ctx->env->edns_strings) {
 		auth_zones_delete(ctx->env->auth_zones);
 		edns_known_options_delete(ctx->env);
 		config_delete(ctx->env->cfg);
@@ -186,7 +186,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
-		edns_tags_delete(ctx->env->edns_tags);
+		edns_strings_delete(ctx->env->edns_strings);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -199,7 +199,7 @@ ub_ctx_create(void)
 		config_delete(ctx->env->cfg);
 		modstack_desetup(&ctx->mods, ctx->env);
 		edns_known_options_delete(ctx->env);
-		edns_tags_delete(ctx->env->edns_tags);
+		edns_strings_delete(ctx->env->edns_strings);
 		free(ctx->env);
 		free(ctx);
 		errno = e;
@@ -338,7 +338,7 @@ ub_ctx_delete(struct ub_ctx* ctx)
 		infra_delete(ctx->env->infra_cache);
 		config_delete(ctx->env->cfg);
 		edns_known_options_delete(ctx->env);
-		edns_tags_delete(ctx->env->edns_tags);
+		edns_strings_delete(ctx->env->edns_strings);
 		auth_zones_delete(ctx->env->auth_zones);
 		free(ctx->env);
 	}
 
@@ -2125,18 +2125,18 @@ outnet_serviced_query(struct outside_network* outnet,
 {
 	struct serviced_query* sq;
 	struct service_callback* cb;
-	struct edns_tag_addr* client_tag_addr;
+	struct edns_string_addr* client_string_addr;
 
 	if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen, zone, zonelen,
 		qstate, qstate->region))
 			return NULL;
 
-	if((client_tag_addr = edns_tag_addr_lookup(&env->edns_tags->client_tags,
-		addr, addrlen))) {
-		uint16_t client_tag = htons(client_tag_addr->tag_data);
+	if((client_string_addr = edns_string_addr_lookup(
+		&env->edns_strings->client_strings, addr, addrlen))) {
 		edns_opt_list_append(&qstate->edns_opts_back_out,
-			env->edns_tags->client_tag_opcode, 2,
-			(uint8_t*)&client_tag, qstate->region);
+			env->edns_strings->client_string_opcode,
+			client_string_addr->string_len,
+			client_string_addr->string, qstate->region);
 	}
 
 	serviced_gen_query(buff, qinfo->qname, qinfo->qname_len, qinfo->qtype,
 
@@ -1214,7 +1214,7 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 	sldns_buffer_flip(pend->buffer);
 	if(1) {
 		struct edns_data edns;
-		struct edns_tag_addr* client_tag_addr;
+		struct edns_string_addr* client_string_addr;
 		if(!inplace_cb_query_call(env, qinfo, flags, addr, addrlen,
 			zone, zonelen, qstate, qstate->region)) {
 			free(pend);
@@ -1228,13 +1228,13 @@ struct serviced_query* outnet_serviced_query(struct outside_network* outnet,
 		edns.bits = 0;
 		if(dnssec)
 			edns.bits = EDNS_DO;
-		if((client_tag_addr = edns_tag_addr_lookup(
-			&env->edns_tags->client_tags,
+		if((client_string_addr = edns_string_addr_lookup(
+			&env->edns_strings->client_strings,
 			addr, addrlen))) {
-			uint16_t client_tag = htons(client_tag_addr->tag_data);
 			edns_opt_list_append(&qstate->edns_opts_back_out,
-				env->edns_tags->client_tag_opcode, 2,
-				(uint8_t*)&client_tag, qstate->region);
+				env->edns_strings->client_string_opcode,
+				client_string_addr->string_len,
+				client_string_addr->string, qstate->region);
 		}
 		edns.opt_list = qstate->edns_opts_back_out;
 		attach_edns_record(pend->buffer, &edns);
 
@@ -1,14 +1,14 @@
 ; config options
 server:
-	edns-client-tag: 10.0.0.0/24 1234
-	edns-client-tag: 10.0.0.10/32 5678
+	edns-client-string: 10.0.0.0/24 "abc d"
+	edns-client-string: 10.0.0.10/32 "123AbC!"
 
 stub-zone:
-	name: "tag1234."
+	name: "edns-string-abc."
 	stub-addr: 10.0.0.1
 
 stub-zone:
-	name: "tag5678."
+	name: "edns-string-123."
 	stub-addr: 10.0.0.10
 
 stub-zone:
@@ -17,7 +17,7 @@ stub-zone:
 
 CONFIG_END
 
-SCENARIO_BEGIN Test EDNS client tag option
+SCENARIO_BEGIN Test EDNS string tag option
 
 RANGE_BEGIN 0 1000
 	ADDRESS 10.0.0.1
@@ -26,9 +26,9 @@ MATCH opcode qtype qname
 ADJUST copy_id
 REPLY QR NOERROR
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ANSWER
-tag1234. IN A 10.20.30.40
+edns-string-abc. IN A 10.20.30.40
 SECTION ADDITIONAL
 ENTRY_END
 RANGE_END
@@ -40,9 +40,9 @@ MATCH opcode qtype qname
 ADJUST copy_id
 REPLY QR NOERROR
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ANSWER
-tag5678. IN A 10.20.30.40
+edns-string-123. IN A 10.20.30.40
 SECTION ADDITIONAL
 ENTRY_END
 RANGE_END
@@ -65,19 +65,19 @@ STEP 10 QUERY
 ENTRY_BEGIN
 REPLY RD
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 ENTRY_END
 
 STEP 20 CHECK_OUT_QUERY
 ENTRY_BEGIN
 MATCH qname qtype opcode ednsdata
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ADDITIONAL
 	HEX_EDNSDATA_BEGIN
-		00 10           ; Opcode 16
-		00 02           ; Length 2
-		04 d2           ; 1234
+		fd e9           ; Opcode 65001
+		00 05           ; Length 5
+		61 62 63 20 64  ; "abc d"
 	HEX_EDNSDATA_END
 ENTRY_END
 
@@ -86,28 +86,29 @@ ENTRY_BEGIN
 MATCH all
 REPLY QR RD RA NOERROR
 SECTION QUESTION
-tag1234. IN A
+edns-string-abc. IN A
 SECTION ANSWER
-tag1234. IN A 10.20.30.40
+edns-string-abc. IN A 10.20.30.40
 ENTRY_END
 
 STEP 110 QUERY
 ENTRY_BEGIN
 REPLY RD
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 ENTRY_END
 
 STEP 120 CHECK_OUT_QUERY
 ENTRY_BEGIN
 MATCH qname qtype opcode ednsdata
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ADDITIONAL
 	HEX_EDNSDATA_BEGIN
-		00 10           ; Opcode 16
-		00 02           ; Length 2
-		16 2e           ; 5678
+		fd e9           ; Opcode 65001
+		00 07           ; Length 7
+		31 32 33 41 62  ; "123Ab"
+		43 21		; "C!"
 	HEX_EDNSDATA_END
 ENTRY_END
 
@@ -116,9 +117,9 @@ ENTRY_BEGIN
 MATCH all
 REPLY QR RD RA NOERROR
 SECTION QUESTION
-tag5678. IN A
+edns-string-123. IN A
 SECTION ANSWER
-tag5678. IN A 10.20.30.40
+edns-string-123. IN A 10.20.30.40
 ENTRY_END
 
 STEP 210 QUERY