Skip to content

Use pcap/dnet with tox#1315

Merged
guedou merged 2 commits intosecdev:masterfrom
guedou:Issue_#1289
Apr 18, 2018
Merged

Use pcap/dnet with tox#1315
guedou merged 2 commits intosecdev:masterfrom
guedou:Issue_#1289

Conversation

@guedou
Copy link
Copy Markdown
Member

@guedou guedou commented Apr 4, 2018 •
edited
Loading

Fix issue #1289 and test pcap/dnet with tox.

This PR is ready to be reviewed.

@guedou guedou mentioned this pull request Apr 4, 2018
Merged
gpotter2
gpotter2 reviewed Apr 4, 2018
View reviewed changes
scapy/arch/pcapdnet.py Outdated
Copy link
Copy Markdown
Member

@gpotter2 gpotter2 Apr 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be a good idea to use something similar to
https://github.com/secdev/scapy/blob/master/scapy/arch/pcapdnet.py#L464-L469
telling people to update their version

Copy link
Copy Markdown
Member Author

@guedou guedou Apr 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done !

@codecov-io
Copy link
Copy Markdown

codecov-io commented Apr 4, 2018 •
edited
Loading

Codecov Report

Merging #1315 into master will decrease coverage by 3.4%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1315      +/-   ##
==========================================
- Coverage   82.83%   79.42%   -3.41%     
==========================================
  Files         169      166       -3     
  Lines       38952    37333    -1619     
==========================================
- Hits        32267    29653    -2614     
- Misses       6685     7680     +995
Impacted Files Coverage Δ
scapy/sendrecv.py 21.75% <0%> (-57.96%) ⬇️
scapy/arch/bpf/core.py 25.24% <0%> (-54.37%) ⬇️
scapy/arch/common.py 39.58% <0%> (-54.17%) ⬇️
scapy/layers/tls/__init__.py 50% <0%> (-50%) ⬇️
scapy/as_resolvers.py 32.07% <0%> (-49.06%) ⬇️
scapy/supersocket.py 38.96% <0%> (-40.26%) ⬇️
scapy/modules/nmap.py 57.46% <0%> (-39.56%) ⬇️
scapy/arch/linux.py 36.5% <0%> (-37.59%) ⬇️
scapy/arch/__init__.py 63.82% <0%> (-27.66%) ⬇️
scapy/compat.py 62.82% <0%> (-26.93%) ⬇️
... and 35 more

gpotter2
gpotter2 reviewed Apr 4, 2018
View reviewed changes
tox.ini Outdated
Copy link
Copy Markdown
Member

@gpotter2 gpotter2 Apr 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using > instead of == (not sure if supported in tox)
Same above in the warning, it should be saying Please use pcapy 0.11.3+

Copy link
Copy Markdown
Member Author

@guedou guedou Apr 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea!

gpotter2
gpotter2 reviewed Apr 4, 2018
View reviewed changes
tox.ini Outdated
Copy link
Copy Markdown
Member

@gpotter2 gpotter2 Apr 4, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small question not related to this PR: what is this used for? I couldn't find any other occurrence of SCAPY_ROOT_DIR
Moreover, PWD doesn't exist on windows, making tox crash-on-start

Copy link
Copy Markdown
Member Author

@guedou guedou Apr 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can try to use nested env substitutions like {env:KEY:{env:DEFAULT_OF_KEY}}. That should allow to support Windows easily.

@guedou
Copy link
Copy Markdown
Member Author

guedou commented Apr 4, 2018 via email

@guedou guedou force-pushed the Issue_#1289 branch 3 times, most recently from 729d5c0 to c7f91d3 Compare April 8, 2018 17:12
@guedou guedou mentioned this pull request Apr 8, 2018
Closed
@guedou guedou force-pushed the Issue_#1289 branch 19 times, most recently from 07b6c10 to c082492 Compare April 12, 2018 11:45
@guedou guedou force-pushed the Issue_#1289 branch 3 times, most recently from fe5f386 to 80ebcd8 Compare April 12, 2018 13:40
@guedou guedou requested a review from p-l- April 12, 2018 13:40
guedou
guedou commented Apr 12, 2018
View reviewed changes
.travis.yml
env:
- SCAPY_COVERAGE=yes

- os: osx
Copy link
Copy Markdown
Member Author

@guedou guedou Apr 12, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This non-root test is not useful anymore as the default native osx support works perfectly fine for non-root usages.

@guedou guedou mentioned this pull request Apr 18, 2018
Merged
gpotter2
gpotter2 approved these changes Apr 18, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@gpotter2 gpotter2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's get this merged

@guedou guedou merged commit 62c0cc3 into secdev:master Apr 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpotter2 gpotter2 gpotter2 approved these changes

@p-l- p-l- Awaiting requested review from p-l-

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@guedou @codecov-io @gpotter2