manpage fixup, no more 6to4 mapping.

git-svn-id: file:///svn/unbound/trunk@876 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 290eb49785a8daab651a1bf32492e14a8bc798a3..525dc8142a7af39b0fe8c110f4a551365c1b071c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
        - support for IP_RECVDSTADDR (for *BSD ip4).
        - fix for BSD, do not use ip4to6 mapping, make two sockets, once
          ip6 and once ip4, uses socket options.
+       - goodbye ip4to6 mapping.
 
 17 January 2008: Wouter
        - fixup configure in case -lldns is installed.

diff --git a/doc/example.conf b/doc/example.conf
index 7bf43f9e5a55a66b5d6ca6c4cc53ef25de5d93c3..473169f983e5dfcf5f07784f827778ba2d79ed6f 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -27,9 +27,8 @@ server:
        # interface: 192.0.2.154
        # interface: 2001:DB8::5
        
-       # enable this feature to detect all available interfaces automatically
-       # May not be supported on all platforms. experimental. Do not forget 
-       # to enable access-control for your ip4, ip6 and ip6mappedip4 addrs. 
+       # enable this feature to copy the source address of queries to reply.
+       # Socket options not be supported on all platforms. experimental. 
        # interface-automatic: no
 
        # port to answer queries from

diff --git a/doc/unbound.conf.5 b/doc/unbound.conf.5
index 98c8c25ec2c532f4f3642c9b0e2eb076d6376628..8a592f7f352cec99b66e9e06fa47c413c50ff1ef 100644 (file)
--- a/doc/unbound.conf.5
+++ b/doc/unbound.conf.5
@@ -97,14 +97,10 @@ given the default is to listen to localhost.
 The interfaces are not changed on a reload (kill \-HUP) but only on restart.
 .TP
 .B interface-automatic: \fI<yes or no>
-Detect all interfaces and use them. This feature is experimental, and needs
-support in your OS for IPv6 (and its socket options). You have to set access
-control for IPv4, IPv6 addresses and also for mapped IPv4 to IPv6 addresses
-(i.e. ::ffff:192.168.0.0/112 and so on). IPv4 TCP connections use the IPv4
-access control, IPv4 UDP queries use the mapped access control.
-On FreeBSD sysconfig is associated with this, net.inet6.ip6.v6only in 
-/etc/sysctl.conf, it should work with this set or unset. OpenBSD may not 
-support it at all.  Default value is no.
+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.
 .TP
 .B outgoing\-interface: \fI<ip address>
 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 6eb8eb8d6cb26d6d8417691d0f6ffd372578bb87..5efc89be53cb67377b6044205ae60b537a6f8c4a 100644 (file)
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -310,10 +310,9 @@ ports_create_if(const char* ifname, int do_auto, int do_udp, int do_tcp,
        if(!do_udp && !do_tcp)
                return 0;
        if(do_auto) {
-               /* skip ip4 sockets, ip4 udp gets mapped to v6 */
-               /* TODO no mapping! */
                if((s = make_sock(SOCK_DGRAM, ifname, port, hints, 1)) == -1)
                        return 0;
+               /* getting source addr packet info is highly non-portable */
                if(!set_recvpktinfo(s, hints->ai_family))
                        return 0;
                if(!port_insert(list, s, listen_type_udpancil)) {