Updated README

5 files changed, 59 insertions, 542 deletions

diff --git a/Makefile b/Makefile
index 3122aad..407170c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,6 @@ clean:
 	$(MAKE) -C $(KPATH) M=$(PWD) clean
 	rm -f libip6t_SNPTV6.so libip6t_DNPTV6.so *.o
 
-README.txt: README.dbk
-	xmlto text README.dbk
-
 README.html: README.dbk
 	xmlto xhtml-nochunks README.dbk
 
diff --git a/README.dbk b/README.dbk
index f07753f..a96bb0d 100644
--- a/README.dbk
+++ b/README.dbk
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY OPTDSTTO "--dst-to">
-<!ENTITY OPTSRCTO "--src-to">
-<!ENTITY VERSION "0.5">
+<!ENTITY VERSION "0.6">
 ]>
 <article>
   <articleinfo>
-    <title>MAP66 (NAT from IPv6 to IPv6, NAT66) for Linux</title>
+    <title>NPTv6 (IPv6-to-IPv6 Network Prefix Translation) for Linux</title>
 
     <author>
       <firstname>Sven-Ola</firstname>
@@ -18,8 +16,17 @@
         <orgname>Freifunk</orgname>
       </affiliation>
     </author>
+    <author>
+      <firstname>Matthias</firstname>
+
+      <surname>Schiffer</surname>
 
-    <pubdate>16-OCT-2010</pubdate>
+      <affiliation>
+        <orgname>Freifunk Lübeck</orgname>
+      </affiliation>
+    </author>
+
+    <pubdate>10-NOV-2011</pubdate>
   </articleinfo>
 
   <para>These files implement a Linux netfilter target that changes the IPv6
@@ -33,10 +40,10 @@
   discussion paper published here:</para>
 
   <para><ulink
-  url="http://tools.ietf.org/html/draft-mrw-behave-nat66-02">http://tools.ietf.org/html/draft-mrw-behave-nat66-02</ulink></para>
+  url="https://tools.ietf.org/html/rfc6296">https://tools.ietf.org/html/rfc6296</ulink></para>
 
   <warning>
-    <para>Using MAP66 rules together with connection tracking rules such as
+    <para>Using NPTv6 rules together with connection tracking rules such as
     <userinput>--ctstate</userinput> is currently untested and may not work or
     may cause dysfunctions.</para>
   </warning>
@@ -44,26 +51,26 @@
   <section id="install">
     <title id="install-title">Installation</title>
 
-    <para>MAP66 implements two pieces of software: a shared library that
+    <para>NPTv6 implements two pieces of software: a shared library that
     extends the ip6tables command and a Linux kernel module. The shared
-    library file adds the '-j MAP66' target to the ip6tables command. To build
-    and install, you need ip6tables installed as well as the necessary
-    headers. The Linux kernel module requires the Linux source file tree and
-    kernel configuration files to compile. On a Debian/(EKU)buntu, the
-    following command prepares the build environment:</para>
+    library file adds the '-j SNPTV6' target (for source address translation)
+    and the '-j DNPTV6' target (for destination address translation) to the
+    ip6tables command. To build and install, you need ip6tables installed as
+    well as the necessary headers. The Linux kernel module requires the Linux
+    source file tree and kernel configuration files to compile. On a Debian/(EKU)buntu,
+    the following command prepares the build environment:</para>
 
     <programlisting>sudo apt-get install build-essential linux-headers iptables-dev</programlisting>
 
     <para>Unpack the source tgz archive below <filename>/usr/src</filename>,
     change to the new sub-directory and issue "make" to build. If this
-    compiles without errors, install the ip6tables extension with the
-    following command:</para>
-
-    <programlisting>sudo make install</programlisting>
+    compiles without errors, install the ip6tabless extension by copying
+    libip6t_SNPTV6.so and libip6t_DNPTV6.so to the iptables module directory,
+    which is probably located under <filename>/lib/xtables</filename> or
+    <filename>/usr/lib/iptables</filename>.</para>
 
     <note>
