Changeset 880:e57625d53014

Show
Ignore:
Timestamp:
08/20/08 17:54:40 (5 months ago)
Author:
Phil <phil@secdev.org>
Message:

Added Dot3 dst address resolution from IP address

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scapy/layers/inet.py

    r862 r880  
    516516 
    517517conf.neighbor.register_l3(Ether, IP, lambda l2,l3: getmacbyip(l3.dst)) 
     518conf.neighbor.register_l3(Dot3, IP, lambda l2,l3: getmacbyip(l3.dst)) 
    518519 
    519520 

  • scapy/layers/l2.py

    r879 r880  
    156156    __metaclass__ = Ether_or_Dot3_metaclass 
    157157    name = "802.3" 
    158     fields_desc = [ MACField("dst", ETHER_BROADCAST), 
     158    fields_desc = [ DestMACField("dst"), 
    159159                    MACField("src", ETHER_ANY), 
    160160                    LenField("len", None, "H") ] 
    …… 
    176176                    ByteField("ctrl", 0) ] 
    177177 
     178conf.neighbor.register_l3(Ether, LLC, lambda l2,l3: conf.neighbor.resolve(l2,l3.payload)) 
     179conf.neighbor.register_l3(Dot3, LLC, lambda l2,l3: conf.neighbor.resolve(l2,l3.payload)) 
     180 
    178181 
    179182class CookedLinux(Packet): 
    …… 
    192195    fields_desc = [ X3BytesField("OUI",0x000000), 
    193196                    XShortEnumField("code", 0x000, ETHER_TYPES) ] 
     197 
     198conf.neighbor.register_l3(Dot3, SNAP, lambda l2,l3: conf.neighbor.resolve(l2,l3.payload)) 
    194199 
    195200