[./gestion/gen_confs/generate.py] Ajout du firewall ipv6

darcs-hash:20100217193931-8fbb1-791db6b8e66ff49e9de1b3f1552f5877e07d2715.gz

gestion/gen_confs/generate.py

@@ -22,6 +22,7 @@ from lock import *
 from affich_tools import anim, cprint, OK
 from time import localtime, strftime, time, sleep
 import config
+import midtools
 from inspect import getargspec
 from syslog import *
 openlog("generate")
@@ -49,6 +50,8 @@ class base_reconfigure:
         }
 
     def __init__(self, to_do=None):
+        self.midt = midtools.Mid()
+
         if not to_do:
             if debug:
                 print 'Lecture des services à redémarrer dans la base LDAP...'
@@ -211,15 +214,26 @@ class komaz(base_reconfigure):
             self.__real_fw = firewall_komaz()
         return self.__real_fw
 
+    # Mimétisme de ma part -- xhub
+    def __fw6(self):
+        if not hasattr(self, '__real_fw6'):
+            from firewall6 import Update
+            self.__real_fw6 = Update()
+        return self.__real_fw6
+
+
     def macip(self, ips):
         cprint(u"Mise a jour correspondance MAC-IP", 'gras')
         self.__fw().mac_ip_maj(ips)
+        self.__fw6().macs([], 6)
 
     def ports(self, ips):
         self.__fw().port_maj(ips)
+        self.__fw6().ports(map(self.midt.from_ipv4, ips), 6)
 
     def blacklist(self):
         self.__fw().blacklist()
+        self.__fw6().blacklist(6)
 
     def classify(self, ips):
         self.__fw().classes_p2p_maj(ips)