-      <para>The kernel module (<filename>ip6t_MAP66.ko</filename> for
-      Linux-2.6 or <filename>ip6t_MAP66.o</filename> for Linux-2.4) is not
+      <para>The kernel module (<filename>ip6t_MAP66.ko</filename> is not
       automatically installed nor loaded into the kernel. You can copy the
       kernel module file manually, e.g. with <userinput>sudo cp ip6t_MAP66.ko
       /lib/modules/$(uname -r)/</userinput>.</para>
@@ -86,9 +93,9 @@
     below <filename>/usr/src/</filename>. To register the MAP66 source to DKMS
     and compile/install, issue these commands:</para>
 
-    <programlisting>sudo dkms add -m ip6t_MAP66 -v &VERSION;
-sudo dkms build -m ip6t_MAP66 -v &VERSION;
-sudo dkms install -m ip6t_MAP66 -v &VERSION;</programlisting>
+    <programlisting>sudo dkms add -m ip6t_NPTV6 -v &VERSION;
+sudo dkms build -m ip6t_NPTV6 -v &VERSION;
+sudo dkms install -m ip6t_NPTV6 -v &VERSION;</programlisting>
 
     <para>Read DKMS details here: <ulink
     url="Read DKMS details here: https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging">https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging</ulink></para>
@@ -107,121 +114,12 @@ sudo dkms install -m ip6t_MAP66 -v &VERSION;</programlisting>
       commands correspond to the <quote>Address Mapping Example</quote> given
       in the IETF discussion paper:</para>
 
-      <programlisting>ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j MAP66 &OPTSRCTO; 2001:0DB8:0001::/48
-ip6tables -t mangle -I PREROUTING  -i eth0 -d 2001:0DB8:0001::/48 -j MAP66 &OPTDSTTO; FD01:0203:0405::/48</programlisting>
+      <programlisting>ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j SNPTV6 --to-source 2001:0DB8:0001::/48
+ip6tables -t mangle -I PREROUTING  -i eth0 -d 2001:0DB8:0001::/48 -j DNPTV6 --to-destination FD01:0203:0405::/48</programlisting>
 
       <para>This example is also printed to the screen if you issue
-      <userinput>ip6tables -j MAP66 --help</userinput>. By design, you cannot
-      use an arbitrary prefix length. Only /112, /96 .. /16 are
-      supported.</para>
-
-      <para>For each packet, the Linux kernel module also compares the
-      packet's source address to all IPv6 addresses assigned to the outgoing
-      interface. If a match is found, the packet's source address is not
-      mapped. The same comparison happens on the incoming packet's destination
-      address. The comparison requires some CPU resources, especially if the
-      interface has a large number of assigned IPv6 addresses. If you are sure
-      that the mapping cannot match the IPv6 address of the interface (e.g.
-      the mapping rule defines a mapping prefix that cannot result in the
-      interface address) you can switch off the comparison. Add the
-      <userinput>--nocheck</userinput> parameter to the ip6tables command for
-      this.</para>
-    </section>
-
-    <section id="config-detailed">
-      <title id="config-detailed-title">Detailed Version</title>
-
-      <para>The following explanation details a living example from the
-      wireless mesh network that is mentioned under <xref
-      endterm="motivation-title" linkend="motivation" /> (see below).
-      Throughout the mesh network, a private IP address range is used. The ULA
-      prefix is fdca:ffee:babe::/64. All mesh nodes derive their IPv6
-      interface addresses by correlating the ULA prefix with the EUI48
-      (<quote>MAC address</quote>) of the respective network adapter.</para>
-
-      <para>There is a Debian based virtual machine that should act as one
-      IPv6 Internet gateway for the mesh. You can reach the virtual machine's
-      web service via IPv4 under <ulink
-      url="http://bbb-vpn.freifunk.net">http://bbb-vpn.freifunk.net</ulink>.
-      To experiment with IPv6, a <ulink
-      url="http://www.sixxs.net/">SIXXS</ulink> static tunnel setup has been
-      added and there is also an experimental 6-to-4 configuration. The
-      following <filename>/etc/network/interfaces</filename> file provides the
-      configuration for IPv6:</para>
-
-      <programlisting>auto sixxs
-iface sixxs inet6 v4tunnel
-        address  2001:4dd0:ff00:2ee::2
-        netmask 64
-        local 77.87.48.7
-        endpoint 78.35.24.124
-        ttl 64
-        up ip link set mtu 1280 dev $IFACE
-        up ip route add default via  2001:4dd0:ff00:2ee::1 dev $IFACE
-        up ip addr add 2001:4dd0:fe77::1/48 dev $IFACE
-
-#auto tun6to4
-iface tun6to4 inet6 v4tunnel
-        # ipv6calc --quiet --action conv6to4 77.87.48.7
-        address 2002:4d57:3007::1
-        netmask 16
-        local 77.87.48.7
-        endpoint any
-        ttl 64
-        gateway ::192.88.99.1</programlisting>
-
-      <para>As you can see, the virtual machine has an IPv6 prefix of
-      2001:4dd0:fe77::/48 and is reachable via <ulink
-      url="http://[2001:4dd0:fe77::1]/">http://[2001:4dd0:fe77::1]/</ulink>.
-      For experimental purposes, the 6-to-4 tunnel can be activated by issuing
-      <userinput>ifup tun6to4</userinput>. The netfilter setup of this machine
-      includes the following command sequence to realize mapping from the
-      private fdca:ffee:babe::/64 prefix to the globally valid IPv6
-      addresses:</para>
-
-      <programlisting>ip6tables -t mangle -F POSTROUTING
-ip6tables -t mangle -F PREROUTING
-ip6tables -t mangle -F FORWARD
-
-grep -q ^ip6t_MAP66 /proc/modules &amp;&amp; rmmod ip6t_MAP66
-insmod /usr/src/map66/ip6t_MAP66.ko
-
-ip6tables -t mangle -A POSTROUTING -o sixxs -s fdca:ffee:babe::/64 -j MAP66 &OPTSRCTO; 2001:4dd0:fe77:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i sixxs -d 2001:4dd0:fe77:1::/64 -j MAP66 &OPTDSTTO; fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A POSTROUTING -o tun6to4 -s fdca:ffee:babe::/64 -j MAP66 &OPTSRCTO; 2002:4d57:3007:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i tun6to4 -d 2002:4d57:3007:1::/64 -j MAP66 &OPTDSTTO; fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu</programlisting>
-
-      <para>Because for both IPv6 networks the external prefix length is
-      smaller than the internal prefix length, we can make sure that the
-      mapped addresses cannot match the interface addresses. For example:
-      2001:4dd0:fe77:1::/64 cannot be converted to 2001:4dd0:fe77:0::1/128 in
-      this context. For this reason, we can use the
-      <userinput>--nocheck</userinput> speedup here.</para>
-
-      <para>You may stumble over the MSS-clamping rule. While IPv6 defines,
-      that path MTU detection via ICMPv6 must be supported by any host,
-      sometimes path MTU detection does not work. The SIXXS tunnel uses an MTU
-      of 1280 byte. To get the following command working on my PC, I needed to
-      add the above MSS-clamping rule on the gateway:</para>
-
-      <programlisting>wget --prefer-family=IPv6 -O - http://6to4.nro.net/</programlisting>
-
-      <note>
-        <para>The tun6to4 tunnel interface is disabled normally, because of
-        the implicit 2002::/16 network route configured for that interface.
-        This network route ensures, that traffic between one 2002::/16 to
-        another 2002::/16 travels directly between the IPv4 hosts. Without
-        this network route, any IPv6 traffic will be routed via the 6-to-4
-        gateways which may not work and place a higher load on those 6-to-4
-        gateways.</para>
-
-        <para>However, if you ping the SIXXS IP address from another host that
-        has a 6-to-4 address, you will get the answer packet back via the
-        6-to-4 interface. If the above address mapping is configured, you ping
-        one IPv6 address and get the answer from another IPv6
-        address...</para>
-      </note>
+      <userinput>ip6tables -j SNPTV6 --help</userinput>. By design, you cannot
+      use prefix lengths longer than 64.</para>
     </section>
   </section>
 
diff --git a/README.html b/README.html
index ebdef69..2d2e8a2 100644
--- a/README.html
+++ b/README.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>MAP66 (NAT from IPv6 to IPv6, NAT66) for Linux</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2" /></head><body><div class="article" title="MAP66 (NAT from IPv6 to IPv6, NAT66) for Linux"><div class="titlepage"><div><div><h2 class="title"><a id="id2593518"></a>MAP66 (NAT from IPv6 to IPv6, NAT66) for Linux</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Sven-Ola</span> <span class="surname">Tuecke</span></h3><div class="affiliation"><span class="orgname">Freifunk<br /></span></div></div></div><div><p class="pubdate">16-OCT-2010</p></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#install">Installation</a></span></dt><dt><span class="section"><a href="#dkms">DKMS Integration</a></span></dt><dt><span class="section"><a href="#config">Configuration</a></span></dt><dd><dl><dt><span class="section"><a href="#config-brief">Brief Version</a></span></dt><dt><span class="section"><a href="#config-detailed">Detailed Version</a></span></dt></dl></dd><dt><span class="section"><a href="#precedence">IPv6/IPv4 Precedence</a></span></dt><dd><dl><dt><span class="section"><a href="#precedence-gai">Change gai.conf</a></span></dt><dt><span class="section"><a href="#precedence-addrs">Use Changed Internal Address</a></span></dt></dl></dd><dt><span class="section"><a href="#motivation">Motivation</a></span></dt></dl></div><p>These files implement a Linux netfilter target that changes the IPv6
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>NPTv6 (IPv6-to-IPv6 Network Prefix Translation) for Linux</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1" /></head><body><div class="article" title="NPTv6 (IPv6-to-IPv6 Network Prefix Translation) for Linux"><div class="titlepage"><div><div><h2 class="title"><a id="id315566"></a>NPTv6 (IPv6-to-IPv6 Network Prefix Translation) for Linux</h2></div><div><div class="author"><h3 class="author"><span class="firstname">Sven-Ola</span> <span class="surname">Tuecke</span></h3><div class="affiliation"><span class="orgname">Freifunk<br /></span></div></div></div><div><div class="author"><h3 class="author"><span class="firstname">Matthias</span> <span class="surname">Schiffer</span></h3><div class="affiliation"><span class="orgname">Freifunk Lübeck<br /></span></div></div></div><div><p class="pubdate">10-NOV-2011</p></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl><dt><span class="section"><a href="#install">Installation</a></span></dt><dt><span class="section"><a href="#dkms">DKMS Integration</a></span></dt><dt><span class="section"><a href="#config">Configuration</a></span></dt><dd><dl><dt><span class="section"><a href="#config-brief">Brief Version</a></span></dt></dl></dd><dt><span class="section"><a href="#precedence">IPv6/IPv4 Precedence</a></span></dt><dd><dl><dt><span class="section"><a href="#precedence-gai">Change gai.conf</a></span></dt><dt><span class="section"><a href="#precedence-addrs">Use Changed Internal Address</a></span></dt></dl></dd><dt><span class="section"><a href="#motivation">Motivation</a></span></dt></dl></div><p>These files implement a Linux netfilter target that changes the IPv6
   address of packets. The address change is done checksum neutral, thus no
   checksum re-calculation for the packet is necessary. You can change the IPv6
   source address of outgoing packets as well as the IPv6 destination address
@@ -8,19 +8,21 @@
   to a second, externally used IPv6 address range. IPv6 address mapping is not
   very similar to IPv4 network address translation, but one can describe it as
   some sort of stateless NAT. The implementation is based on the expired IETF
-  discussion paper published here:</p><p><a class="ulink" href="http://tools.ietf.org/html/draft-mrw-behave-nat66-02" target="_top">http://tools.ietf.org/html/draft-mrw-behave-nat66-02</a></p><div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>Using MAP66 rules together with connection tracking rules such as
+  discussion paper published here:</p><p><a class="ulink" href="https://tools.ietf.org/html/rfc6296" target="_top">https://tools.ietf.org/html/rfc6296</a></p><div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Warning</h3><p>Using NPTv6 rules together with connection tracking rules such as
     <strong class="userinput"><code>--ctstate</code></strong> is currently untested and may not work or
-    may cause dysfunctions.</p></div><div class="section" title="Installation"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="install"></a>Installation</h2></div></div></div><p>MAP66 implements two pieces of software: a shared library that
+    may cause dysfunctions.</p></div><div class="section" title="Installation"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="install"></a>Installation</h2></div></div></div><p>NPTv6 implements two pieces of software: a shared library that
     extends the ip6tables command and a Linux kernel module. The shared
-    library file adds the '-j MAP66' target to the ip6tables command. To build
-    and install, you need ip6tables installed as well as the necessary
-    headers. The Linux kernel module requires the Linux source file tree and
-    kernel configuration files to compile. On a Debian/(EKU)buntu, the
-    following command prepares the build environment:</p><pre class="programlisting">sudo apt-get install build-essential linux-headers iptables-dev</pre><p>Unpack the source tgz archive below <code class="filename">/usr/src</code>,
+    library file adds the '-j SNPTV6' target (for source address translation)
+    and the '-j DNPTV6' target (for destination address translation) to the
+    ip6tables command. To build and install, you need ip6tables installed as
+    well as the necessary headers. The Linux kernel module requires the Linux
+    source file tree and kernel configuration files to compile. On a Debian/(EKU)buntu,
+    the following command prepares the build environment:</p><pre class="programlisting">sudo apt-get install build-essential linux-headers iptables-dev</pre><p>Unpack the source tgz archive below <code class="filename">/usr/src</code>,
     change to the new sub-directory and issue "make" to build. If this
-    compiles without errors, install the ip6tables extension with the
-    following command:</p><pre class="programlisting">sudo make install</pre><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The kernel module (<code class="filename">ip6t_MAP66.ko</code> for
-      Linux-2.6 or <code class="filename">ip6t_MAP66.o</code> for Linux-2.4) is not
+    compiles without errors, install the ip6tabless extension by copying
+    libip6t_SNPTV6.so and libip6t_DNPTV6.so to the iptables module directory,
+    which is probably located under <code class="filename">/lib/xtables</code> or
+    <code class="filename">/usr/lib/iptables</code>.</p><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The kernel module (<code class="filename">ip6t_MAP66.ko</code> is not
       automatically installed nor loaded into the kernel. You can copy the
       kernel module file manually, e.g. with <strong class="userinput"><code>sudo cp ip6t_MAP66.ko
       /lib/modules/$(uname -r)/</code></strong>.</p></div></div><div class="section" title="DKMS Integration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="dkms"></a>DKMS Integration</h2></div></div></div><p>If the next system update needs to install a new kernel version, you
@@ -30,94 +32,17 @@
     file is included with the MAP66 source file package. Install DKMS with the
     following command:</p><pre class="programlisting">sudo apt-get install dkms</pre><p>If not already in place, move/unpack the MAP66 source file archive
     below <code class="filename">/usr/src/</code>. To register the MAP66 source to DKMS
-    and compile/install, issue these commands:</p><pre class="programlisting">sudo dkms add -m ip6t_MAP66 -v 0.5
-sudo dkms build -m ip6t_MAP66 -v 0.5
-sudo dkms install -m ip6t_MAP66 -v 0.5</pre><p>Read DKMS details here: <a class="ulink" href="Read DKMS details here: https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging" target="_top">https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging</a></p></div><div class="section" title="Configuration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="config"></a>Configuration</h2></div></div></div><div class="section" title="Brief Version"><div class="titlepage"><div><div><h3 class="title"><a id="config-brief"></a>Brief Version</h3></div></div></div><p>You always need to add two ip6tables-rules to your netfilter
+    and compile/install, issue these commands:</p><pre class="programlisting">sudo dkms add -m ip6t_NPTV6 -v 0.6
+sudo dkms build -m ip6t_NPTV6 -v 0.6
+sudo dkms install -m ip6t_NPTV6 -v 0.6</pre><p>Read DKMS details here: <a class="ulink" href="Read DKMS details here: https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging" target="_top">https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging</a></p></div><div class="section" title="Configuration"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="config"></a>Configuration</h2></div></div></div><div class="section" title="Brief Version"><div class="titlepage"><div><div><h3 class="title"><a id="config-brief"></a>Brief Version</h3></div></div></div><p>You always need to add two ip6tables-rules to your netfilter
       configuration. One rule matches outgoing packets and changes their IPv6
       source address. The second rule matches incoming packets and reverts the
       address change by altering their IPv6 destination address. To following
       commands correspond to the <span class="quote">“<span class="quote">Address Mapping Example</span>”</span> given
-      in the IETF discussion paper:</p><pre class="programlisting">ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j MAP66 --src-to 2001:0DB8:0001::/48
-ip6tables -t mangle -I PREROUTING  -i eth0 -d 2001:0DB8:0001::/48 -j MAP66 --dst-to FD01:0203:0405::/48</pre><p>This example is also printed to the screen if you issue
-      <strong class="userinput"><code>ip6tables -j MAP66 --help</code></strong>. By design, you cannot
-      use an arbitrary prefix length. Only /112, /96 .. /16 are
-      supported.</p><p>For each packet, the Linux kernel module also compares the
-      packet's source address to all IPv6 addresses assigned to the outgoing
-      interface. If a match is found, the packet's source address is not
-      mapped. The same comparison happens on the incoming packet's destination
-      address. The comparison requires some CPU resources, especially if the
-      interface has a large number of assigned IPv6 addresses. If you are sure
-      that the mapping cannot match the IPv6 address of the interface (e.g.
-      the mapping rule defines a mapping prefix that cannot result in the
-      interface address) you can switch off the comparison. Add the
-      <strong class="userinput"><code>--nocheck</code></strong> parameter to the ip6tables command for
-      this.</p></div><div class="section" title="Detailed Version"><div class="titlepage"><div><div><h3 class="title"><a id="config-detailed"></a>Detailed Version</h3></div></div></div><p>The following explanation details a living example from the
-      wireless mesh network that is mentioned under <a class="xref" href="#motivation" title="Motivation">Motivation</a> (see below).
-      Throughout the mesh network, a private IP address range is used. The ULA
-      prefix is fdca:ffee:babe::/64. All mesh nodes derive their IPv6
-      interface addresses by correlating the ULA prefix with the EUI48
-      (<span class="quote">“<span class="quote">MAC address</span>”</span>) of the respective network adapter.</p><p>There is a Debian based virtual machine that should act as one
-      IPv6 Internet gateway for the mesh. You can reach the virtual machine's
-      web service via IPv4 under <a class="ulink" href="http://bbb-vpn.freifunk.net" target="_top">http://bbb-vpn.freifunk.net</a>.
-      To experiment with IPv6, a <a class="ulink" href="http://www.sixxs.net/" target="_top">SIXXS</a> static tunnel setup has been
-      added and there is also an experimental 6-to-4 configuration. The
-      following <code class="filename">/etc/network/interfaces</code> file provides the
-      configuration for IPv6:</p><pre class="programlisting">auto sixxs
-iface sixxs inet6 v4tunnel
-        address  2001:4dd0:ff00:2ee::2
-        netmask 64
-        local 77.87.48.7
-        endpoint 78.35.24.124
-        ttl 64
-        up ip link set mtu 1280 dev $IFACE
-        up ip route add default via  2001:4dd0:ff00:2ee::1 dev $IFACE
-        up ip addr add 2001:4dd0:fe77::1/48 dev $IFACE
-
-#auto tun6to4
-iface tun6to4 inet6 v4tunnel
-        # ipv6calc --quiet --action conv6to4 77.87.48.7
-        address 2002:4d57:3007::1
-        netmask 16
-        local 77.87.48.7
-        endpoint any
-        ttl 64
-        gateway ::192.88.99.1</pre><p>As you can see, the virtual machine has an IPv6 prefix of
-      2001:4dd0:fe77::/48 and is reachable via <a class="ulink" href="http://[2001:4dd0:fe77::1]/" target="_top">http://[2001:4dd0:fe77::1]/</a>.
-      For experimental purposes, the 6-to-4 tunnel can be activated by issuing
-      <strong class="userinput"><code>ifup tun6to4</code></strong>. The netfilter setup of this machine
-      includes the following command sequence to realize mapping from the
-      private fdca:ffee:babe::/64 prefix to the globally valid IPv6
-      addresses:</p><pre class="programlisting">ip6tables -t mangle -F POSTROUTING
-ip6tables -t mangle -F PREROUTING
-ip6tables -t mangle -F FORWARD
-
-grep -q ^ip6t_MAP66 /proc/modules &amp;&amp; rmmod ip6t_MAP66
-insmod /usr/src/map66/ip6t_MAP66.ko
-
-ip6tables -t mangle -A POSTROUTING -o sixxs -s fdca:ffee:babe::/64 -j MAP66 --src-to 2001:4dd0:fe77:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i sixxs -d 2001:4dd0:fe77:1::/64 -j MAP66 --dst-to fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A POSTROUTING -o tun6to4 -s fdca:ffee:babe::/64 -j MAP66 --src-to 2002:4d57:3007:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i tun6to4 -d 2002:4d57:3007:1::/64 -j MAP66 --dst-to fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu</pre><p>Because for both IPv6 networks the external prefix length is
-      smaller than the internal prefix length, we can make sure that the
-      mapped addresses cannot match the interface addresses. For example:
-      2001:4dd0:fe77:1::/64 cannot be converted to 2001:4dd0:fe77:0::1/128 in
-      this context. For this reason, we can use the
-      <strong class="userinput"><code>--nocheck</code></strong> speedup here.</p><p>You may stumble over the MSS-clamping rule. While IPv6 defines,
-      that path MTU detection via ICMPv6 must be supported by any host,
-      sometimes path MTU detection does not work. The SIXXS tunnel uses an MTU
-      of 1280 byte. To get the following command working on my PC, I needed to
-      add the above MSS-clamping rule on the gateway:</p><pre class="programlisting">wget --prefer-family=IPv6 -O - http://6to4.nro.net/</pre><div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>The tun6to4 tunnel interface is disabled normally, because of
-        the implicit 2002::/16 network route configured for that interface.
-        This network route ensures, that traffic between one 2002::/16 to
-        another 2002::/16 travels directly between the IPv4 hosts. Without
-        this network route, any IPv6 traffic will be routed via the 6-to-4
-        gateways which may not work and place a higher load on those 6-to-4
-        gateways.</p><p>However, if you ping the SIXXS IP address from another host that
-        has a 6-to-4 address, you will get the answer packet back via the
-        6-to-4 interface. If the above address mapping is configured, you ping
-        one IPv6 address and get the answer from another IPv6
-        address...</p></div></div></div><div class="section" title="IPv6/IPv4 Precedence"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="precedence"></a>IPv6/IPv4 Precedence</h2></div></div></div><p>With (EKU)buntu and eventually with RedHat, you will notice that
+      in the IETF discussion paper:</p><pre class="programlisting">ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j SNPTV6 --to-source 2001:0DB8:0001::/48
+ip6tables -t mangle -I PREROUTING  -i eth0 -d 2001:0DB8:0001::/48 -j DNPTV6 --to-destination FD01:0203:0405::/48</pre><p>This example is also printed to the screen if you issue
+      <strong class="userinput"><code>ip6tables -j SNPTV6 --help</code></strong>. By design, you cannot
+      use prefix lengths longer than 64.</p></div></div><div class="section" title="IPv6/IPv4 Precedence"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="precedence"></a>IPv6/IPv4 Precedence</h2></div></div></div><p>With (EKU)buntu and eventually with RedHat, you will notice that
     your browser does not show the IPv6 version of a web site that is
     multi-homed when using ULA addresses for your IPv6 Internet connection.
     The reason for this is an add on to the RFC 3484 rules that is compiled
@@ -135,7 +60,7 @@ ip6tables -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-
       you cannot uncomment a single entry to overwrite the default. You need
       to uncomment all entries of a particular type for this. The
       <span class="quote">“<span class="quote">label</span>”</span> lines compare source addresses, the
-      <span class="quote">“<span class="quote">precedence</span>”</span> lines compare destination addresses.</p><div class="procedure" title="Procedure 1. Change IPv6 Precedence"><a id="id2624529"></a><p class="title"><b>Procedure 1. Change IPv6 Precedence</b></p><ol class="procedure" type="1"><li class="step" title="Step 1"><p>Open the <code class="filename">/etc/gai.conf</code> file as root user,
+      <span class="quote">“<span class="quote">precedence</span>”</span> lines compare destination addresses.</p><div class="procedure" title="Procedure 1. Change IPv6 Precedence"><a id="id314638"></a><p class="title"><strong>Procedure 1. Change IPv6 Precedence</strong></p><ol class="procedure" type="1"><li class="step" title="Step 1"><p>Open the <code class="filename">/etc/gai.conf</code> file as root user,
           e.g. by executing <strong class="userinput"><code>sudo nano
           /etc/gai.conf</code></strong>.</p></li><li class="step" title="Step 2"><p>Remove the leading hash character from the 8 lines starting
           with <span class="quote">“<span class="quote">#label</span>”</span>.</p></li><li class="step" title="Step 3"><p>Re-add the hash character to the line stating <span class="quote">“<span class="quote">#label
@@ -153,7 +78,7 @@ ip6tables -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-
         6to4 addresses also.</p></div><p>If you already deployed ULA addresses in your network, you may be
       interested in a solution that runs on my Freifunk router. The router
       uses the IPv6 prefix that is reserved for documentation purposes on it's
-      LAN interface. WIthin the OLSR-based mesh network, any interface uses an
+      LAN interface. Within the OLSR-based mesh network, any interface uses an
       fdca:ffee:babe::/64 prefix. The following internal mapping is configured
       for this:</p><pre class="programlisting">ip6tables -t mangle -I PREROUTING -i br0 -s 2001:0DB8::/64 -j MAP66 --src-to fdca:ffee:babe::/64 --csum
 ip6tables -t mangle -I POSTROUTING -o br0 -d fdca:ffee:babe::/64 -j MAP66 --dst-to 2001:0DB8::/64 --csum</pre><p>To prevent the mapped packets to vanish via the default route and
diff --git a/README.txt b/README.txt
deleted file mode 100644
index 6ce23f1..0000000
--- a/README.txt
+++ /dev/null
@@ -1,305 +0,0 @@
-MAP66 (NAT from IPv6 to IPv6, NAT66) for Linux
-
-Sven-Ola Tuecke
-
-Freifunk
-
-16-OCT-2010
-
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-
-Table of Contents
-
-Installation
-DKMS Integration
-Configuration
-
-    Brief Version
-    Detailed Version
-
-IPv6/IPv4 Precedence
-
-    Change gai.conf
-    Use Changed Internal Address
-
-Motivation
-
-These files implement a Linux netfilter target that changes the IPv6 address of
-packets. The address change is done checksum neutral, thus no checksum
-re-calculation for the packet is necessary. You can change the IPv6 source
-address of outgoing packets as well as the IPv6 destination address of incoming
-packets. This allows you to map an internal IPv6 address range to a second,
-externally used IPv6 address range. IPv6 address mapping is not very similar to
-IPv4 network address translation, but one can describe it as some sort of
-stateless NAT. The implementation is based on the expired IETF discussion paper
-published here:
-
-http://tools.ietf.org/html/draft-mrw-behave-nat66-02
-
-Warning
-
-Using MAP66 rules together with connection tracking rules such as --ctstate is
-currently untested and may not work or may cause dysfunctions.
-
-Installation
-
-MAP66 implements two pieces of software: a shared library that extends the
-ip6tables command and a Linux kernel module. The shared library file adds the
-'-j MAP66' target to the ip6tables command. To build and install, you need
-ip6tables installed as well as the necessary headers. The Linux kernel module
-requires the Linux source file tree and kernel configuration files to compile.
-On a Debian/(EKU)buntu, the following command prepares the build environment:
-
-sudo apt-get install build-essential linux-headers iptables-dev
-
-Unpack the source tgz archive below /usr/src, change to the new sub-directory
-and issue "make" to build. If this compiles without errors, install the
-ip6tables extension with the following command:
-
-sudo make install
-
-Note
-
-The kernel module (ip6t_MAP66.ko for Linux-2.6 or ip6t_MAP66.o for Linux-2.4)
-is not automatically installed nor loaded into the kernel. You can copy the
-kernel module file manually, e.g. with sudo cp ip6t_MAP66.ko /lib/modules/$
-(uname -r)/.
-
-DKMS Integration
-
-If the next system update needs to install a new kernel version, you also need
-to re-compile/re-install the MAP66 kernel module. With Debian/(EKU)buntu, this
-can be automated with the Dynamic Kernel Module Support Framework (DKMS). For
-this, the dkms.conf file is included with the MAP66 source file package.
-Install DKMS with the following command:
-
-sudo apt-get install dkms
-
-If not already in place, move/unpack the MAP66 source file archive below /usr/
-src/. To register the MAP66 source to DKMS and compile/install, issue these
-commands:
-
-sudo dkms add -m ip6t_MAP66 -v 0.5
-sudo dkms build -m ip6t_MAP66 -v 0.5
-sudo dkms install -m ip6t_MAP66 -v 0.5
-
-Read DKMS details here: https://wiki.kubuntu.org/Kernel/Dev/DKMSPackaging
-
-Configuration
-
-Brief Version
-
-You always need to add two ip6tables-rules to your netfilter configuration. One
-rule matches outgoing packets and changes their IPv6 source address. The second
-rule matches incoming packets and reverts the address change by altering their
-IPv6 destination address. To following commands correspond to the “Address
-Mapping Example” given in the IETF discussion paper:
-
-ip6tables -t mangle -I POSTROUTING -o eth0 -s FD01:0203:0405::/48 -j MAP66 --src-to 2001:0DB8:0001::/48
-ip6tables -t mangle -I PREROUTING  -i eth0 -d 2001:0DB8:0001::/48 -j MAP66 --dst-to FD01:0203:0405::/48
-
-This example is also printed to the screen if you issue ip6tables -j MAP66
---help. By design, you cannot use an arbitrary prefix length. Only /112, /96 ..
-/16 are supported.
-
-For each packet, the Linux kernel module also compares the packet's source
-address to all IPv6 addresses assigned to the outgoing interface. If a match is
-found, the packet's source address is not mapped. The same comparison happens
-on the incoming packet's destination address. The comparison requires some CPU
-resources, especially if the interface has a large number of assigned IPv6
-addresses. If you are sure that the mapping cannot match the IPv6 address of
-the interface (e.g. the mapping rule defines a mapping prefix that cannot
-result in the interface address) you can switch off the comparison. Add the
---nocheck parameter to the ip6tables command for this.
-
-Detailed Version
-
-The following explanation details a living example from the wireless mesh
-network that is mentioned under Motivation (see below). Throughout the mesh
-network, a private IP address range is used. The ULA prefix is fdca:ffee:babe::
-/64. All mesh nodes derive their IPv6 interface addresses by correlating the
-ULA prefix with the EUI48 (“MAC address”) of the respective network adapter.
-
-There is a Debian based virtual machine that should act as one IPv6 Internet
-gateway for the mesh. You can reach the virtual machine's web service via IPv4
-under http://bbb-vpn.freifunk.net. To experiment with IPv6, a SIXXS static
-tunnel setup has been added and there is also an experimental 6-to-4
-configuration. The following /etc/network/interfaces file provides the
-configuration for IPv6:
-
-auto sixxs
-iface sixxs inet6 v4tunnel
-        address  2001:4dd0:ff00:2ee::2
-        netmask 64
-        local 77.87.48.7
-        endpoint 78.35.24.124
-        ttl 64
-        up ip link set mtu 1280 dev $IFACE
-        up ip route add default via  2001:4dd0:ff00:2ee::1 dev $IFACE
-        up ip addr add 2001:4dd0:fe77::1/48 dev $IFACE
-
-#auto tun6to4
-iface tun6to4 inet6 v4tunnel
-        # ipv6calc --quiet --action conv6to4 77.87.48.7
-        address 2002:4d57:3007::1
-        netmask 16
-        local 77.87.48.7
-        endpoint any
-        ttl 64
-        gateway ::192.88.99.1
-
-As you can see, the virtual machine has an IPv6 prefix of 2001:4dd0:fe77::/48
-and is reachable via http://[2001:4dd0:fe77::1]/. For experimental purposes,
-the 6-to-4 tunnel can be activated by issuing ifup tun6to4. The netfilter setup
-of this machine includes the following command sequence to realize mapping from
-the private fdca:ffee:babe::/64 prefix to the globally valid IPv6 addresses:
-
-ip6tables -t mangle -F POSTROUTING
-ip6tables -t mangle -F PREROUTING
-ip6tables -t mangle -F FORWARD
-
-grep -q ^ip6t_MAP66 /proc/modules && rmmod ip6t_MAP66
-insmod /usr/src/map66/ip6t_MAP66.ko
-
-ip6tables -t mangle -A POSTROUTING -o sixxs -s fdca:ffee:babe::/64 -j MAP66 --src-to 2001:4dd0:fe77:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i sixxs -d 2001:4dd0:fe77:1::/64 -j MAP66 --dst-to fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A POSTROUTING -o tun6to4 -s fdca:ffee:babe::/64 -j MAP66 --src-to 2002:4d57:3007:1::/64 --nocheck
-ip6tables -t mangle -A PREROUTING  -i tun6to4 -d 2002:4d57:3007:1::/64 -j MAP66 --dst-to fdca:ffee:babe::/64 --nocheck
-ip6tables -t mangle -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
-
-Because for both IPv6 networks the external prefix length is smaller than the
-internal prefix length, we can make sure that the mapped addresses cannot match
-the interface addresses. For example: 2001:4dd0:fe77:1::/64 cannot be converted
-to 2001:4dd0:fe77:0::1/128 in this context. For this reason, we can use the
---nocheck speedup here.
-
-You may stumble over the MSS-clamping rule. While IPv6 defines, that path MTU
-detection via ICMPv6 must be supported by any host, sometimes path MTU
-detection does not work. The SIXXS tunnel uses an MTU of 1280 byte. To get the
-following command working on my PC, I needed to add the above MSS-clamping rule
-on the gateway:
-
-wget --prefer-family=IPv6 -O - http://6to4.nro.net/
-
-Note
-
-The tun6to4 tunnel interface is disabled normally, because of the implicit
-2002::/16 network route configured for that interface. This network route
-ensures, that traffic between one 2002::/16 to another 2002::/16 travels
-directly between the IPv4 hosts. Without this network route, any IPv6 traffic
-will be routed via the 6-to-4 gateways which may not work and place a higher
-load on those 6-to-4 gateways.
-
-However, if you ping the SIXXS IP address from another host that has a 6-to-4
-address, you will get the answer packet back via the 6-to-4 interface. If the
-above address mapping is configured, you ping one IPv6 address and get the
-answer from another IPv6 address...
-
-IPv6/IPv4 Precedence
-
-With (EKU)buntu and eventually with RedHat, you will notice that your browser
-does not show the IPv6 version of a web site that is multi-homed when using ULA
-addresses for your IPv6 Internet connection. The reason for this is an add on
-to the RFC 3484 rules that is compiled into the (EKU)buntu libc. The
-pre-installed /etc/gai.conf file will give you a hint on this.
-
-In short: the getaddrinfo() library function rates a private IPv4 address
-higher than the ULA IPv6 address when choosing the transport protocol for a new
-Internet connection if this add on to the RFC 3484 rules is compiled in. For
-this reason, you may want to change the precedence rules within /etc/gai.conf
-(see Change gai.conf) or use another prefix (see Use Changed Internal Address).
-
-Change gai.conf
-
-The getaddrinfo() library function manages lists of label, precedence, and
-scope4 type entries. If the /etc/gai.conf file does not provide a single entry
-for a particular type, the compiled-in list is used. For this reason, you
-cannot uncomment a single entry to overwrite the default. You need to uncomment
-all entries of a particular type for this. The “label” lines compare source
-addresses, the “precedence” lines compare destination addresses.
-
-Procedure 1. Change IPv6 Precedence
-
- 1. Open the /etc/gai.conf file as root user, e.g. by executing sudo nano /etc/
-    gai.conf.
-
- 2. Remove the leading hash character from the 8 lines starting with “#label”.
-
- 3. Re-add the hash character to the line stating “#label fc00::/7 6”.
-
- 4. Save the file.
-
- 5. Restart your browser and re-try to browse to a multi-homed web site.
-
-The above procedure removes the difference between standard IPv6 source
-addresses and ULA type private IPv6 source addresses. Anything else is
-unchanged.
-
-Use Changed Internal Address
-
-As an alternative solution, you may use an arbitrary address prefix in your LAN
-that is not mentioned in the gai.conf file nor compiled in. This will work but
-introduces a double mapping: one map (Inet-ULA) on the Internet gateway router
-and a second map (ULA-Intern) on the internal router.
-
-Note
-
-While the well known IPv4 addresses 10.0.0.0/8, 172.16.0.0/12, and 192.168.0.0/
-16 still exist, it is unlikely that their 6to4 counterparts 2002:0a00::/24,
-2002:ac10::/28, and 2002:c0a8::/32 will be routed on the Internet. Sadly, the
-(EKU)buntu defaults penalize 6to4 addresses also.
-
-If you already deployed ULA addresses in your network, you may be interested in
-a solution that runs on my Freifunk router. The router uses the IPv6 prefix
-that is reserved for documentation purposes on it's LAN interface. WIthin the
-OLSR-based mesh network, any interface uses an fdca:ffee:babe::/64 prefix. The
-following internal mapping is configured for this:
-
-ip6tables -t mangle -I PREROUTING -i br0 -s 2001:0DB8::/64 -j MAP66 --src-to fdca:ffee:babe::/64 --csum
-ip6tables -t mangle -I POSTROUTING -o br0 -d fdca:ffee:babe::/64 -j MAP66 --dst-to 2001:0DB8::/64 --csum
-
-To prevent the mapped packets to vanish via the default route and to overcome
-mac address lookups during the routing process, I also added these prefixes to
-the router's /etc/radvd.conf as well as (host) routes pointing to the “br0”
-interface for both prefixes.
-
-Motivation
-
-My Internet access at home is realized by a wireless community mesh network not
-owned by me. The mesh is operated with small embedded devices (nodes aka. WLAN
-routers) that are interconnected via radio links (WLAN IBSS / AdHoc). Routing
-is done with a specialized protocol such as Batman or OLSR. The routing
-protocol selects the nearest out of a dozen Internet gateways and configures a
-default route or an IPIP tunnel accordingly. Each Internet gateway is connected
-to a different ISP and provides the service with the help of IPv4 network
-address translation (NAT). Using NAT has the following effects:
-
-  ● Address amplification - something not necessary with IPv6 any more
-
-  ● Anonymization - nice to have as an option but not mission critical
-
-  ● ISP independence - no reverse routing, no "buy-a-number-range"
-
-The last point is mission critical. One can obtain a provider independent IPv6
-address range, but you need the cooperation of an ISP to use that address range
-for Internet connectivity. If you e.g. move to another ISP you need your
-address range to be re-routed to your new location.
-
-ISP independence is also possible with some tunneling technique, such as VPN or
-mobile IP. Tunneling can be implemented on client PCs and Internet gateways/
-servers one day. But there is no need to implement the same tunneling technique
-on every mesh node. Why? Because the mesh nodes can use private IP addresses
-(or "ULA") to transport the tunnel data between the client PC and the gateway/
-server. Each tunneling technique typically needs a single instance (the
-"server") which forms a single point of failure. Rule-of-thumb1: avoid a SPOF
-for the infrastructure. Rule-of-thumb2: KISS (keep it simple stupid).
-
-Using private IP addresses on the mesh nodes has a drawback: mesh node software
-updates e.g. a download via HTTP from an Internet server is not possible. This
-is where I start to think: “hey, some kind of address mapping may be nice to
-have”. While opening Pandora's NAT66 box, I discovered that IPv6 nerds do not
-like the acronym. It is always a good tactic in info wars to rename, hence the
-name "MAP66".
-
-// Sven-Ola
-
diff --git a/dkms.conf b/dkms.conf
index 8299ec1..7f5a74b 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,7 +1,9 @@
-PACKAGE_NAME="ip6t_MAP66"
+PACKAGE_NAME="ip6t_NPTV6"
 PACKAGE_VERSION="0.6"
 CLEAN="make clean"
 MAKE[0]="make all KVERSION=$kernelver"
-BUILT_MODULE_NAME[0]="ip6t_MAP66"
+BUILT_MODULE_NAME[0]="ip6t_SNPTV6"
+BUILT_MODULE_NAME[1]="ip6t_DNPTV6"
 DEST_MODULE_LOCATION[0]="/updates"
+DEST_MODULE_LOCATION[1]="/updates"
 AUTOINSTALL="yes"