diff options
author | Vadim Yanitskiy <axilirator@gmail.com> | 2018-12-14 08:00:33 +0700 |
---|---|---|
committer | Vadim Yanitskiy <axilirator@gmail.com> | 2018-12-19 12:20:34 +0000 |
commit | f1f39bd28db3ebc987c48fcf7ff9289766f27c08 (patch) | |
tree | a069ccd323a0f6821ea0f6ea459e2132dcc45caf | |
parent | c39a9d89e016b522bab2fcffd24d55c3dc0bb0f8 (diff) |
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
-rw-r--r-- | library/GSUP_Types.ttcn | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index d16b4a50..6cc6dde0 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -701,10 +701,8 @@ type union GSUP_SM_RP_DA_ID { 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 @@ type record GSUP_SM_RP_DA { 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 union GSUP_SM_RP_OA_ID { 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 @@ type record GSUP_SM_RP_OA { 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 } |