Skip to content

Commit

Permalink
Merge 74f09ac into 2c6aada
Browse files Browse the repository at this point in the history
  • Loading branch information
@mx
mx committed Oct 25, 2019
2 parents 2c6aada + 74f09ac commit f40614d
Show file tree
Hide file tree
Showing 14 changed files with 54 additions and 43 deletions.
8 changes: 4 additions & 4 deletions dpkt/arp.py
View file
Expand Up @@ -35,8 +35,8 @@ class ARP(dpkt.Packet):
('hln', 'B', 6), # hardware address length
('pln', 'B', 4), # protocol address length
('op', 'H', ARP_OP_REQUEST),
('sha', '6s', ''),
('spa', '4s', ''),
('tha', '6s', ''),
('tpa', '4s', '')
('sha', '6s', b''),
('spa', '4s', b''),
('tha', '6s', b''),
('tpa', '4s', b'')
)
2 changes: 1 addition & 1 deletion dpkt/edp.py
View file
Expand Up @@ -12,7 +12,7 @@ class EDP(dpkt.Packet):
('sum', 'H', 0),
('seq', 'H', 0),
('mid', 'H', 0),
('mac', '6s', '')
('mac', '6s', b'')
)

def __str__(self):
Expand Down
17 changes: 14 additions & 3 deletions dpkt/ethernet.py
View file
Expand Up @@ -69,8 +69,8 @@ class Ethernet(dpkt.Packet):
"""

__hdr__ = (
('dst', '6s', ''),
('src', '6s', ''),
('dst', '6s', b''),
('src', '6s', b''),
('type', 'H', ETH_TYPE_IP)
)
_typesw = {}
Expand Down Expand Up @@ -350,7 +350,7 @@ class VLANtagISL(dpkt.Packet):
__hdr__ = (
('da', '5s', b'\x01\x00\x0c\x00\x00'),
('_type_pri', 'B', 3),
('sa', '6s', ''),
('sa', '6s', b''),
('len', 'H', 0),
('snap', '3s', b'\xaa\xaa\x03'),
('hsa', '3s', b'\x00\x00\x0c'),
Expand Down Expand Up @@ -717,6 +717,16 @@ def test_eth_802dot1ad_802dot1q_ip():
assert str(e1) == str(e2)


def test_eth_pack():
eth = Ethernet(data=b'12345')
raised = False
try:
_ = str(eth)
except:
raised = True
assert not raised


if __name__ == '__main__':
test_eth()
test_eth_init_with_data()
Expand All @@ -732,5 +742,6 @@ def test_eth_802dot1ad_802dot1q_ip():
test_eth_pppoe()
test_eth_2mpls_ecw_eth_llc_stp()
test_eth_802dot1ad_802dot1q_ip()
test_eth_pack()

print('Tests Successful...')
8 changes: 4 additions & 4 deletions dpkt/gzip.py
View file
Expand Up @@ -53,7 +53,7 @@
class GzipExtra(dpkt.Packet):
__byte_order__ = '<'
__hdr__ = (
('id', '2s', ''),
('id', '2s', b''),
('len', 'H', 0)
)

Expand All @@ -68,9 +68,9 @@ class Gzip(dpkt.Packet):
('xflags', 'B', 0),
('os', 'B', GZIP_OS_UNIX),

('extra', '0s', ''), # XXX - GZIP_FEXTRA
('filename', '0s', ''), # XXX - GZIP_FNAME
('comment', '0s', '') # XXX - GZIP_FCOMMENT
('extra', '0s', b''), # XXX - GZIP_FEXTRA
('filename', '0s', b''), # XXX - GZIP_FNAME
('comment', '0s', b'') # XXX - GZIP_FCOMMENT
)

def unpack(self, buf):
Expand Down
4 changes: 2 additions & 2 deletions dpkt/hsrp.py
View file
Expand Up @@ -38,6 +38,6 @@ class HSRP(dpkt.Packet):
('priority', 'B', 0),
('group', 'B', 0),
('rsvd', 'B', 0),
('auth', '8s', 'cisco'),
('vip', '4s', '')
('auth', '8s', b'cisco'),
('vip', '4s', b'')
)
4 changes: 2 additions & 2 deletions dpkt/ip6.py
View file
Expand Up @@ -30,8 +30,8 @@ class IP6(dpkt.Packet):
('plen', 'H', 0), # payload length (not including header)
('nxt', 'B', 0), # next header protocol
('hlim', 'B', 0), # hop limit
('src', '16s', ''),
('dst', '16s', '')
('src', '16s', b''),
('dst', '16s', b'')
)
_protosw = ip.IP._protosw

Expand Down
4 changes: 2 additions & 2 deletions dpkt/ipx.py
View file
Expand Up @@ -23,6 +23,6 @@ class IPX(dpkt.Packet):
('len', 'H', IPX_HDR_LEN),
('tc', 'B', 0),
('pt', 'B', 0),
('dst', '12s', ''),
('src', '12s', '')
('dst', '12s', b''),
('src', '12s', b'')
)
2 changes: 1 addition & 1 deletion dpkt/ospf.py
View file
Expand Up @@ -28,7 +28,7 @@ class OSPF(dpkt.Packet):
('area', 'I', 0),
('sum', 'H', 0),
('atype', 'H', 0),
('auth', '8s', '')
('auth', '8s', b'')
)

def __bytes__(self):
Expand Down
14 changes: 7 additions & 7 deletions dpkt/rfb.py
View file
Expand Up @@ -40,14 +40,14 @@ class RFB(dpkt.Packet):

class SetPixelFormat(dpkt.Packet):
__hdr__ = (
('pad', '3s', ''),
('pixel_fmt', '16s', '')
('pad', '3s', b''),
('pixel_fmt', '16s', b'')
)


class SetEncodings(dpkt.Packet):
__hdr__ = (
('pad', '1s', ''),
('pad', '1s', b''),
('num_encodings', 'H', 0)
)

Expand All @@ -65,7 +65,7 @@ class FramebufferUpdateRequest(dpkt.Packet):
class KeyEvent(dpkt.Packet):
__hdr__ = (
('down_flag', 'B', 0),
('pad', '2s', ''),
('pad', '2s', b''),
('key', 'I', 0)
)

Expand All @@ -80,21 +80,21 @@ class PointerEvent(dpkt.Packet):

class FramebufferUpdate(dpkt.Packet):
__hdr__ = (
('pad', '1s', ''),
('pad', '1s', b''),
('num_rects', 'H', 0)
)


class SetColourMapEntries(dpkt.Packet):
__hdr__ = (
('pad', '1s', ''),
('pad', '1s', b''),
('first_colour', 'H', 0),
('num_colours', 'H', 0)
)


class CutText(dpkt.Packet):
__hdr__ = (
('pad', '3s', ''),
('pad', '3s', b''),
('length', 'I', 0)
)
22 changes: 11 additions & 11 deletions dpkt/sccp.py
View file
Expand Up @@ -37,15 +37,15 @@ class ActivateCallPlane(dpkt.Packet):
class CallInfo(dpkt.Packet):
__byte_order__ = '<'
__hdr__ = (
('calling_party_name', '40s', ''),
('calling_party', '24s', ''),
('called_party_name', '40s', ''),
('called_party', '24s', ''),
('calling_party_name', '40s', b''),
('calling_party', '24s', b''),
('called_party_name', '40s', b''),
('called_party', '24s', b''),
('line_instance', 'I', 0),
('call_id', 'I', 0),
('call_type', 'I', 0),
('orig_called_party_name', '40s', ''),
('orig_called_party', '24s', '')
('orig_called_party_name', '40s', b''),
('orig_called_party', '24s', b'')
)


Expand Down Expand Up @@ -78,7 +78,7 @@ class DisplayPromptStatus(dpkt.Packet):
__byte_order__ = '<'
__hdr__ = (
('msg_timeout', 'I', 0),
('display_msg', '32s', ''),
('display_msg', '32s', b''),
('line_instance', 'I', 1),
('call_id', 'I', 0)
)
Expand All @@ -87,7 +87,7 @@ class DisplayPromptStatus(dpkt.Packet):
class DisplayText(dpkt.Packet):
__byte_order__ = '<'
__hdr__ = (
('display_msg', '36s', ''),
('display_msg', '36s', b''),
)


Expand All @@ -114,7 +114,7 @@ class OpenReceiveChannelAck(dpkt.Packet):
__byte_order__ = '<'
__hdr__ = (
('channel_status', 'I', 0),
('ip', '4s', ''),
('ip', '4s', b''),
('port', 'I', 0),
('passthruparty_id', 'I', 0),
)
Expand Down Expand Up @@ -152,7 +152,7 @@ class StartMediaTransmission(dpkt.Packet):
('conference_id', 'I', 0),
('passthruparty_id', 'I', 0),
('ipv4_or_ipv6', 'I', 0),
('remote_ip', '16s', ''),
('remote_ip', '16s', b''),
('remote_port', 'I', 0),
('ms_packet', 'I', 0),
('payload_capability', 'I', 4), # 4: G.711 u-law 64k
Expand Down Expand Up @@ -194,7 +194,7 @@ class SCCP(dpkt.Packet):
('len', 'I', 0),
('rsvd', 'I', 0),
('msgid', 'I', 0),
('msg', '0s', ''),
('msg', '0s', b''),
)
_msgsw = {
KEYPAD_BUTTON: KeypadButton,
Expand Down
2 changes: 1 addition & 1 deletion dpkt/sll.py
View file
Expand Up @@ -22,7 +22,7 @@ class SLL(dpkt.Packet):
('type', 'H', 0), # 0: to us, 1: bcast, 2: mcast, 3: other, 4: from us
('hrd', 'H', arp.ARP_HRD_ETH),
('hlen', 'H', 6), # hardware address length
('hdr', '8s', ''), # first 8 bytes of link-layer header
('hdr', '8s', b''), # first 8 bytes of link-layer header
('ethtype', 'H', ethernet.ETH_TYPE_IP),
)
_typesw = ethernet.Ethernet._typesw
Expand Down
4 changes: 2 additions & 2 deletions dpkt/ssl.py
View file
Expand Up @@ -20,8 +20,8 @@
class SSL2(dpkt.Packet):
__hdr__ = (
('len', 'H', 0),
('msg', 's', ''),
('pad', 's', ''),
('msg', 's', b''),
('pad', 's', b''),
)

def unpack(self, buf):
Expand Down
4 changes: 2 additions & 2 deletions dpkt/stp.py
View file
Expand Up @@ -22,9 +22,9 @@ class STP(dpkt.Packet):
('v', 'B', 0),
('type', 'B', 0),
('flags', 'B', 0),
('root_id', '8s', ''),
('root_id', '8s', b''),
('root_path', 'I', 0),
('bridge_id', '8s', ''),
('bridge_id', '8s', b''),
('port_id', 'H', 0),
('_age', 'H', 0),
('_max_age', 'H', 0),
Expand Down
2 changes: 1 addition & 1 deletion dpkt/tns.py
View file
Expand Up @@ -23,7 +23,7 @@ class TNS(dpkt.Packet):
('type', 'B', 0),
('rsvd', 'B', 0),
('hdrsum', 'H', 0),
('msg', '0s', ''),
('msg', '0s', b''),
)

def unpack(self, buf):
Expand Down

0 comments on commit f40614d

Please sign in to comment.