Skip to content

Improve path detection & Add backup ethertypes #2011

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

Merged
merged 1 commit into from
Jun 1, 2019

Conversation

gpotter2
Copy link
Member

@gpotter2 gpotter2 commented May 1, 2019

This PR:

Where to get /etc/ethertypes?

The file's official sources are all down, therefore we have to find an alternative. But the mirrors of the file have outdated versions.

Therefore this PR uses OpenBSD's version of the file (a C header) converted to the legacy format. I've added the generation script to the tools folder.

This allow us to keep full compatibility with all platforms, and use the installed file when available.

@codecov
Copy link

codecov bot commented May 1, 2019

Codecov Report

Merging #2011 into master will decrease coverage by 3.71%.
The diff coverage is 82.5%.

@@            Coverage Diff             @@
##           master    #2011      +/-   ##
==========================================
- Coverage   85.99%   82.27%   -3.72%     
==========================================
  Files         189      133      -56     
  Lines       43094    31359   -11735     
==========================================
- Hits        37058    25802   -11256     
+ Misses       6036     5557     -479
Impacted Files Coverage Δ
scapy/modules/p0f.py 64.63% <100%> (+0.09%) ⬆️
scapy/modules/ethertypes.py 100% <100%> (ø)
scapy/data.py 87.55% <78.78%> (-3.48%) ⬇️
scapy/layers/usb.py 51.64% <0%> (-29.68%) ⬇️
scapy/consts.py 70.83% <0%> (-20.84%) ⬇️
scapy/arch/pcapdnet.py 37.37% <0%> (-19.67%) ⬇️
scapy/contrib/gtp.py 75.17% <0%> (-13.64%) ⬇️
scapy/supersocket.py 60.46% <0%> (-11.63%) ⬇️
scapy/arch/__init__.py 84.44% <0%> (-11.12%) ⬇️
scapy/layers/l2.py 74.81% <0%> (-9.39%) ⬇️
... and 88 more

@codecov
Copy link

codecov bot commented May 1, 2019

Codecov Report

Merging #2011 into master will increase coverage by <.01%.
The diff coverage is 85.36%.

@@            Coverage Diff            @@
##           master   #2011      +/-   ##
=========================================
+ Coverage    86.3%   86.3%   +<.01%     
=========================================
  Files         197     197              
  Lines       44459   44469      +10     
=========================================
+ Hits        38369   38381      +12     
+ Misses       6090    6088       -2
Impacted Files Coverage Δ
scapy/modules/p0f.py 64.63% <100%> (+0.09%) ⬆️
scapy/data.py 90.83% <82.85%> (-0.95%) ⬇️
scapy/layers/tls/record_sslv2.py 87.7% <0%> (-2.24%) ⬇️
scapy/layers/inet6.py 88.22% <0%> (-0.06%) ⬇️
scapy/layers/inet.py 70.89% <0%> (+0.16%) ⬆️
scapy/sendrecv.py 85.27% <0%> (+0.16%) ⬆️
scapy/asn1/ber.py 83.09% <0%> (+0.28%) ⬆️
scapy/layers/tls/record.py 92.1% <0%> (+0.87%) ⬆️
scapy/layers/tls/handshake_sslv2.py 92.45% <0%> (+1.13%) ⬆️

@gpotter2 gpotter2 force-pushed the ethertypes branch 2 times, most recently from cc3ac96 to 8ef5d32 Compare May 1, 2019 20:40
@gpotter2 gpotter2 mentioned this pull request May 17, 2019
27 tasks
@guedou guedou merged commit 0e5416d into secdev:master Jun 1, 2019
@gpotter2 gpotter2 deleted the ethertypes branch June 1, 2019 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants