msc: Make TC_lu_and_mo_call succeed with osmo-mg enabled osmo-msc
This is for patch https://gerrit.osmocom.org/#/c/4980 in osmo-msc
Change-Id: Ieec52d5e0da776d35d6a473bd726b368af9d5c66
diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn
index 549997e..2050e3d 100644
--- a/library/L3_Templates.ttcn
+++ b/library/L3_Templates.ttcn
@@ -585,6 +585,49 @@
}
}
+template PDU_ML3_NW_MS tr_ML3_MT_CC_CONNECT(integer tid) := {
+ discriminator := '0011'B,
+ tiOrSkip := {
+ transactionId := {
+ tio := int2bit(tid, 3),
+ tiFlag := '1'B,
+ tIExtension := omit
+ }
+ },
+ msgs := {
+ cc := {
+ connect_NW_MS := {
+ messageType := '000111'B,
+ nsd := '00'B,
+ facility := *,
+ progressIndicator := *,
+ connectedNumber := *,
+ connectedSubAddress := *,
+ user_user := *
+ }
+ }
+ }
+}
+
+template (value) PDU_ML3_MS_NW ts_ML3_MO_CC_CONNECT_ACK(integer tid) := {
+ discriminator := '0011'B,
+ tiOrSkip := {
+ transactionId := {
+ tio := int2bit(tid, 3),
+ tiFlag := '0'B,
+ tIExtension := omit
+ }
+ },
+ msgs := {
+ cc := {
+ connectAck := {
+ messageType := '001111'B,
+ nsd := '00'B
+ }
+ }
+ }
+}
+
template PDU_ML3_NW_MS tr_ML3_MT_CC_DISC(integer tid) := {
discriminator := '0011'B,
tiOrSkip := {
diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn
index 182868e..7f10bd2 100644
--- a/library/MGCP_Templates.ttcn
+++ b/library/MGCP_Templates.ttcn
@@ -74,8 +74,8 @@
sdp := sdp
}
- template MgcpCommand tr_CRCX := {
- line := t_MgcpCmdLine("CRCX", ?, ?),
+ template MgcpCommand tr_CRCX(template MgcpEndpoint ep := ?) := {
+ line := t_MgcpCmdLine("CRCX", ?, ep),
params := *,
sdp := *
}
diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 46159b7..884a7c0 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -499,9 +499,9 @@
}
};
-/* MT: MSC -> MNCC: Respons to SETUP.req */
-template MNCC_PDU tr_MNCC_SETUP_rsp(template uint32_t call_id := ?, template MNCC_number connected := *,
- template charstring imsi := ?) := {
+/* MO: MSC <- MNCC: Respons to SETUP.ind */
+template MNCC_PDU ts_MNCC_SETUP_rsp(uint32_t call_id, charstring imsi := "",
+ template MNCC_number connected := omit) := {
msg_type := MNCC_SETUP_RSP,
u := {
signal := { /* See 24.008 9.3.5 */
@@ -513,20 +513,20 @@
connected := connected,
cause := omit,
progress := omit,
- useruser := *,
- facility := *,
+ useruser := omit, /* optional */
+ facility := omit, /* optional */
cccap := omit,
- ssversion := *,
+ ssversion := omit, /* optional */
clir_sup := 0,
clir_inv := 0,
signal := omit,
keypad := omit,
more := 0,
notify := 0,
- emergency := *,
+ emergency := omit,
imsi := imsi,
- lchan_type := ?,
- lchan_mode := ?
+ lchan_type := 0,
+ lchan_mode := 0
}
}
};
@@ -595,9 +595,9 @@
}
}
-/* MO: MSC <- MNCC: SETUP_COMPL.req; request to send CONNECT ACK */
-template MNCC_PDU ts_MNCC_SETUP_COMPL_req(uint32_t call_id) :=
- ts_MNCC_SIMPLE(MNCC_SETUP_COMPL_REQ, call_id); /* See 24.008 9.3.6 */
+/* MT: MSC -> MNCC: SETUP_COMPL.req; request to send CONNECT ACK */
+template MNCC_PDU tr_MNCC_SETUP_COMPL_req(template uint32_t call_id) :=
+ tr_MNCC_SIMPLE(MNCC_SETUP_COMPL_REQ, call_id); /* See 24.008 9.3.6 */
/* MT: MSC -> MNCC: SETUP_COMPL.ind; receipt of CONNECT ACK */
template MNCC_PDU tr_MNCC_SETUP_COMPL_ind(template uint32_t call_id := ?) :=