fixeria
/
pycrate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ether: fix VLAN type automation, and some more cleanup

This commit is contained in:
p1-bmu 2021-12-06 16:35:43 +01:00
parent e1bd91c781
commit f62d031ae3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pycrate_ether/Ethernet.py
View File

@ -95,9 +95,10 @@ class Ethernet(Envelope):
Buf('src', val=6*b'\0', bl=48, rep=REPR_HEX), Buf('src', val=6*b'\0', bl=48, rep=REPR_HEX),
Uint16('type', rep=REPR_HEX) # val automated Uint16('type', rep=REPR_HEX) # val automated
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Envelope.__init__(self, *args, **kwargs) Envelope.__init__(self, *args, **kwargs)
self[2].set_valauto(self._set_type_val) self[2].set_valauto(lambda: self._set_type_val())
def _set_type_val(self): def _set_type_val(self):
pay = self.get_payload() pay = self.get_payload()
@ -106,6 +107,7 @@ class Ethernet(Envelope):
else: else:
return 0 return 0
class VLAN(Envelope): class VLAN(Envelope):
_GEN = ( _GEN = (
Uint('pcp', desc='Priority Code Point', bl=3), Uint('pcp', desc='Priority Code Point', bl=3),
@ -113,9 +115,10 @@ class VLAN(Envelope):
Uint('vid', desc='VLAN identifier', bl=12), Uint('vid', desc='VLAN identifier', bl=12),
Uint16('type', rep=REPR_HEX) # val automated Uint16('type', rep=REPR_HEX) # val automated
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
Envelope.__init__(self, *args, **kwargs) Envelope.__init__(self, *args, **kwargs)
self[3].get_valauto(self._set_type_val) self[3].set_valauto(lambda: self._set_type_val())
def _set_type_val(self): def _set_type_val(self):
pay = self.get_payload() pay = self.get_payload()
@ -145,6 +148,8 @@ class EthernetPacket(Envelope):
self.__init__() self.__init__()
# Ethernet layer # Ethernet layer
self[0]._from_char(char) self[0]._from_char(char)
if not char.len_byte():
return
typ = self[0][2].get_val() typ = self[0][2].get_val()
hier = 1 hier = 1
# potential VLAN layer # potential VLAN layer
@ -153,6 +158,8 @@ class EthernetPacket(Envelope):
hier += 1 hier += 1
vlan._from_char(char) vlan._from_char(char)
self.append(vlan) self.append(vlan)
if not char.len_byte():
return
typ = vlan[3]._val typ = vlan[3]._val
# ARP or IP layer # ARP or IP layer
if typ == 0x0806: if typ == 0x0806:
@ -171,6 +178,8 @@ class EthernetPacket(Envelope):
typ = ip[4] typ = ip[4]
ip._from_char(char) ip._from_char(char)
self.append(ip) self.append(ip)
if not char.len_byte():
return
typ = typ._val typ = typ._val
# ICMP, UDP, TCP or SCTP layer # ICMP, UDP, TCP or SCTP layer
if typ == 1: if typ == 1: