Skip to content

gtp: build an MS International Number IE without a length #5295

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
bIackr0se wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

gtp: build an MS International Number IE without a length #5295

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
4 changes: 3 additions & 1 deletion scapy/contrib/gtp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,9 @@ class IE_MSInternationalNumber(IE_TLV):
fields_desc = [ByteEnumField("ietype", 134, IEType),
ShortField("length", None),
FlagsField("flags", 0x91, 8, ["Extension", "", "", "International Number", "", "", "", "ISDN numbering"]), # noqa: E501
TBCDByteField("digits", "33607080910", length_from=lambda x: x.length - 1)] # noqa: E501
# Length counts the flags octet; without one, build every digit
TBCDByteField("digits", "33607080910",
length_from=lambda x: None if x.length is None else x.length - 1)] # noqa: E501


class QoS_Profile(IE_Base):
Expand Down
8 changes: 8 additions & 0 deletions test/contrib/gtp.uts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,14 @@ ie.ietype == 134 and ie.flags == 145 and ie.digits == b'111111111111'
ie = IE_MSInternationalNumber(flags=145, digits='111111111111')
ie.ietype == 134 and ie.flags == 145 and ie.digits == b'111111111111'

= IE_MSInternationalNumber(), build without length
assert raw(IE_MSInternationalNumber()) == hex_bytes("860007" "91" "3306070819f0")
assert raw(IE_MSInternationalNumber(digits='491701234567')) == hex_bytes("860007" "91" "947110325476")
assert raw(IE_MSInternationalNumber(digits='4917012345678')) == hex_bytes("860008" "91" "947110325476f8")
assert raw(IE_MSInternationalNumber(length=7, digits='491701234567')) == hex_bytes("860007" "91" "947110325476")
ie = IE_MSInternationalNumber(raw(IE_MSInternationalNumber(digits='4917012345678')))
assert ie.length == 8 and ie.digits == b'4917012345678'

= IE_QoS(), dissect
h = "3333333333332222222222228100838408004588005400000000fd1182850a2a00010a2a0002084b084b00406b4632130030afe9d3a3317e0000018010bd82f3997f9febcaf58500040a2a00018500040a2a000187000f0213921f7396d1fe7482ffff004a00f7a71e0a"
gtp = Ether(hex_bytes(h))
Expand Down
Loading