Skip to content

opc_da: fix STDOBJREF IPID and Fack selack field types #5095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmadersbacher wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −6
Open

opc_da: fix STDOBJREF IPID and Fack selack field types #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions scapy/contrib/opc_da.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
ConditionalField,
Field,
FieldLenField,
FieldListField,
FlagsField,
IntEnumField,
IntField,
Expand Down Expand Up @@ -404,7 +405,7 @@ class STDOBJREF(Packet):
LEIntField('cPublicRefs', 0),
LELongField('OXID', 0),
LELongField('OID', 0),
PacketField('IPID', None, UUIDField),
UUIDField('IPID', None, uuid_fmt=UUIDField.FORMAT_LE),
]


Expand Down Expand Up @@ -883,8 +884,8 @@ class OpcDaFack(Packet):
IntField('maxFragSize', 0),
ShortField('serialNum', 0),
FieldLenField('selackLen', 0, count_of='selack', fmt="H"),
PacketListField('selack', None, IntField,
count_from=lambda pkt:pkt.selackLen),
FieldListField('selack', [], IntField('', 0),
count_from=lambda pkt: pkt.selackLen),
]

def extract_padding(self, p):
Expand Down
24 changes: 21 additions & 3 deletions test/contrib/opc_da.uts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,18 @@ assert elem1 == elem2
# OpcDaCl_cancel
# OpcDaCl_cancelLE

# + Test Fack Packet
# No example yet
# OpcDaFack
+ Test Fack Packet
= OpcDaFack
opcDaFackPacket_Dissect = hex_bytes(b'0000000010000010000000080000010002aaaaaaaabbbbbbbb')
fack = OpcDaFack(opcDaFackPacket_Dissect)
assert fack.selackLen == 2
assert fack.selack == [0xaaaaaaaa, 0xbbbbbbbb]
assert raw(fack) == opcDaFackPacket_Dissect

= OpcDaFackLE
fackLE = OpcDaFackLE(opcDaFackPacket_Dissect)
assert len(fackLE.selack) == 2
assert raw(fackLE) == opcDaFackPacket_Dissect

# + Test Cancel ack Packet
# No example yet
Expand Down Expand Up @@ -180,3 +189,12 @@ elem2 = raw(ocDaAlter_contextLEPacket_Build)
# + Test Orphaned Packet
# No example yet
# OpcDaOrphaned

+ Test STDOBJREF
= STDOBJREF dissection
stdObjRef_Dissect = hex_bytes(b'0100000002000000112233445566778899aabbccddeeff000102030405060708090a0b0c0d0e0f10')
std = STDOBJREF(stdObjRef_Dissect)
assert std.flags == 1
assert std.cPublicRefs == 2
assert str(std.IPID) == '04030201-0605-0807-090a-0b0c0d0e0f10'
assert raw(std) == stdObjRef_Dissect
Loading