Harald Welte has submitted this change and it was merged. Change subject: L3_Templates: Introudce constants for tiFlag ......................................................................
L3_Templates: Introudce constants for tiFlag ... this makes the code more readable/understandable. Change-Id: Ic06eb2016eb9979b8556366e4a909f3c0336aa92 --- M library/L3_Templates.ttcn M msc/gen_links.sh M msc/regen_makefile.sh 3 files changed, 29 insertions(+), 21 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index a2b872c..3203b0e 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -19,6 +19,9 @@ import from MobileL3_GMM_SM_Types all; //import from MobileL3_SMS_Types all; +/* TS 24.007 Table 11.3 TI Flag */ +const BIT1 c_TIF_ORIG := '0'B; +const BIT1 c_TIF_REPL := '1'B; type enumerated CmServiceType { CM_TYPE_MO_CALL ('0001'B), @@ -704,7 +707,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } } @@ -776,7 +779,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -818,7 +821,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -890,7 +893,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -912,7 +915,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -934,7 +937,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -958,7 +961,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -982,7 +985,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -1001,7 +1004,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -1202,7 +1205,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '1'B, /* response from destination */ + tiFlag := c_TIF_REPL, /* response from destination */ tIExtension := omit } }, @@ -1231,7 +1234,7 @@ tiOrSkip := { transactionId := { tio := int2bit(tid, 3), - tiFlag := '0'B, /* from originator */ + tiFlag := c_TIF_ORIG, /* from originator */ tIExtension := omit } }, @@ -1887,7 +1890,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -1920,7 +1923,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -1945,7 +1948,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -1979,7 +1982,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -2012,7 +2015,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -2046,7 +2049,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -2079,7 +2082,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '1'B, + tiFlag := c_TIF_REPL, tIExtension := omit } }, @@ -2101,7 +2104,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, @@ -2123,7 +2126,7 @@ tiOrSkip := { transactionId := { tio := tid, - tiFlag := '0'B, + tiFlag := c_TIF_ORIG, tIExtension := omit } }, diff --git a/msc/gen_links.sh b/msc/gen_links.sh index efb3770..6dea043 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -66,6 +66,11 @@ FILES="TELNETasp_PT.cc TELNETasp_PT.hh TELNETasp_PortType.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.SMPP/src +FILES="SMPP_EncDec.cc SMPP_Types.ttcn" +gen_links $DIR $FILES + + DIR=../library FILES="General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn MNCC_Types.ttcn MNCC_EncDec.cc MNCC_CodecPort.ttcn mncc.h MNCC_Emulation.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc GSUP_Types.ttcn GSUP_Emulation.ttcn " diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index c3db4e7..29b3f05 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc *.c" +FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc *.c" export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_GSUP -DUSE_MTP3_DISTRIBUTOR" -- To view, visit https://gerrit.osmocom.org/7696 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic06eb2016eb9979b8556366e4a909f3c0336aa92 Gerrit-PatchSet: 3 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder