Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/12304
Change subject: library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA}
......................................................................
library/GSUP_Types.ttcn: actualize both GSUP_SM_RP_{DA|OA}
Both GSUP_SM_RP_{DA|OA} IE definitions have been merged before
the reference implementation in libosmocore. Recently it was
decided to use the following structure:
IEI | IE length | ID type | ID encoded data (optional)
instead of:
IEI | IE length | ID type | ID length | ID encoded data (optional)
so, let's remove ID length from both definitions.
Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2
---
M library/GSUP_Types.ttcn
1 file changed, 2 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/04/12304/1
diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn
index d16b4a5..6cc6dde 100644
--- a/library/GSUP_Types.ttcn
+++ b/library/GSUP_Types.ttcn
@@ -701,10 +701,8 @@
type record GSUP_SM_RP_DA {
GSUP_SM_RP_ODA_IdType id_type,
- uint8_t id_len,
GSUP_SM_RP_DA_ID id_enc optional
-} with { variant (id_len) "LENGTHTO(id_enc)"
- variant (id_enc) "CROSSTAG(
+} with { variant (id_enc) "CROSSTAG(
imsi, id_type = OSMO_GSUP_SM_RP_ODA_ID_IMSI;
msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN;
smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR;
@@ -714,45 +712,37 @@
template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_IMSI(hexstring imsi) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI,
- id_len := 0, /* overwritten */
id_enc := { imsi := imsi }
}
template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_IMSI(template hexstring imsi) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_IMSI,
- id_len := ?,
id_enc := { imsi := imsi }
}
template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_MSISDN(hexstring msisdn) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN,
- id_len := 0, /* overwritten */
id_enc := { msisdn := msisdn }
}
template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_MSISDN(template hexstring msisdn) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN,
- id_len := ?,
id_enc := { msisdn := msisdn }
}
template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_SMSC_ADDR(hexstring smsc_addr)
:= {
id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR,
- id_len := 0, /* overwritten */
id_enc := { smsc_addr := smsc_addr }
}
template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_SMSC_ADDR(template hexstring
smsc_addr) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR,
- id_len := ?,
id_enc := { smsc_addr := smsc_addr }
}
template (value) GSUP_SM_RP_DA ts_GSUP_SM_RP_DA_NULL := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL,
- id_len := 0, /* overwritten */
id_enc := omit
}
template GSUP_SM_RP_DA tr_GSUP_SM_RP_DA_NULL := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL,
- id_len := ?,
id_enc := omit
}
@@ -784,10 +774,8 @@
type record GSUP_SM_RP_OA {
GSUP_SM_RP_ODA_IdType id_type,
- uint8_t id_len,
GSUP_SM_RP_OA_ID id_enc optional
-} with { variant (id_len) "LENGTHTO(id_enc)"
- variant (id_enc) "CROSSTAG(
+} with { variant (id_enc) "CROSSTAG(
msisdn, id_type = OSMO_GSUP_SM_RP_ODA_ID_MSISDN;
smsc_addr, id_type = OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR;
/* FIXME: how to handle noSM-RP-OA? */
@@ -796,34 +784,28 @@
template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_MSISDN(hexstring msisdn) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN,
- id_len := 0, /* overwritten */
id_enc := { msisdn := msisdn }
}
template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_MSISDN(template hexstring msisdn) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_MSISDN,
- id_len := ?,
id_enc := { msisdn := msisdn }
}
template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_SMSC_ADDR(hexstring smsc_addr)
:= {
id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR,
- id_len := 0, /* overwritten */
id_enc := { smsc_addr := smsc_addr }
}
template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_SMSC_ADDR(template hexstring
smsc_addr) := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_SMSC_ADDR,
- id_len := ?,
id_enc := { smsc_addr := smsc_addr }
}
template (value) GSUP_SM_RP_OA ts_GSUP_SM_RP_OA_NULL := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL,
- id_len := 0, /* overwritten */
id_enc := omit
}
template GSUP_SM_RP_OA tr_GSUP_SM_RP_OA_NULL := {
id_type := OSMO_GSUP_SM_RP_ODA_ID_NULL,
- id_len := ?,
id_enc := omit
}
--
To view, visit https://gerrit.osmocom.org/12304
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I001cec53a80028ff153db3d8b0318b298f2bd8c2
Gerrit-Change-Number: 12304
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
