Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next/20210413/v6 #6059

Merged
merged 11 commits into from
Apr 15, 2021
Merged

Next/20210413/v6 #6059

merged 11 commits into from
Apr 15, 2021

Conversation

victorjulien
Copy link
Member

#6058 fixing the ebpf fix.

#6057 #6051 #6047

jlucovsky and others added 11 commits April 15, 2021 11:43
This commit ensures that file objects are closed in threaded mode.
This commit removes the last remnants of the Tilera log output mechanism
(unsupported since 5.0.x).
- Wrap the id in a new IPPairStorageId struct, to avoid id
confusion with other storage API calls.
- Formatting fixes by clang.
- Wrap the id in a HostStorageId struct to avoid id confusion
with other storage API calls.
- Fix formatting with clang script.
- Wrap the id in a new LiveDevStorageId struct, to avoid id
 confusion with other storage API calls.
- Formatting fixes by clang.
The xdp_lb was not handling correctly the GRE load balancing
and it was not supporting the GRE + ERSPAN that is used by
some aggregator devices.
The function bpf_program__title has been deprecated in favor of
bpf_program__section_name.
Use Debian 10 to build eBPF.
@victorjulien victorjulien requested review from regit and a team as code owners April 15, 2021 13:50
@victorjulien victorjulien mentioned this pull request Apr 15, 2021
@codecov
Copy link

codecov bot commented Apr 15, 2021

Codecov Report

Merging #6059 (23b1607) into master (bc667a4) will decrease coverage by 0.07%.
The diff coverage is 76.54%.

@@            Coverage Diff             @@
##           master    #6059      +/-   ##
==========================================
- Coverage   76.99%   76.92%   -0.08%     
==========================================
  Files         612      612              
  Lines      187752   187760       +8     
==========================================
- Hits       144569   144438     -131     
- Misses      43183    43322     +139     
Flag Coverage Δ
fuzzcorpus 52.83% <32.00%> (-0.15%) ⬇️
suricata-verify 50.25% <45.09%> (-0.04%) ⬇️
unittests 63.22% <73.41%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@victorjulien victorjulien merged commit 23b1607 into OISF:master Apr 15, 2021
@victorjulien victorjulien deleted the next/20210413/v6 branch June 18, 2021 08:41
jasonish added a commit that referenced this pull request May 8, 2023
Pin urllib to a known working version.

Ticket: #6059
jasonish added a commit to jasonish/suricata that referenced this pull request May 9, 2023
jasonish added a commit to jasonish/suricata that referenced this pull request May 9, 2023
jasonish added a commit to jasonish/suricata that referenced this pull request May 9, 2023
Changes to Python around urllib3 require a more modern OpenSSL. Using a
newer Ubuntu image that satisfies this requirement.

Ticket: OISF#6059
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants