Attachment #230289 for bug #260553

View | Details | Raw Unified | Return to bug 260553
Collapse All | Expand All




 	iter_env->supports_ipv6 = cfg->do_ip6;
 	iter_env->supports_ipv4 = cfg->do_ip4;
+	iter_env->aaaa_filter = cfg->aaaa_filter;
	iter_env->outbound_msg_retry = cfg->outbound_msg_retry;
 	return 1;
 }
 
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 23b07ea9..ca29b48c 100644
--- a/iterator/iterator.c

 %token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE
 %token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE
 %token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE
@@ -244,6 +244,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_dlv_anchor_file | server_dlv_anchor | server_neg_cache_size |
 	server_harden_referral_path | server_private_address |
 	server_private_domain | server_extended_statistics |
+	server_aaaa_filter |
 	server_local_data_ptr | server_jostle_timeout |
 	server_unwanted_reply_threshold | server_log_time_ascii |

@@ -1742,6 +1744,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG
 			yyerror("out of memory");
 	}
 	;

Return to bug 260553

Lines 109-117 index 7bc67da6..e10f547a 100644 Link Here

(-)contrib/aaaa-filter-iterator.patch (-7 / +7 lines)
109	iter_env->supports_ipv6 = cfg->do_ip6;	109	iter_env->supports_ipv6 = cfg->do_ip6;
110	iter_env->supports_ipv4 = cfg->do_ip4;	110	iter_env->supports_ipv4 = cfg->do_ip4;
111	+ iter_env->aaaa_filter = cfg->aaaa_filter;	111	+ iter_env->aaaa_filter = cfg->aaaa_filter;
		112	iter_env->outbound_msg_retry = cfg->outbound_msg_retry;
112	return 1;	113	return 1;
113	}	114	}
114
115	diff --git a/iterator/iterator.c b/iterator/iterator.c	115	diff --git a/iterator/iterator.c b/iterator/iterator.c
116	index 23b07ea9..ca29b48c 100644	116	index 23b07ea9..ca29b48c 100644
117	--- a/iterator/iterator.c	117	--- a/iterator/iterator.c
Lines 387-401 index 1d0e8658..f284dd43 100644 Link Here
387	%token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE	387	%token VAR_PRIVATE_DOMAIN VAR_REMOTE_CONTROL VAR_CONTROL_ENABLE
388	%token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE	388	%token VAR_CONTROL_INTERFACE VAR_CONTROL_PORT VAR_SERVER_KEY_FILE
389	%token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE	389	%token VAR_SERVER_CERT_FILE VAR_CONTROL_KEY_FILE VAR_CONTROL_CERT_FILE
390	@@ -233,6 +234,7 @@ content_server: server_num_threads \| server_verbosity \| server_port \|	390	@@ -244,6 +244,7 @@ content_server: server_num_threads \| server_verbosity \| server_port \|
391	server_dlv_anchor_file \| server_dlv_anchor \| server_neg_cache_size \|	391	server_dlv_anchor_file \| server_dlv_anchor \| server_neg_cache_size \|
392	server_harden_referral_path \| server_private_address \|	392	server_harden_referral_path \| server_private_address \|
393	server_private_domain \| server_extended_statistics \|	393	server_private_domain \| server_extended_statistics \|
394	+ server_aaaa_filter \|	394	+ server_aaaa_filter \|
395	server_local_data_ptr \| server_jostle_timeout \|	395	server_local_data_ptr \| server_jostle_timeout \|
396	server_unwanted_reply_threshold \| server_log_time_ascii \|	396	server_unwanted_reply_threshold \| server_log_time_ascii \|
397	server_domain_insecure \| server_val_sig_skew_min \|	397
398	@@ -1563,6 +1565,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG	398	@@ -1742,6 +1744,15 @@ server_caps_whitelist: VAR_CAPS_WHITELIST STRING_ARG
399	yyerror("out of memory");	399	yyerror("out of memory");
400	}	400	}
401	;	401	;