crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

surveillance/exemptions: dst ipv6<=>src ipv6

Browse source 
Le remplissage de la table pg des exemptions se faisait toujours avec la source
ipv4 même si la plage à exempter était v6.
This commit is contained in:
Daniel STAN 2013-08-21 17:06:50 +02:00
parent 1d15c0329d
commit 608d960ded
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gestion/gen_confs/surveillance.py
View file

@ -15,6 +15,7 @@ sys.path.append('/usr/scripts/gestion')
from ldap_crans import crans_ldap, Club, Adherent, AssociationCrans from ldap_crans import crans_ldap, Club, Adherent, AssociationCrans
from gen_confs import gen_config from gen_confs import gen_config
import psycopg2 import psycopg2
import netaddr
db = crans_ldap() db = crans_ldap()
@ -44,7 +45,11 @@ class exemptions(gen_config) :
for machine in machines : for machine in machines :
for destination in machine.exempt() : for destination in machine.exempt() :
requete="INSERT INTO exemptes (ip_crans,ip_dest) VALUES ('%s','%s')" % (machine.ip(),destination) if netaddr.IPNetwork(destination).version == 4:
source = machine.ip()
else:
source = machine.ipv6()
requete="INSERT INTO exemptes (ip_crans,ip_dest) VALUES ('%s','%s')" % (source, destination)
curseur.execute(requete) curseur.execute(requete)
pgsql.commit() pgsql.commit()