Skip to content

Commit d8fb353

Browse files
committed
qubes-firewall: Suppress extraneous conntrack output
conntrack generally prints a status message to stderr before exiting, which interferes with listing connections. Output from dropping connections was unused. Fixes QubesOS/qubes-issues#9760
1 parent c534919 commit d8fb353

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

qubesagent/firewall.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,16 +183,16 @@ def list_targets(self):
183183
def conntrack_drop(self, src, con):
184184
subprocess.run(['conntrack', '-D', '--src', src, '--dst', con[1],
185185
'--proto', con[0], '--dport', con[2]],
186-
stdout=subprocess.PIPE,
187-
stderr=subprocess.STDOUT)
186+
stdout=subprocess.DEVNULL,
187+
stderr=subprocess.DEVNULL)
188188

189189
def conntrack_get_connections(self, family, source):
190190
connections = set()
191191

192192
with subprocess.Popen(['conntrack', '-L',
193193
'--family', f'ipv{family}', '--src', source],
194194
stdout=subprocess.PIPE,
195-
stderr=subprocess.STDOUT) as p:
195+
stderr=subprocess.DEVNULL) as p:
196196
while True:
197197
line = p.stdout.readline()
198198
if not line:

0 commit comments

Comments
 (0)