Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm/mix/net: fix setting QubesDB after converting to ipaddress module

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-12-14 02:07:57 +01:00
parent faef890c9a
commit 97564f014c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/vm/mix/net.py
View File

@ -349,7 +349,7 @@ class NetVMMixin(qubes.events.Emitter):
ip = vm.ip6 if addr_family == 6 else vm.ip ip = vm.ip6 if addr_family == 6 else vm.ip
if ip is None: if ip is None:
continue continue
base_dir = '/qubes-firewall/' + ip + '/' base_dir = '/qubes-firewall/{}/'.format(ip)
# remove old entries if any (but don't touch base empty entry - it # remove old entries if any (but don't touch base empty entry - it
# would trigger reload right away # would trigger reload right away
self.untrusted_qdb.rm(base_dir) self.untrusted_qdb.rm(base_dir)
@ -370,12 +370,12 @@ class NetVMMixin(qubes.events.Emitter):
mapped_ip_base = '/mapped-ip/{}'.format(vm.ip) mapped_ip_base = '/mapped-ip/{}'.format(vm.ip)
if vm.visible_ip: if vm.visible_ip:
self.untrusted_qdb.write(mapped_ip_base + '/visible-ip', self.untrusted_qdb.write(mapped_ip_base + '/visible-ip',
vm.visible_ip) str(vm.visible_ip))
else: else:
self.untrusted_qdb.rm(mapped_ip_base + '/visible-ip') self.untrusted_qdb.rm(mapped_ip_base + '/visible-ip')
if vm.visible_gateway: if vm.visible_gateway:
self.untrusted_qdb.write(mapped_ip_base + '/visible-gateway', self.untrusted_qdb.write(mapped_ip_base + '/visible-gateway',
vm.visible_gateway) str(vm.visible_gateway))
else: else:
self.untrusted_qdb.rm(mapped_ip_base + '/visible-gateway') self.untrusted_qdb.rm(mapped_ip_base + '/visible-gateway')