fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38672?usp=email )

Change subject: library/gsup: improve generic GSUP_PDU templates ......................................................................

library/gsup: improve generic GSUP_PDU templates

* Fix tr_GSUP: 'ies' cannot be omitted, so use '?' (not '*') * Add missing template restrictions ('value' / 'present') * Move GSUP_PDU templates after GSUP_IE templates

Change-Id: If4ceaf60311f9e4ed57153e2f6d7cb793c637f89 --- M library/GSUP_Templates.ttcn 1 file changed, 16 insertions(+), 15 deletions(-)

Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified

diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn index 21805cb..2ccc16d 100644 --- a/library/GSUP_Templates.ttcn +++ b/library/GSUP_Templates.ttcn @@ -309,21 +309,6 @@ } }

-template GSUP_PDU tr_GSUP(template GSUP_MessageType msgt := ?, template GSUP_IEs ies := *) := { - msg_type := msgt, - ies := ies -} - -template (present) GSUP_PDU tr_GSUP_IMSI(template (present) GSUP_MessageType msgt := ?, template (present) hexstring imsi := ?) := { - msg_type := msgt, - ies := { tr_GSUP_IE_IMSI(imsi), * } -} - -template GSUP_PDU ts_GSUP(GSUP_MessageType msgt, GSUP_IEs ies := {}) := { - msg_type := msgt, - ies := ies -} - template (value) GSUP_IMEI ts_GSUP_IMEI(hexstring digits) := { len := 0, /* overwritten */ digits := digits @@ -335,6 +320,22 @@ }

+template (value) GSUP_PDU ts_GSUP(template (value) GSUP_MessageType msgt, + template (value) GSUP_IEs ies := {}) := { + msg_type := msgt, + ies := ies +} +template (present) GSUP_PDU tr_GSUP(template (present) GSUP_MessageType msgt := ?, + template (present) GSUP_IEs ies := ?) := { + msg_type := msgt, + ies := ies +} +template (present) GSUP_PDU tr_GSUP_IMSI(template (present) GSUP_MessageType msgt := ?, + template (present) hexstring imsi := ?) := { + msg_type := msgt, + ies := { tr_GSUP_IE_IMSI(imsi), * } +} + template (value) GSUP_PDU ts_GSUP_SAI_REQ(hexstring imsi) := ts_GSUP(OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST, { valueof(ts_GSUP_IE_IMSI(imsi)) });