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

a passe pas avec la modif donc marche arrire

Browse source 
darcs-hash:20060427214713-72cb0-813ad47369f28b4bdf94b87925bed0c8ffbb7656.gz
This commit is contained in:
salles 2006-04-27 23:47:13 +02:00
parent 2b8f5d6827
commit f31f3bbfe7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gestion/gen_confs/firewall.py
View file

@ -498,12 +498,12 @@ class firewall_komaz(firewall_crans) :
# Proxy transparent
iptables("-t mangle -A PREROUTING -s %s -j RETURN" % self.zone_serveur)
iptables("-t mangle -A PREROUTING -p tcp --destination-port 80 " +
"-s %s -d \! %s -j MARK " % (NETs['fil'][0], NETs['wifi'][0]) +
"-s %s -d ! %s -j MARK " % (NETs['fil'][0], NETs['wifi'][0]) +
"--set-mark %s" % conf_fw.mark['proxy'])
iptables("-t mangle -A PREROUTING -m mark --mark %s -j ACCEPT" % conf_fw.mark['proxy'])
# On ne va pas plus loin si il ne s'agit pas de bittorrent
iptables("-t mangle -A POSTROUTING -m mark ! --mark %s -j ACCEPT" % conf_fw.mark['bittorrent'])
#iptables("-t mangle -A POSTROUTING -m mark ! --mark %s -j ACCEPT" % conf_fw.mark['bittorrent'])
# On crée les chaînes de sous-réseaux
for net in NETs['all'] :
for mask in conf_fw.mask :
@ -550,9 +550,9 @@ class firewall_komaz(firewall_crans) :
# Par défaut on envoit les paquets dans la classe 9998
for net in NETs['all'] :
iptables("-t mangle -A POSTROUTING -o crans -d %s " % net +
"-j CLASSIFY --set-class 1:9998")
"-m mark --mark %s -j CLASSIFY --set-class 1:9998" % conf_fw.mark['bittorrent'])
iptables("-t mangle -A POSTROUTING -o ens -s %s " % net +
"-j CLASSIFY --set-class 1:9998")
"-m mark --mark %s -j CLASSIFY --set-class 1:9998" % conf_fw.mark['bittorrent'])
# On construit ensuite les classes et qdisc pour chaque adhérent
for adherent in adherents :
self.anim.cycle()
@ -567,9 +567,9 @@ class firewall_komaz(firewall_crans) :
ip = machine.ip()
subnet = IpSubnet(machine.ip(), conf_fw.mask[len(conf_fw.mask)-1])
iptables("-t mangle -A SUBNET-%s -o crans -d %s " % (subnet, ip) +
"-j CLASSIFY --set-class 1:%s" % class_id)
"-m mark --mark %s -j CLASSIFY --set-class 1:%s" % (conf_fw.mark['bittorrent'], class_id))
iptables("-t mangle -A SUBNET-%s -o ens -s %s " % (subnet, ip) +
"-j CLASSIFY --set-class 1:%s" % class_id)
"-m mark --mark %s -j CLASSIFY --set-class 1:%s" % (conf_fw.mark['bittorrent'], class_id))
self.anim.reinit()
print OK