Sur proposition de Vince|| on se passe de tester ce qui n'est par marqu
comme du bittorrent. darcs-hash:20060427210240-72cb0-da490e8dd2221102a71a990eb15bbefe7e64f6d3.gz
This commit is contained in:
parent
396ecfb81f
commit
2b8f5d6827
1 changed files with 10 additions and 8 deletions
|
@ -502,6 +502,8 @@ class firewall_komaz(firewall_crans) :
|
|||
"--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'])
|
||||
# On crée les chaînes de sous-réseaux
|
||||
for net in NETs['all'] :
|
||||
for mask in conf_fw.mask :
|
||||
|
@ -547,10 +549,10 @@ class firewall_komaz(firewall_crans) :
|
|||
tc("qdisc add dev %s parent 1:9998 handle 9999: sfq perturb 10" % interface)
|
||||
# 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 -m mark " % net +
|
||||
"--mark %s -j CLASSIFY --set-class 1:9998" % conf_fw.mark['bittorrent'])
|
||||
iptables("-t mangle -A POSTROUTING -o ens -s %s -m mark " % net +
|
||||
"--mark %s -j CLASSIFY --set-class 1:9998" % conf_fw.mark['bittorrent'])
|
||||
iptables("-t mangle -A POSTROUTING -o crans -d %s " % net +
|
||||
"-j CLASSIFY --set-class 1:9998")
|
||||
iptables("-t mangle -A POSTROUTING -o ens -s %s " % net +
|
||||
"-j CLASSIFY --set-class 1:9998")
|
||||
# On construit ensuite les classes et qdisc pour chaque adhérent
|
||||
for adherent in adherents :
|
||||
self.anim.cycle()
|
||||
|
@ -564,10 +566,10 @@ class firewall_komaz(firewall_crans) :
|
|||
for machine in adherent.machines() :
|
||||
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 -m mark " % (subnet, ip) +
|
||||
"--mark %s -j CLASSIFY --set-class 1:%s" % (conf_fw.mark['bittorrent'], class_id))
|
||||
iptables("-t mangle -A SUBNET-%s -o ens -s %s -m mark " % (subnet, ip) +
|
||||
"--mark %s -j CLASSIFY --set-class 1:%s" % (conf_fw.mark['bittorrent'], class_id))
|
||||
iptables("-t mangle -A SUBNET-%s -o crans -d %s " % (subnet, ip) +
|
||||
"-j CLASSIFY --set-class 1:%s" % class_id)
|
||||
iptables("-t mangle -A SUBNET-%s -o ens -s %s " % (subnet, ip) +
|
||||
"-j CLASSIFY --set-class 1:%s" % class_id)
|
||||
self.anim.reinit()
|
||||
print OK
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue