Skip to content
Snippets Groups Projects
Commit 4e4ea3a5 authored by Pierre LALET's avatar Pierre LALET
Browse files

Tests: disable debug_dissector in sniff tests

This should avoid random unrelated crashes.
parent 11bad965
No related branches found
No related tags found
No related merge requests found
...@@ -564,10 +564,14 @@ def _send_or_sniff(pkt, timeout, flt, pid, fork, t_other=None): ...@@ -564,10 +564,14 @@ def _send_or_sniff(pkt, timeout, flt, pid, fork, t_other=None):
return return
else: else:
spkt = str(pkt) spkt = str(pkt)
# We do not want to crash when a packet cannot be parsed
old_debug_dissector = conf.debug_dissector
conf.debug_dissector = False
pkts = sniff( pkts = sniff(
timeout=timeout, filter=flt, timeout=timeout, filter=flt,
stop_filter=lambda p: pkt.__class__ in p and str(p[pkt.__class__]) == spkt stop_filter=lambda p: pkt.__class__ in p and str(p[pkt.__class__]) == spkt
) )
conf.debug_dissector = old_debug_dissector
if fork: if fork:
os.waitpid(pid, 0) os.waitpid(pid, 0)
else: else:
...@@ -581,7 +585,7 @@ def send_and_sniff(pkt, timeout=2, flt=None): ...@@ -581,7 +585,7 @@ def send_and_sniff(pkt, timeout=2, flt=None):
else: else:
from threading import Thread from threading import Thread
def run_function(pkt, timeout, flt, pid, thread, results): def run_function(pkt, timeout, flt, pid, thread, results):
_send_or_sniff(pkt, timeout, flt, pid, False, thread) _send_or_sniff(pkt, timeout, flt, pid, False, t_other=thread)
results.put(True) results.put(True)
results = Queue.Queue() results = Queue.Queue()
t_parent = Thread(target=run_function, args=(pkt, timeout, flt, 0, None, results)) t_parent = Thread(target=run_function, args=(pkt, timeout, flt, 0, None, results))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment