ui,fw: fixed adding dst/src port rules

This commit is contained in:
Gustavo Iñiguez Goia 2025-01-25 01:46:49 +01:00
parent 0dfec48120
commit 6696d1c141
Failed to generate hash of commit

View file

@ -935,11 +935,10 @@ The value must be in the format: VALUE/UNITS/TIME, for example:
self.statements[idx]['opts'].setCurrentIndex( self.statements[idx]['opts'].setCurrentIndex(
Fw.PortProtocols.values().index(optsValue) Fw.PortProtocols.values().index(optsValue)
) )
try: pidx = self.net_srv.index_by_port(newValue)
self.statements[idx]['value'].setCurrentIndex( if pidx > 0:
self.net_srv.index_by_port(newValue) self.statements[idx]['value'].setCurrentIndex(pidx)
) else:
except:
self.statements[idx]['value'].setCurrentText(newValue) self.statements[idx]['value'].setCurrentText(newValue)
else: else:
@ -1080,11 +1079,10 @@ The value must be in the format: VALUE/UNITS/TIME, for example:
elif exp.Statement.Values[0].Key == Fw.Statements.SPORT.value: elif exp.Statement.Values[0].Key == Fw.Statements.SPORT.value:
self.statements[idx]['what'].setCurrentIndex(self.STATM_SPORT+1) self.statements[idx]['what'].setCurrentIndex(self.STATM_SPORT+1)
try: pidx = self.net_srv.index_by_port(exp.Statement.Values[0].Value)
self.statements[idx]['value'].setCurrentIndex( if pidx > 0:
self.net_srv.index_by_port(exp.Statement.Values[0].Value) self.statements[idx]['value'].setCurrentIndex(pidx)
) else:
except:
self.statements[idx]['value'].setCurrentText(exp.Statement.Values[0].Value) self.statements[idx]['value'].setCurrentText(exp.Statement.Values[0].Value)
st_name = exp.Statement.Name st_name = exp.Statement.Name
@ -1446,9 +1444,10 @@ The value must be in the format: VALUE/UNITS/TIME, for example:
# int # int
try: try:
service_idx = self.net_srv.service_by_name(statem_value) service_idx = self.net_srv.service_by_name(statem_value)
statem_value = self.net_srv.port_by_index(service_idx) if service_idx > 0:
if service_idx > 0 and "," in statem_value or "-" in statem_value: statem_value = self.net_srv.port_by_index(service_idx)
raise ValueError("port entered is multiport or a port range") if "," in statem_value or "-" in statem_value:
raise ValueError("port entered is multiport or a port range")
except: except:
if "," not in statem_value and "-" not in statem_value: if "," not in statem_value and "-" not in statem_value:
if not self._is_valid_int_value(statem_value): if not self._is_valid_int_value(statem_value):