lynxis lazus has uploaded this change for review.

View Change

GSUP Templates: fix empty destination_name in GSUP ISD/UL

The destination_name TLV should be either set with a valid name
or not present, but a field with length 0 shouldn't be used.

Change-Id: Ia89b5a82665e407fa578e5209fbcde0676326df0
---
M library/GSUP_Templates.ttcn
1 file changed, 10 insertions(+), 10 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/40666/1

diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn
index 227a7d2..36702d9 100644
--- a/library/GSUP_Templates.ttcn
+++ b/library/GSUP_Templates.ttcn
@@ -418,9 +418,9 @@
 template GSUP_PDU tr_GSUP_UL_REQ(template hexstring imsi) :=
 	tr_GSUP_IMSI(OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST, imsi);
 
-template (value) GSUP_PDU ts_GSUP_UL_RES(hexstring imsi, octetstring destination_name := ''O) :=
-	ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)),
-			valueof(ts_GSUP_IE_Destination_Name(destination_name))});
+template (omit) GSUP_PDU ts_GSUP_UL_RES(hexstring imsi, template (omit) octetstring destination_name := omit) :=
+	ts_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT,
+			f_gen_ts_ies(imsi, destination_name := destination_name));
 
 template GSUP_PDU tr_GSUP_UL_RES(template hexstring imsi, template octetstring destination_name := omit) :=
 	tr_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT, f_gen_tr_ies(imsi, destination_name := destination_name));
@@ -434,19 +434,19 @@
 	tr_GSUP(OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR,
 		f_gen_tr_ies(imsi, cause := cause, destination_name := destination_name));
 
-template (value) GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn, octetstring destination_name := ''O) :=
-	ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST, {
-			valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_MSISDN(msisdn)),
-			valueof(ts_GSUP_IE_Destination_Name(destination_name))});
+template (omit) GSUP_PDU ts_GSUP_ISD_REQ(hexstring imsi, hexstring msisdn, template (omit) octetstring destination_name := omit) :=
+	ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST,
+			f_gen_ts_ies(imsi, destination_name := destination_name) & {
+				valueof(ts_GSUP_IE_MSISDN(msisdn)) });
 
 template GSUP_PDU tr_GSUP_ISD_REQ(template hexstring imsi, template hexstring msisdn := ?,
 		template octetstring destination_name := omit) :=
 	tr_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_REQUEST,
 		f_gen_tr_ies(imsi, msisdn := msisdn, destination_name := destination_name));
 
-template GSUP_PDU ts_GSUP_ISD_RES(hexstring imsi,
-                                  template octetstring source_name := omit,
-                                  template octetstring destination_name := omit) :=
+template (omit) GSUP_PDU ts_GSUP_ISD_RES(hexstring imsi,
+		template (omit) octetstring source_name := omit,
+		template (omit) octetstring destination_name := omit) :=
 	ts_GSUP(OSMO_GSUP_MSGT_INSERT_DATA_RESULT,
                 f_gen_ts_ies(imsi, source_name := source_name,
                              destination_name := destination_name));

To view, visit change 40666. To unsubscribe, or for help writing mail filters, visit settings.