ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

SGsAP: Switch over to osmocom branch/repo to avoid bugs in official one 

The VLR and MME name are octetstring with dns-style labels and not
character strings.

Change-Id: I31a8ea04ef508beba9014aac5479693c47b7b956
This commit is contained in:
Harald Welte 2018-10-28 10:26:13 +01:00
parent af5bce4f97
commit 1fd461a936
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/Makefile vendored
View File

@ -40,11 +40,11 @@ ECLIPSEGIT2_REPOS= titan.ProtocolModules.GRE \
titan.ProtocolModules.LLC_v7.1.0 \
titan.ProtocolModules.MobileL3_v13.4.0 \
titan.ProtocolModules.NS_v7.3.0 \
titan.ProtocolModules.SGsAP_13.2.0 \
titan.ProtocolModules.SNDCP_v7.0.0 \
titan.ProtocolEmulations.SCCP
OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \
titan.ProtocolModules.SGsAP_13.2.0 \
titan.TestPorts.MTP3asp \
titan.ProtocolEmulations.M3UA
@ -78,7 +78,7 @@ titan.ProtocolModules.NS_v7.3.0_commit= R.2.A
titan.ProtocolModules.RTP_commit= R.5.A
titan.ProtocolModules.ROSE_commit= R.1.C
titan.ProtocolModules.SCTP_commit= R.2.A
titan.ProtocolModules.SGsAP_13.2.0_commit= R.1.B
titan.ProtocolModules.SGsAP_13.2.0_commit= 520dc48dd41ee15c9fd77e71d2ea7a05c58770b9
titan.ProtocolModules.SDP_commit= R.14.A
titan.ProtocolModules.SMPP_commit= R.2.A-2-gb7aee69
titan.ProtocolModules.SNDCP_v7.0.0_commit= R.2.A

36
library/SGsAP_Templates.ttcn
View File

