port(TCP|UDP)(in|out) est dsormais une liste. Je ferai le changement de
syntaxe dans le schma au prochain dump/restauration de la base. darcs-hash:20060327003949-68412-6475d4ba6f2cf144789a90915fd72e1df374910e.gz
This commit is contained in:
parent
0626631ac9
commit
9e10f8584c
5 changed files with 32 additions and 43 deletions
|
@ -1203,10 +1203,10 @@ def set_machine(machine) :
|
|||
arg+= u'"Adresse mac :" 2 1 "%s" 2 15 17 0 ' % machine.mac()
|
||||
arg+= u'"IP :" 3 1 "%s" 3 6 15 0 ' % machine.ip()
|
||||
if isadm :
|
||||
arg+= u'"PortsTCP ext->machine :" 4 1 "%s" 4 25 50 0 ' % machine.portTCPin()
|
||||
arg+= u'"PortsTCP machine->ext :" 5 1 "%s" 5 25 50 0 ' % machine.portTCPout()
|
||||
arg+= u'"PortsUDP ext->machine :" 6 1 "%s" 6 25 50 0 ' % machine.portUDPin()
|
||||
arg+= u'"PortsUDP machine->ext :" 7 1 "%s" 7 25 50 0 ' % machine.portUDPout()
|
||||
arg+= u'"PortsTCP ext->machine :" 4 1 "%s" 4 25 50 0 ' % ' '.join(machine.portTCPin())
|
||||
arg+= u'"PortsTCP machine->ext :" 5 1 "%s" 5 25 50 0 ' % ' '.join(machine.portTCPout())
|
||||
arg+= u'"PortsUDP ext->machine :" 6 1 "%s" 6 25 50 0 ' % ' '.join(machine.portUDPin())
|
||||
arg+= u'"PortsUDP machine->ext :" 7 1 "%s" 7 25 50 0 ' % ' '.join(machine.portUDPout())
|
||||
if isinstance(machine, BorneWifi) and isadm :
|
||||
# Borne wifi
|
||||
p = u'Mettre le lieu de la borne comme premičre remarque.'
|
||||
|
@ -1253,10 +1253,10 @@ def set_machine(machine) :
|
|||
|
||||
if isadm :
|
||||
try :
|
||||
machine.portTCPin(result[3])
|
||||
machine.portTCPout(result[4])
|
||||
machine.portUDPin(result[5])
|
||||
machine.portUDPout(result[6])
|
||||
machine.portTCPin(result[3].split())
|
||||
machine.portTCPout(result[4].split())
|
||||
machine.portUDPin(result[5].split())
|
||||
machine.portUDPout(result[6].split())
|
||||
except ValueError, c : err += c.args[0] + '\n'
|
||||
|
||||
if isadm and isinstance(machine, BorneWifi):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue