fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38583?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: library/gsup: improve formatting of SS templates
......................................................................
library/gsup: improve formatting of SS templates
Change-Id: I27aa67ded044a4a5362795bb791d883c4af55cd9
---
M library/GSUP_Templates.ttcn
1 file changed, 74 insertions(+), 82 deletions(-)
Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/GSUP_Templates.ttcn b/library/GSUP_Templates.ttcn
index 403af74..21805cb 100644
--- a/library/GSUP_Templates.ttcn
+++ b/library/GSUP_Templates.ttcn
@@ -1200,14 +1200,14 @@
}
private function f_gen_ts_ies(hexstring imsi,
- template (omit) boolean pdp_info_compl := omit,
- template (omit) GSUP_Message_Class message_class :=
omit,
- template (omit) hexstring imei := omit,
- template (omit) PCO_DATA pco := omit,
- template (omit) GSUP_CnDomain dom := omit,
- template (omit) octetstring source_name := omit,
- template (omit) octetstring destination_name := omit
- ) return GSUP_IEs {
+ template (omit) boolean pdp_info_compl := omit,
+ template (omit) GSUP_Message_Class message_class
:= omit,
+ template (omit) hexstring imei := omit,
+ template (omit) PCO_DATA pco := omit,
+ template (omit) GSUP_CnDomain dom := omit,
+ template (omit) octetstring source_name := omit,
+ template (omit) octetstring destination_name :=
omit)
+return GSUP_IEs {
var GSUP_IEs ies := {
valueof(ts_GSUP_IE_IMSI(imsi))
};
@@ -1254,8 +1254,8 @@
template PCO_DATA pco := omit,
template GSUP_CnDomain cn_domain := omit,
template octetstring source_name := omit,
- template octetstring destination_name := omit
- ) return template GSUP_IEs {
+ template octetstring destination_name := omit)
+return template GSUP_IEs {
var template GSUP_IEs ies := {
tr_GSUP_IE_IMSI(imsi)
};
@@ -1326,14 +1326,13 @@
return ies;
}
-private function f_gen_ts_ss_ies(
- hexstring imsi,
- OCT4 sid,
- GSUP_SessionState state,
- template (omit) octetstring ss := omit,
- template (omit) integer cause := omit,
- template octetstring source_name := omit
-) return GSUP_IEs {
+private function f_gen_ts_ss_ies(hexstring imsi,
+ OCT4 sid,
+ GSUP_SessionState state,
+ template (omit) octetstring ss := omit,
+ template (omit) integer cause := omit,
+ template octetstring source_name := omit)
+return GSUP_IEs {
/* Mandatory IEs */
var GSUP_IEs ies := {
valueof(ts_GSUP_IE_IMSI(imsi))
@@ -1359,14 +1358,13 @@
return ies;
}
-private function f_gen_tr_ss_ies(
- template hexstring imsi,
- template OCT4 sid := ?,
- template GSUP_SessionState state := ?,
- template octetstring ss := omit,
- template integer cause := omit,
- template octetstring destination_name := omit
-) return template GSUP_IEs {
+private function f_gen_tr_ss_ies(template hexstring imsi,
+ template OCT4 sid := ?,
+ template GSUP_SessionState state := ?,
+ template octetstring ss := omit,
+ template integer cause := omit,
+ template octetstring destination_name := omit)
+return template GSUP_IEs {
/* Mandatory IEs */
var template GSUP_IEs ies := {
tr_GSUP_IE_IMSI(imsi)
@@ -1409,64 +1407,58 @@
return (ies, ies2);
}
-template (value) GSUP_PDU ts_GSUP_PROC_SS_REQ(
- hexstring imsi,
- OCT4 sid,
- GSUP_SessionState state,
- template (omit) octetstring ss := omit,
- template (omit) octetstring source_name := omit
-) := ts_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_REQUEST,
- f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name)
-);
-template GSUP_PDU tr_GSUP_PROC_SS_REQ(
- template hexstring imsi,
- template OCT4 sid := ?,
- template GSUP_SessionState state := ?,
- template octetstring ss := *
-) := tr_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_REQUEST,
- f_gen_tr_ss_ies(imsi, sid, state, ss)
-);
+template (value) GSUP_PDU
+ts_GSUP_PROC_SS_REQ(hexstring imsi,
+ OCT4 sid,
+ GSUP_SessionState state,
+ template (omit) octetstring ss := omit,
+ template (omit) octetstring source_name := omit) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST,
+ ies := f_gen_ts_ss_ies(imsi, sid, state, ss, source_name := source_name)
+};
+template GSUP_PDU
+tr_GSUP_PROC_SS_REQ(template hexstring imsi,
+ template OCT4 sid := ?,
+ template GSUP_SessionState state := ?,
+ template octetstring ss := *) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_REQUEST,
+ ies := f_gen_tr_ss_ies(imsi, sid, state, ss)
+};
-template (value) GSUP_PDU ts_GSUP_PROC_SS_RES(
- hexstring imsi,
- OCT4 sid,
- GSUP_SessionState state,
- template (omit) octetstring ss := omit
-) := ts_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_RESULT,
- f_gen_ts_ss_ies(imsi, sid, state, ss)
-);
-template GSUP_PDU tr_GSUP_PROC_SS_RES(
- template hexstring imsi,
- template OCT4 sid := ?,
- template GSUP_SessionState state := ?,
- template octetstring ss := *,
- template octetstring destination_name := omit
-) := tr_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_RESULT,
- f_gen_tr_ss_ies(imsi, sid, state, ss, destination_name :=
destination_name)
-);
+template (value) GSUP_PDU
+ts_GSUP_PROC_SS_RES(hexstring imsi,
+ OCT4 sid,
+ GSUP_SessionState state,
+ template (omit) octetstring ss := omit) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT,
+ ies := f_gen_ts_ss_ies(imsi, sid, state, ss)
+};
+template GSUP_PDU
+tr_GSUP_PROC_SS_RES(template hexstring imsi,
+ template OCT4 sid := ?,
+ template GSUP_SessionState state := ?,
+ template octetstring ss := *,
+ template octetstring destination_name := omit) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_RESULT,
+ ies := f_gen_tr_ss_ies(imsi, sid, state, ss, destination_name :=
destination_name)
+};
-template (value) GSUP_PDU ts_GSUP_PROC_SS_ERR(
- hexstring imsi,
- OCT4 sid,
- GSUP_SessionState state,
- integer cause
-) := ts_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_ERROR,
- f_gen_ts_ss_ies(imsi, sid, state, cause := cause)
-);
-template GSUP_PDU tr_GSUP_PROC_SS_ERR(
- template hexstring imsi,
- template OCT4 sid := ?,
- template GSUP_SessionState state := ?,
- template integer cause := ?
-) := tr_GSUP(
- OSMO_GSUP_MSGT_PROC_SS_ERROR,
- f_gen_tr_ss_ies(imsi, sid, state, cause := cause)
-);
+template (value) GSUP_PDU
+ts_GSUP_PROC_SS_ERR(hexstring imsi,
+ OCT4 sid,
+ GSUP_SessionState state,
+ integer cause) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR,
+ ies := f_gen_ts_ss_ies(imsi, sid, state, cause := cause)
+};
+template GSUP_PDU
+tr_GSUP_PROC_SS_ERR(template hexstring imsi,
+ template OCT4 sid := ?,
+ template GSUP_SessionState state := ?,
+ template integer cause := ?) := {
+ msg_type := OSMO_GSUP_MSGT_PROC_SS_ERROR,
+ ies := f_gen_tr_ss_ies(imsi, sid, state, cause := cause)
+};
template (value) GSUP_PDU ts_GSUP_MO_FORWARD_SM_REQ(
hexstring imsi,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38583?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I27aa67ded044a4a5362795bb791d883c4af55cd9
Gerrit-Change-Number: 38583
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
