From 08e04ce89eb7d3a779fb164445eae075300f6d21 Mon Sep 17 00:00:00 2001 From: pessoles Date: Mon, 26 Sep 2005 19:03:06 +0200 Subject: [PATCH] On ne verifie que si le log existe darcs-hash:20050926170306-6d78a-69180f2c7b446dcd80a5d6a2e6d955eea2dcc5ea.gz --- surveillance/filtrage_firewall.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/surveillance/filtrage_firewall.py b/surveillance/filtrage_firewall.py index 9a0a6434..e005ad17 100755 --- a/surveillance/filtrage_firewall.py +++ b/surveillance/filtrage_firewall.py @@ -82,8 +82,9 @@ for log in filtre : ip_src = resultat_p2p.group(3) verif = iptools.AddrInNets (actuel["ip_src"],reseau) - if verif : - if resultat_p2p : + + if resultat_p2p : + if verif : date = resultat_p2p.group(1) id_p2p = int(protocole_p2p[resultat_p2p.group(2)]) ip_src = resultat_p2p.group(3) @@ -101,7 +102,8 @@ for log in filtre : # On teste si le log contient des virus ######################################## - elif resultat_virus : + elif resultat_virus : + if verif : date = resultat_virus.group(1) ip_src = resultat_virus.group(3) ip_dest = resultat_virus.group(4) @@ -116,7 +118,8 @@ for log in filtre : curseur.execute(requete) - elif resultat_flood : + elif resultat_flood : + if verif : date = resultat_flood.group(1) ip_src = resultat_flood.group(3) ip_dest = resultat_flood.group(4)