From c5fe4a8bf3b6ceaa0360460c7c84c869fb7ff4b4 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Wed, 20 Oct 2010 05:36:00 +0000 Subject: [PATCH] Enable interface-automatic for people for whom it works. git-svn-id: file:///svn/unbound/trunk@2300 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ doc/unbound.conf.5.in | 5 ++--- services/listen_dnsport.c | 4 ---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 0c88f076f..09c8bd0c4 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +20 October 2010: Wouter + - interface automatic works for some people with ip6 disabled. + Therefore the error check is removed, so they can use the option. + 19 October 2010: Wouter - Fix for request list growth, if a server has long timeout but the lost counter is low, then its effective rtt is the one without diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 671ce3dac..7f8c10186 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -124,9 +124,8 @@ interface and port number), if not specified the default port (from .TP .B interface\-automatic: \fI Detect source interface on UDP queries and copy them to replies. This -feature is experimental, and needs support in your OS for IPv6 -(and its socket options) and IPv4 (and have source\-interface socket options). -Default value is no. +feature is experimental, and needs support in your OS for particular socket +options. Default value is no. .TP .B outgoing\-interface: \fI Interface to use to connect to the network. This interface is used to send diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 49cbeed98..e8cb70d84 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -744,10 +744,6 @@ listening_ports_open(struct config_file* cfg) if(!do_ip4 && !do_ip6) { return NULL; } - if(do_auto && (!do_ip4 || !do_ip6)) { - log_warn("interface_automatic option does not work when either do-ip4 or do-ip6 is not enabled. Disabling option."); - do_auto = 0; - } /* create ip4 and ip6 ports so that return addresses are nice. */ if(do_auto || cfg->num_ifs == 0) { if(do_ip6) { -- 2.47.2