Skip to content

Commit

Permalink
Firewall/alias, increase resolve() performance, see https://forum.opn…
Browse files Browse the repository at this point in the history
  • Loading branch information
AdSchellevis committed Nov 8, 2018
1 parent db94fb4 commit 08bd6c7
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/opnsense/scripts/filter/lib/alias.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, elem, known_aliases=[], ttl=-1, ssl_no_verify=False, timeout=
self._type = None
self._proto = None
self._items = list()
self._resolve_content = list()
self._resolve_content = set()
for subelem in elem:
if subelem.tag == 'type':
self._type = subelem.text
Expand Down Expand Up @@ -240,18 +240,18 @@ def resolve(self, force=False):
f_out.write('%s\n' % address)
f_out.flush()
# preserve addresses
self._resolve_content.append(address)
self._resolve_content.add(address)
except IOError:
# parse issue, keep data as-is, flush previous content to disk
with open(self._filename_alias_content, 'w') as f_out:
f_out.write(undo_content)
self._resolve_content = undo_content.split("\n")
self._resolve_content = set(undo_content.split("\n"))
# flush md5 hash to disk
open(self._filename_alias_hash, 'w').write(self.uniqueid())
else:
self._resolve_content = open(self._filename_alias_content).read().split()
self._resolve_content = set(open(self._filename_alias_content).read().split())
# return the addresses and networks of this alias
return self._resolve_content
return list(self._resolve_content)

def get_parser(self):
""" fetch address parser to use, None if alias type is not handled here
Expand Down

0 comments on commit 08bd6c7

Please sign in to comment.