Update 6to4 to 1.2: allow using anycast service as defined in RFC 3068.

Code contributed by Keith Moore <moore@cs.utk.edu> in PR 14647.

4 files changed, 22 insertions, 11 deletions

diff --git a/net/6to4/Makefile b/net/6to4/Makefile
index e54ceca9029..675f3b57272 100644
--- a/net/6to4/Makefile
+++ b/net/6to4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:37 agc Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/22 03:00:07 hubertf Exp $
 #
 
-DISTNAME=		6to4-1.1nb1
+DISTNAME=		6to4-1.2
 CATEGORIES=		net
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/net/6to4/files/6to4 b/net/6to4/files/6to4
index 36b3e3f79b0..7ce58d73095 100755
--- a/net/6to4/files/6to4
+++ b/net/6to4/files/6to4
@@ -64,11 +64,18 @@ $prefix = sprintf("2002:%02x%02x:%02x%02x", @l4c[0..3]);
 	
 $localadr6 = sprintf("$prefix:%04x", $v6_net);
 
-chomp($remoteadr4 = `host $peer`);
-$remoteadr4 =~ s/^.*address //;
-
-chomp($remoteadr6 = `host -t AAAA $peer`);
-$remoteadr6 =~ s/^.*address //;
+if ($peer eq "6to4-anycast") {
+    # magic values from rfc 3068
+    $remoteadr4 =  "192.88.99.1";
+    $remoteadr6 =  "2002:c058:6301::";
+} 
+else {
+    chomp($remoteadr4 = `host $peer`);
+    $remoteadr4 =~ s/^.*address //;
+
+    chomp($remoteadr6 = `host -t AAAA $peer`);
+    $remoteadr6 =~ s/^.*address //;
+}
 
 
 if ($verbose) {
diff --git a/net/6to4/files/6to4.8 b/net/6to4/files/6to4.8
index 09d0892061f..2671fb12128 100644
--- a/net/6to4/files/6to4.8
+++ b/net/6to4/files/6to4.8
@@ -1,4 +1,4 @@
-.\"     $NetBSD: 6to4.8,v 1.3 2001/02/19 02:23:48 hubertf Exp $
+.\"     $NetBSD: 6to4.8,v 1.4 2001/11/22 03:00:07 hubertf Exp $
 .Dd February 18, 2001
 .Dt 6to4 8
 .Os
@@ -154,8 +154,10 @@ addresses.
 .It Sy peer
 Name of the remote 6to4 server that'll take our
 IPv6-in-IPv4 encapsulated packets and route them on
-via IPv6. Several possible values are given in the
-example config file.
+via IPv6. A special value of 
+.Dq 6to4-anycast
+can be used for the anycast service defined in RFC 3068.
+Other possible values are given in the example config file.
 .El
 .Sh EXAMPLE USAGE
 The
@@ -180,7 +182,8 @@ To shut down properly, put this into
 at
 .Pa http://www.feyrer.de/NetBSD/6to4.html ,
 NetBSD IPv6 Documentation at
-.Pa http://www.netbsd.org/Documentation/network/ipv6/ .
+.Pa http://www.netbsd.org/Documentation/network/ipv6/ ,
+RFC 3068.
 .Sh HISTORY
 The
 .Nm
diff --git a/net/6to4/files/6to4.conf b/net/6to4/files/6to4.conf
index 9d527752d15..3267a5e8ab8 100644
--- a/net/6to4/files/6to4.conf
+++ b/net/6to4/files/6to4.conf
@@ -11,6 +11,7 @@ $hostbits6=":1";		# should be determined via MAC of $in_if
 
 # Possible remote 6to4 routers:
 $peer="6to4.ipv6.fh-regensburg.de"; # Germany, Europe
+#$peer="6to4-anycast"; 		    # RFC 3068 magic value
 #$peer="asterix.ipv6.bt.com";	    # Great Britain, Europe
 #$peer="6to4.kfu.com";		    # USA, West coast
 #$peer="6to4.ipv6.microsoft.com";   # USA, West coast