Bufix: Exiting threads on error.

This commit is contained in:
Lukas Prause
2023-06-21 14:21:06 +02:00
parent be15a51017
commit 80f292767b
2 changed files with 2 additions and 2 deletions

View File

@@ -188,7 +188,7 @@ def format_pcaps_to_csv(pcaps, dummy):
pcap_df = pcap_df.sort_values("arrival_time") pcap_df = pcap_df.sort_values("arrival_time")
try: try:
# join tcp_trace data with pcap data # join tcp_trace data with pcap data
merge_srtt = False merge_srtt = True
if merge_srtt: if merge_srtt:
tcp_trace_df = format_tcp_trace_to_csv( tcp_trace_df = format_tcp_trace_to_csv(
pcap_number, pcap_number,
@@ -202,7 +202,7 @@ def format_pcaps_to_csv(pcaps, dummy):
pcap_number pcap_number
) )
) )
break continue ## break before but stoped the thread
merged_df = pd.merge_asof( merged_df = pd.merge_asof(
pcap_df.loc[pcap_df["src_ip"] != args.server], pcap_df.loc[pcap_df["src_ip"] != args.server],
tcp_trace_df, tcp_trace_df,

View File