@ -174,12 +174,12 @@ template MM_Information tr_SGsAP_IE_MmInfo(template octetstring mm_info) := {
/* 9.4.13 */
template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) charstring name) := {
template (value) MME_Name ts_SGsAP_IE_MmeName(template (value) octetstring name) := {
iEI := '00001001'B,
lengthIndicator := lengthof(valueof(name)),
name := name
};
template MME_Name tr_SGsAP_IE_MmeName(template charstring name) := {
template MME_Name tr_SGsAP_IE_MmeName(template octetstring name) := {
iEI := '00001001'B,
lengthIndicator := ?,
name := name
@ -303,12 +303,12 @@ template UE_EMM_Mode tr_SGsAP_IE_UeEmmMode(template UE_EMM_mode mode) := {
/* 9.4.22 */
template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) charstring name) := {
template (value) VLR_Name ts_SGsAP_IE_VlrName(template (value) octetstring name) := {
iEI := '00000010'B,
lengthIndicator := lengthof(name),
name := name
}
template VLR_Name tr_SGsAP_IE_VlrName(template charstring name) := {
template VLR_Name tr_SGsAP_IE_VlrName(template octetstring name) := {
iEI := '00000010'B,
lengthIndicator := ?,
name := name
@ -397,7 +397,7 @@ template PDU_SGsAP tr_SGsAP_EPS_DETACH_ACK(template hexstring imsi) := {
/* 8.6 */
template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi,
template (value) charstring mme_name,
template (value) octetstring mme_name,
template (value) IMSI_detachFromEPS_serviceType det_serv_typ) := {
sGsAP_EPS_DETACH_INDICATION:= {
messageType := '00010001'B,
@ -407,7 +407,7 @@ template (value) PDU_SGsAP ts_SGsAP_EPS_DETACH_IND(hexstring imsi,
}
}
template PDU_SGsAP tr_SGsAP_EPS_DETACH_IND(template hexstring imsi,
template charstring mme_name,
template octetstring mme_name,
template IMSI_detachFromEPS_serviceType det_serv_typ) := {
sGsAP_EPS_DETACH_INDICATION:= {
messageType := '00010001'B,
@ -433,7 +433,7 @@ template PDU_SGsAP tr_SGsAP_IMSI_DETACH_ACK(template hexstring imsi) := {
/* 8.8 */
template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi,
template (value) charstring mme_name,
template (value) octetstring mme_name,
template (value) IMSI_detachFromNonEPS_serviceType det_serv_typ) := {
sGsAP_IMSI_DETACH_INDICATION := {
messageType := '00010011'B,
@ -443,7 +443,7 @@ template (value) PDU_SGsAP ts_SGsAP_IMSI_DETACH_IND(hexstring imsi,
}
}
template PDU_SGsAP tr_SGsAP_IMSI_DETACH_IND(template hexstring imsi,
template charstring mme_name := ?,
template octetstring mme_name := ?,
template IMSI_detachFromNonEPS_serviceType det_serv_typ := ?) := {
sGsAP_IMSI_DETACH_INDICATION := {
messageType := '00010011'B,
@ -498,7 +498,7 @@ template PDU_SGsAP tr_SGsAP_LU_REJECT(template hexstring imsi,
/* 8.11 */
template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi,
template (value) charstring mme_name,
template (value) octetstring mme_name,
template (value) EPS_location_update_type eps_lu_type,
template (value) LocationAreaIdValue new_lai) := {
sGsAP_LOCATION_UPDATE_REQUEST := {
@ -517,7 +517,7 @@ template (value) PDU_SGsAP ts_SGsAP_LU_REQ(hexstring imsi,
}
}
template PDU_SGsAP tr_SGsAP_LU_REQ(template hexstring imsi,
template charstring mme_name := ?,
template octetstring mme_name := ?,
template EPS_location_update_type eps_lu_type := ?,
template LocationAreaIdValue new_lai := ?) := {
sGsAP_LOCATION_UPDATE_REQUEST := {
@ -574,7 +574,7 @@ template PDU_SGsAP tr_SGsAP_PAGING_REJ(template hexstring imsi,
/* 8.14 */
template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi,
template (value) charstring vlr_name,
template (value) octetstring vlr_name,
template (value) Service_Indicator serv_ind,
template (omit) OCT4 tmsi) :=
{
@ -596,7 +596,7 @@ template (value) PDU_SGsAP ts_SGsAP_PAGING_REQ(hexstring imsi,
}
}
template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi,
template charstring vlr_name,
template octetstring vlr_name,
template Service_Indicator serv_ind,
template OCT4 tmsi) :=
{
@ -619,21 +619,21 @@ template PDU_SGsAP tr_SGsAP_PAGING_REQ(template hexstring imsi,
}
/* 8.15 */
template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) charstring mme_name) := {
template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_MME(template (value) octetstring mme_name) := {
sGsAP_RESET_ACK := {
messageType := '00010110'B,
mME_Name := ts_SGsAP_IE_MmeName(mme_name),
vLR_Name := omit
}
}
template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) charstring vlr_name) := {
template (value) PDU_SGsAP ts_SGsAP_RESET_ACK_VLR(template (value) octetstring vlr_name) := {
sGsAP_RESET_ACK := {
messageType := '00010110'B,
mME_Name := omit,
vLR_Name := ts_SGsAP_IE_VlrName(vlr_name)
}
}
template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template charstring vlr_name) := {
template PDU_SGsAP tr_SGsAP_RESET_ACK(template octetstring mme_name, template octetstring vlr_name) := {
sGsAP_RESET_ACK := {
messageType := '00010110'B,
mME_Name := tr_SGsAP_IE_MmeName(mme_name),
@ -642,21 +642,21 @@ template PDU_SGsAP tr_SGsAP_RESET_ACK(template charstring mme_name, template cha
}
/* 8.16 */
template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) charstring mme_name) := {
template (value) PDU_SGsAP ts_SGsAP_RESET_IND_MME(template (value) octetstring mme_name) := {
sGsAP_RESET_INDICATION := {
messageType := '00010101'B,
mME_Name := ts_SGsAP_IE_MmeName(mme_name),
vLR_Name := omit
}
}
template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) charstring vlr_name) := {
template (value) PDU_SGsAP ts_SGsAP_RESET_IND_VLR(template (value) octetstring vlr_name) := {
sGsAP_RESET_INDICATION := {
messageType := '00010101'B,
mME_Name := omit,
vLR_Name := ts_SGsAP_IE_VlrName(vlr_name)
}
}
template PDU_SGsAP tr_SGsAP_RESET_IND(template charstring mme_name, template charstring vlr_name) := {
template PDU_SGsAP tr_SGsAP_RESET_IND(template octetstring mme_name, template octetstring vlr_name) := {
sGsAP_RESET_INDICATION := {
messageType := '00010101'B,
mME_Name := tr_SGsAP_IE_MmeName(mme_name),