Skip to content
Snippets Groups Projects
Commit 414ac191 authored by Pierre Lalet's avatar Pierre Lalet
Browse files

Merging (my) pull request #30 (from p-l/scapy/issue5081), because that's a... 

Merging (my) pull request #30 (from p-l/scapy/issue5081), because that's a tiny patch that's hardly going to add new troubles, plus @chrisjameskirkham (who initialy reported #5081) validated this fixes the issue.

Changed registration order for CookedLinux layer 2 type (fixes #5081)
parents 3f7d391f 726b2579
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
scapy/layers/l2.py
+ 1
− 1
View file @ 414ac191
...@@ -420,8 +420,8 @@ conf.l2types.register(ARPHDR_ETHER, Ether) ...@@ -420,8 +420,8 @@ conf.l2types.register(ARPHDR_ETHER, Ether)
conf.l2types.register_num2layer(ARPHDR_METRICOM, Ether) conf.l2types.register_num2layer(ARPHDR_METRICOM, Ether)
conf.l2types.register_num2layer(ARPHDR_LOOPBACK, Ether) conf.l2types.register_num2layer(ARPHDR_LOOPBACK, Ether)
conf.l2types.register_layer2num(ARPHDR_ETHER, Dot3) conf.l2types.register_layer2num(ARPHDR_ETHER, Dot3)
conf.l2types.register(113, CookedLinux)
conf.l2types.register(144, CookedLinux) # called LINUX_IRDA, similar to CookedLinux conf.l2types.register(144, CookedLinux) # called LINUX_IRDA, similar to CookedLinux
conf.l2types.register(113, CookedLinux)
conf.l3types.register(ETH_P_ARP, ARP) conf.l3types.register(ETH_P_ARP, ARP)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment