Skip to content

Add TFTP options to DHCP - #2765

Merged
guedou merged 3 commits into
secdev:masterfrom
azdolinski:add_dhcp_layer_tftp_options
Sep 8, 2020
Merged

Add TFTP options to DHCP#2765
guedou merged 3 commits into
secdev:masterfrom
azdolinski:add_dhcp_layer_tftp_options

Conversation

@azdolinski

@azdolinski azdolinski commented Aug 15, 2020

Copy link
Copy Markdown
Contributor

fix 2747

adding tftp options in DHCP layer:
scapy/scapy/layers/dhcp.py

66: "tftp_server_name"
150: IPField("tftp_server_address", "0.0.0.0"),

- fix issue 2747
- also update random tests
@gpotter2 gpotter2 changed the title Update dhcp.py Add TFTP options to DHCP Aug 18, 2020
@codecov

codecov Bot commented Aug 18, 2020

Copy link
Copy Markdown

Codecov Report

Merging #2765 into master will increase coverage by 0.03%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2765      +/-   ##
==========================================
+ Coverage   88.23%   88.27%   +0.03%     
==========================================
  Files         251      252       +1     
  Lines       53367    53472     +105     
==========================================
+ Hits        47091    47201     +110     
+ Misses       6276     6271       -5     
Impacted Files Coverage Δ
scapy/layers/dhcp.py 87.34% <ø> (ø)
scapy/layers/dot11.py 89.24% <0.00%> (-1.67%) ⬇️
scapy/layers/tls/session.py 84.32% <0.00%> (-0.64%) ⬇️
scapy/arch/unix.py 76.01% <0.00%> (-0.46%) ⬇️
scapy/sendrecv.py 86.62% <0.00%> (-0.11%) ⬇️
scapy/supersocket.py 74.06% <0.00%> (-0.09%) ⬇️
scapy/automaton.py 88.30% <0.00%> (-0.02%) ⬇️
scapy/layers/can.py 96.07% <0.00%> (-0.02%) ⬇️
scapy/layers/tls/automaton_cli.py 76.23% <0.00%> (ø)
scapy/contrib/exposure_notification.py 100.00% <0.00%> (ø)
... and 11 more

@guedou guedou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Comment thread scapy/layers/dhcp.py Outdated
118: IPField("subnet-selection", "0.0.0.0"),
124: "vendor_class",
125: "vendor_specific_information",
128: IPField("tftp-server-ip-address", "0.0.0.0"),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you use _ instead of - to be consistent with your modifications? Thanks. Otherwise, this looks good to be merged.

"-" > "_"
@guedou
guedou merged commit 173ed33 into secdev:master Sep 8, 2020
bzalkilani pushed a commit to bzalkilani/scapy that referenced this pull request Jun 12, 2022
* Add TFTP options to DHCP

- fix issue 2747
- also update random tests

* Update dhcp.py

* Update dhcp.py

"-" > "_"
bzalkilani pushed a commit to bzalkilani/scapy that referenced this pull request Jun 14, 2022
* Add TFTP options to DHCP

- fix issue 2747
- also update random tests

* Update dhcp.py

* Update dhcp.py

"-" > "_"
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.

enhancement DHCP Layer - missing TFTP options in DHCPOptions

3 participants