From 6f45725da9c4dd69cd980a91e2cf4e2b84934214 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sun, 21 Jul 2013 11:10:09 +0200 Subject: [PATCH] =?UTF-8?q?[collisions=5Fipv6.py]=20mise=20en=20forme=20(e?= =?UTF-8?q?sth=C3=A9tisme)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit parce que je trouve qu'on parse mieux la query comme ça --- surveillance/collisions_ipv6.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/surveillance/collisions_ipv6.py b/surveillance/collisions_ipv6.py index 1441ae56..6916bdc5 100755 --- a/surveillance/collisions_ipv6.py +++ b/surveillance/collisions_ipv6.py @@ -5,8 +5,8 @@ import psycopg2 import sys -sys.path.append('/usr/scripts/gestion') -import ipt +sys.path.append('/usr/scripts') +import gestion.ipt as ipt # Connection à la base sql via pgsql pgsql = psycopg2.connect(database='filtrage', user='crans') @@ -15,7 +15,15 @@ pgsql.set_isolation_level(0) curseur = pgsql.cursor() # On regarde s'il y a deux ipv6 identiques avec des mac non identiques -collision_mac_ip_request = "SELECT DISTINCT a.date as date1, a.mac as mac1, a.ip as ip1, b.date as date2, b.mac as mac2, b.ip as ip2 FROM mac_ip as a, mac_ip as b where a.ip=b.ip AND a.mac != b.mac AND a.date >= b.date AND a.date - b.date < interval '3 day' ORDER BY a.date;" +collision_mac_ip_request = """SELECT DISTINCT + a.date as date1, a.mac as mac1, a.ip as ip1, + b.date as date2, b.mac as mac2, b.ip as ip2 +FROM mac_ip as a, mac_ip as b +WHERE a.ip = b.ip AND + a.mac != b.mac AND + a.date >= b.date AND + a.date - b.date < interval '3 day' +ORDER BY a.date;""" curseur.execute(collision_mac_ip_request) collision_mac_ip = curseur.fetchall()