From 2509592a87a8a6f1d1691e27e3734f92723ee059 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Tue, 5 Nov 2013 14:43:31 +0100
Subject: [PATCH] [ipv6only] nat64 est routeur sur le vlan 6 (anciennement vlan
 gratuit)

---
 Metadata/groups.xml           |  2 ++
 Python/etc/dhcp3/dhcpd.conf   |  5 -----
 Python/etc/network/interfaces | 13 +++++++++++++
 etc/python/ip.py              |  3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 894a66d..f6fa64e 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -144,6 +144,8 @@
   <Group name="nat64"
      profile="true">
     <Group name="crans-vm-wheezy"/>
+    <Group name="vlan-radin"/>
+    <Group name="routeur-nat64"/>
   </Group>
 
   <Group name="cas"
diff --git a/Python/etc/dhcp3/dhcpd.conf b/Python/etc/dhcp3/dhcpd.conf
index cddc0bc..250f53d 100644
--- a/Python/etc/dhcp3/dhcpd.conf
+++ b/Python/etc/dhcp3/dhcpd.conf
@@ -62,13 +62,8 @@ if has("vlan-radin"):
 subnet 10.42.0.0 netmask 255.255.0.0 {
 	interface eth3;
 	option domain-name-servers %s;
-	option routers 10.42.0.10;
 	authoritative;
 	default-lease-time 86400;
-	deny unknown-clients;
-	option root-path "/";
-	next-server 138.231.136.98;
-	filename "pxelinux.0";
 	pool {
             range 10.42.1.1 10.42.255.200;
             failover peer "dhcp-failover";
diff --git a/Python/etc/network/interfaces b/Python/etc/network/interfaces
index b9f2ce4..a278c2c 100644
--- a/Python/etc/network/interfaces
+++ b/Python/etc/network/interfaces
@@ -81,6 +81,8 @@ iface %(interface)s inet static
     netmask 255.255.0.0
     broadcast 10.42.255.255
     mtu 1496""" % { 'interface': interface, 'ip': radinip() }
+        print
+        radin6(interface)
 
     elif mode == "accueil":
         print """auto %(interface)s
@@ -165,6 +167,11 @@ def admip6(If):
      else: alt = ''
      return "2a01:240:fe3d:c804:" + alt + If_Mac[If]
 
+def radinip6(If):
+     if len(If_Mac[If].split(':'))<4: alt = ':'
+     else: alt = ''
+     return "2001:470:c8b9:a4:" + alt + If_Mac[If]
+
 def pub6(interface, mode = 'serveur'):
     """ fonction permettant d'ajouter une adressse ipv6 a l'interface donnee en argument.
     Le mode permet de faire la distinction entre les simples serveurs et les routeurs.
@@ -184,6 +191,12 @@ def adm6(interface):
     netmask 64""" % { 'interface': interface, 'ip6': admip6(interface) }
     print
 
+def radin6(interface):
+    print """iface %(interface)s inet6 static
+    address %(ip6)s
+    netmask 64""" % { 'interface': interface, 'ip6': radinip6(interface) }
+    print
+
 Probe_Mac = metadata.Probes["mac"].split('\n')
 If_Mac = dict(zip(Probe_Mac[:-1:2], Probe_Mac[1::2]))
 
diff --git a/etc/python/ip.py b/etc/python/ip.py
index 22f4124..ab466c4 100644
--- a/etc/python/ip.py
+++ b/etc/python/ip.py
@@ -41,6 +41,9 @@ ip_vlan = {
         'vlan-ens' : '10.2.9.34',
         'vlan-isolement':'10.52.0.34'
     },
+    'nat64' : {
+        'vlan-radin' : '10.42.0.164',
+    },
     'isc' : {
         'vlan-radin' : '10.42.0.160',
         'vlan-accueil' : '10.51.0.160',