From 37f753c2c60e48c6f612b46224e9ff283f6bf3b7 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 6 Apr 2013 14:54:52 +0200
Subject: [PATCH] [generate] On met en prod le nouveau script du firewall sur
 komaz

---
 gestion/gen_confs/generate.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py
index ae338bac..abe5577d 100755
--- a/gestion/gen_confs/generate.py
+++ b/gestion/gen_confs/generate.py
@@ -237,7 +237,7 @@ class daath(base_reconfigure):
 class komaz(base_reconfigure):
     def __fw(self):
         if not hasattr(self, '__real_fw'):
-            from firewall_new import firewall_komaz
+            from firewall4 import firewall_komaz
             self.__real_fw = firewall_komaz()
         return self.__real_fw
 
@@ -255,15 +255,16 @@ class komaz(base_reconfigure):
         self.__fw6().macs([], 6)
 
     def ports(self, ips):
-        self.__fw().port_maj(ips)
+        self.__fw().filtrage_ports_maj(ips)
         #self.__fw6().ports(map(self.midt.from_ipv4, ips), 6)
 
-    def blacklist(self):
-        self.__fw().blacklist()
+    def blacklist(self, ips):
+        self.__fw().blacklist_maj(ips)
         self.__fw6().blacklist(6)
 
     def classify(self, ips):
-        self.__fw().classes_p2p_maj(ips)
+        #self.__fw().classes_p2p_maj(ips)
+        pass
 
 class dyson(base_reconfigure):
     def autostatus(self):