Build failure of network:osmocom:nightly/openbsc in xUbuntu_17.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_17.04/i586 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 170s] | #define HAVE_INTTYPES_H 1 [ 170s] | #define HAVE_STDINT_H 1 [ 170s] | #define HAVE_UNISTD_H 1 [ 170s] | #define HAVE_DLFCN_H 1 [ 170s] | #define LT_OBJDIR ".libs/" [ 170s] | #define BUILD_SMPP 1 [ 170s] | #define STDC_HEADERS 1 [ 170s] | #define HAVE_DBI_DBD_H 1 [ 170s] | #define HAVE_PCAP_PCAP_H 1 [ 170s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 170s] | [ 170s] | configure: exit 0 [ 170s] [ 170s] debian/rules:32: recipe for target 'override_dh_auto_test' failed [ 170s] make[1]: *** [override_dh_auto_test] Error 1 [ 170s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 170s] debian/rules:13: recipe for target 'build' failed [ 170s] make: *** [build] Error 2 [ 170s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 170s] [ 170s] cumulus2 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:06:02 UTC 2018. [ 170s] [ 170s] ### VM INTERACTION START ### [ 172s] [ 165.069841] reboot: Power down [ 172s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_3/root.monitor: Permission denied [ 172s] ### VM INTERACTION END ### [ 172s] [ 172s] cumulus2 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:06:05 UTC 2018. [ 172s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/openbsc in xUbuntu_17.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_17.10/x86_64 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_17.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 134s] | #define HAVE_INTTYPES_H 1 [ 134s] | #define HAVE_STDINT_H 1 [ 134s] | #define HAVE_UNISTD_H 1 [ 134s] | #define HAVE_DLFCN_H 1 [ 134s] | #define LT_OBJDIR ".libs/" [ 134s] | #define BUILD_SMPP 1 [ 134s] | #define STDC_HEADERS 1 [ 134s] | #define HAVE_DBI_DBD_H 1 [ 134s] | #define HAVE_PCAP_PCAP_H 1 [ 134s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 134s] | [ 134s] | configure: exit 0 [ 134s] [ 134s] debian/rules:32: recipe for target 'override_dh_auto_test' failed [ 134s] make[1]: *** [override_dh_auto_test] Error 1 [ 134s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 134s] debian/rules:13: recipe for target 'build' failed [ 134s] make: *** [build] Error 2 [ 134s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 134s] [ 134s] lamb53 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:04:12 UTC 2018. [ 134s] [ 134s] ### VM INTERACTION START ### [ 138s] [ 128.808143] reboot: Power down [ 138s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_3/root.monitor: Permission denied [ 138s] ### VM INTERACTION END ### [ 138s] [ 138s] lamb53 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:04:16 UTC 2018. [ 138s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/openbsc in xUbuntu_16.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/xUbuntu_16.10/i586 Package network:osmocom:nightly/openbsc failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 173s] - [ 173s] -Testing nanobts_attr_nscv_get()... [ 173s] -result= 2d0b0500020362 [ 173s] -expected=2d0b0500020362 [ 173s] -ok. [ 173s] - [ 173s] -Done [ 173s] +backtrace() returned 4 addresses [ 173s] +/usr/src/packages/BUILD/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test(main+0x892) [0x5657f5e2] [ 173s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf6) [0xf7520276] [ 173s] +/usr/src/packages/BUILD/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test(+0x2686) [0x5657f686] [ 173s] ./testsuite.at:104: exit code was 134, expected 0 [ 173s] 15. testsuite.at:101: 15. nanobts_omlattr (testsuite.at:101): FAILED (testsuite.at:104) [ 173s] debian/rules:32: recipe for target 'override_dh_auto_test' failed [ 173s] make[1]: *** [override_dh_auto_test] Error 1 [ 173s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 173s] debian/rules:13: recipe for target 'build' failed [ 173s] make: *** [build] Error 2 [ 173s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 173s] [ 173s] cumulus3 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:05:28 UTC 2018. [ 173s] [ 173s] ### VM INTERACTION START ### [ 176s] [ 166.062994] reboot: Power down [ 176s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_2/root.monitor: Permission denied [ 176s] ### VM INTERACTION END ### [ 176s] [ 176s] cumulus3 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:05:32 UTC 2018. [ 176s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/openbsc in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/i586 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 155s] -Testing nanobts_attr_nscv_get()... [ 155s] -result= 2d0b0500020362 [ 155s] -expected=2[ 146.436292] serial8250: too much work for irq4 [ 155s] d0b0500020362 [ 155s] -ok. [ 155s] - [ 155s] -Done [ 155s] +backtrace() returned 4 addresses [ 155s] +/usr/src/packages/BUILD/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test(main+0x892) [0x56622362] [ 155s] +/lib/i386-linux-gnu/libc.so.6(__libc_start_main+0xf6) [0xf7537276] [ 155s] +/usr/src/packages/BUILD/openbsc/tests/nanobts_omlattr/nanobts_omlattr_test(+0x2406) [0x56622406] [ 155s] ./testsuite.at:104: exit code was 134, expected 0 [ 155s] 15. testsuite.at:101: 15. nanobts_omlattr (testsuite.at:101): FAILED (testsuite.at:104) [ 155s] debian/rules:32: recipe for target 'override_dh_auto_test' failed [ 155s] make[1]: *** [override_dh_auto_test] Error 1 [ 155s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 155s] debian/rules:13: recipe for target 'build' failed [ 155s] make: *** [build] Error 2 [ 155s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 155s] [ 155s] lamb55 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:05:19 UTC 2018. [ 155s] [ 155s] ### VM INTERACTION START ### [ 158s] [ 149.323603] reboot: Power down [ 158s] qemu-system-x86_64: Failed to unlink socket /var/cache/obs/worker/root_2/root.monitor: Permission denied [ 158s] ### VM INTERACTION END ### [ 158s] [ 158s] lamb55 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:05:23 UTC 2018. [ 158s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/openbsc in Debian_9.0/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/armv7l Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/armv7l Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 237s] | #define HAVE_STDINT_H 1 [ 237s] | #define HAVE_UNISTD_H 1 [ 237s] | #define HAVE_DLFCN_H 1 [ 237s] | #define LT_OBJDIR ".libs/" [ 237s] | #define BUILD_SMPP 1 [ 237s] | #define STDC_HEADERS 1 [ 237s] | #define HAVE_DBI_DBD_H 1 [ 237s] | #define HAVE_PCAP_PCAP_H 1 [ 237s] | #define HAVE_TM_GMTOFF_IN_TM 1 [ 237s] | [ 237s] | configure: exit 0 [ 237s] [ 237s] debian/rules:32: recipe for target 'override_dh_auto_test' failed [ 237s] make[1]: *** [override_dh_auto_test] Error 1 [ 237s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 237s] debian/rules:13: recipe for target 'build' failed [ 237s] make: *** [build] Error 2 [ 237s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 237s] [ 237s] armbuild02 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:23:49 UTC 2018. [ 237s] [ 237s] ### VM INTERACTION START ### [ 240s] [ 222.163167] SysRq : Power Off [ 240s] [ 222.183213] reboot: Power down [ 240s] qemu-system-aarch64: Failed to unlink socket /var/cache/obs/worker/root_5/root.monitor: Permission denied [ 240s] ### VM INTERACTION END ### [ 240s] [ 240s] armbuild02 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:23:52 UTC 2018. [ 240s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[MERGED] osmo-ttcn3-hacks[master]: gprs_gb: Add more comments to code
Harald Welte has submitted this change and it was merged. Change subject: gprs_gb: Add more comments to code .. gprs_gb: Add more comments to code Change-Id: I89ab4d8be112ca44a64fecbadc60ca8ac3e6bbea --- M gprs_gb/Test.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/gprs_gb/Test.ttcn b/gprs_gb/Test.ttcn index 732b3f5..e9cb40e 100644 --- a/gprs_gb/Test.ttcn +++ b/gprs_gb/Test.ttcn @@ -156,6 +156,7 @@ const octetstring gmm_auth_req := '081200102198c72477ea104895e8b959acc58b108182'O; + /* Wrap downlink GMM into LLC, encode + send it via BSSGP to PCU */ function tx_gmm(BIT1 c_r, in octetstring gmm_pdu, BIT4 sapi := c_LLC_SAPI_LLGMM) runs on dummy_CT { var PDU_LLC llc; @@ -171,6 +172,7 @@ BSSGP.send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); } + /* Establish BSSGP connection to PCU */ function f_bssgp_establish() runs on dummy_CT { timer T:= 60.0; @@ -185,6 +187,7 @@ log("BSSGP successfully initialized"); } + /* Send PS-PAGING via BSSGP to PCU, expect it to show up on L1/Um */ testcase TC_paging() runs on dummy_CT { var hexstring imsi := '262420123456789'H; var BssgpBvci bvci := 196; @@ -207,6 +210,7 @@ } } + /* Establish an UL TBF: Tune to ARFCN, send RACH, receive AGCH, enable TBF Rx */ function f_establish_ul_tbf() runs on dummy_CT { timer T := 5.0; var BCCH_tune_req tune_req := { { false, 871 }, true }; @@ -225,6 +229,7 @@ T.stop; } + /* Template fro uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn, template LlcBlocks blocks := {}, template boolean stall := false) := { data := { @@ -260,6 +265,7 @@ usf := usf } + /* Receive Template for Downlink ACK/NACK */ template RlcmacDlBlock tr_RLCMAC_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { mac_hdr := { @@ -293,12 +299,14 @@ } } + /* Template for Uplink MAC Control Header */ template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType pt, template boolean retry := false) := { payload_type := pt, spare := '0'B, retry := retry } + /* Template for Uplink Conntrol ACK */ template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), @@ -314,6 +322,7 @@ } } + /* Template for a LlcBlock (part of a LLC frame inside RlcMac?lDataBlock */ template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, BIT1 more := '0'B, boolean e := true) := { hdr := { length_ind := lengthof(data), @@ -323,11 +332,13 @@ payload := data } + /* compute a random TLLI; FIXME: what about TLLI prefix / local/foreign/...? */ function f_random_tlli() return GprsTlli { var GprsTlli tlli := float2int(rnd()* 4294967295.0); return tlli; } + /* Send a single Uplink Block via Um; Verify reception on BSSGP; Expect UL_ACK on Um */ function f_single_ul_block(GprsCodingScheme cs) runs on dummy_CT { var GprsTlli tlli := f_random_tlli(); var octetstring payload := '01020304'O; -- To view, visit https://gerrit.osmocom.org/7067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89ab4d8be112ca44a64fecbadc60ca8ac3e6bbea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-ttcn3-hacks[master]: l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK
Harald Welte has submitted this change and it was merged. Change subject: l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK .. l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK Change-Id: If2109ea87b15a0ed21b39ab7502813acb1d5dd1e --- M library/L1CTL_Types.ttcn 1 file changed, 44 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 61d80cf..f853057 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -43,7 +43,8 @@ L1CTL_TBF_CFG_REQ, L1CTL_TBF_CFG_CONF, L1CTL_DATA_TBF_REQ, - L1CTL_DATA_TBF_CONF + L1CTL_DATA_TBF_CONF, + L1CTL_DATA_ABS_REQ } with { variant "FIELDLENGTH(8)" }; type enumerated L1ctlCcchMode { @@ -190,6 +191,16 @@ OCT2padding } with { variant "" }; + type record L1ctlUlAbsInfo { + uint8_t tbf_nr, + L1ctlGprsCs cs, + uint8_t ts_nr, + OCT1padding, + uint32_tfn, + Arfcn arfcn, + OCT2padding2 + } with { variant "" }; + type record L1ctlFbsbFlags { BIT5padding, boolean sb, @@ -295,6 +306,7 @@ L1ctlHeader header, L1ctlUlInfo ul_info optional, L1ctlUlTbfInfo ul_info_tbf optional, + L1ctlUlAbsInfo ul_info_abs optional, L1ctlUlPayload payload } with { variant (ul_info) "PRESENCE(header.msg_type = L1CTL_RACH_REQ, header.msg_type = L1CTL_PARAM_REQ, @@ -305,6 +317,7 @@ header.msg_type = L1CTL_DM_REL_REQ, header.msg_type = L1CTL_TRAFFIC_REQ)" variant (ul_info_tbf) "PRESENCE(header.msg_type = L1CTL_DATA_TBF_REQ)" +variant (ul_info_abs) "PRESENCE(header.msg_type = L1CTL_DATA_ABS_REQ)" variant (payload) "CROSSTAG(fbsb_req, header.msg_type = L1CTL_FBSB_REQ; ccch_mode_req, header.msg_type = L1CTL_CCCH_MODE_REQ; tch_mode_req, header.msg_type = L1CTL_TCH_MODE_REQ; @@ -350,6 +363,7 @@ header := t_L1ctlHeader(L1CTL_RESET_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { reset_req := { reset_type := rst_type, @@ -363,6 +377,7 @@ header := t_L1ctlHeader(L1CTL_FBSB_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { fbsb_req := { arfcn := arfcn, @@ -399,6 +414,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { rach_req := { ra := ra, @@ -416,6 +432,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { dm_est_req := { tsc := tsc, @@ -436,6 +453,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { other := ''O } @@ -449,6 +467,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { other := l2_data } @@ -458,6 +477,7 @@ header := t_L1ctlHeader(L1CTL_TBF_CFG_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { tbf_cfg_req := { tbf_nr := 0, @@ -489,11 +509,34 @@ cs := cs, padding := ''O }, + ul_info_abs := omit, payload := { other := l2_data } } + template L1ctlUlMessage t_L1CTL_DATA_ABS_REQ(octetstring l2_data, Arfcn arfcn, +uint8_t ts, GsmFrameNumber fn, +L1ctlGprsCs cs :=
[MERGED] osmo-ttcn3-hacks[master]: gb: Fix IEI of t_BSSGP_CAUSE()
Harald Welte has submitted this change and it was merged. Change subject: gb: Fix IEI of t_BSSGP_CAUSE() .. gb: Fix IEI of t_BSSGP_CAUSE() Change-Id: I04b1744ad3e826592182de38e724191b8abd5a50 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index e94eadc..2f2a8ba 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -309,7 +309,7 @@ function t_BSSGP_CAUSE(template BssgpCause cause) return template Cause_BSSGP { var template Cause_BSSGP ret; - ret.iEI := '08'O; + ret.iEI := '07'O; ret.ext := '1'B; ret.lengthIndicator := { length1 := 1 }; if (isvalue(cause)) { -- To view, visit https://gerrit.osmocom.org/7066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04b1744ad3e826592182de38e724191b8abd5a50 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-ttcn3-hacks[master]: gprs_gb: Update config files
Harald Welte has submitted this change and it was merged. Change subject: gprs_gb: Update config files .. gprs_gb: Update config files Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46 --- M gprs_gb/Test.cfg 1 file changed, 24 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/gprs_gb/Test.cfg b/gprs_gb/Test.cfg index 2f11dfb..2c2ffb8 100644 --- a/gprs_gb/Test.cfg +++ b/gprs_gb/Test.cfg @@ -1,5 +1,8 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" + [LOGGING] -SourceInfoFormat := Single; #*.FileMask := LOG_ALL ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC @@ -8,8 +11,26 @@ #mp_local_udp_port := 23000 #mp_remote_ip := "192.168.100.196" #mp_remote_udp_port := 21000 -mp_nsei := 96 -mp_bvci := 196 +NS_Emulation.mp_local_ip := "127.0.0.1" +NS_Emulation.mp_local_udp_port := 23000 +NS_Emulation.mp_remote_ip := "127.0.0.1" +NS_Emulation.mp_remote_udp_port := 23001 +NS_Emulation.mp_nsei := 1234 +NS_Emulation.mp_nsvci := 1234 +Test.mp_gb_cfg := { + nsei := 1234, + bvci := 1234, + cell_id := { + ra_id := { + lai := { + mcc_mnc := '00101F'H, lac := 1 + }, + rac := 0 + }, + cell_id := 0 + }, + sgsn_role := true +} [TESTPORT_PARAMETERS] #*.BSCVTY.CTRL_MODE := "client" -- To view, visit https://gerrit.osmocom.org/7068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] osmo-ttcn3-hacks[master]: GSM_Types: Switch TLLI from uint32_t to OCT4
Harald Welte has submitted this change and it was merged. Change subject: GSM_Types: Switch TLLI from uint32_t to OCT4 .. GSM_Types: Switch TLLI from uint32_t to OCT4 The TLLI is not really a number, but an opaque 4-byte value. Change-Id: I0901340a2211eeeb899f312bcc60573fec11f220 --- M gprs_gb/Test.ttcn M library/GSM_Types.ttcn M library/Osmocom_Gb_Types.ttcn M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_EncDec.cc 5 files changed, 22 insertions(+), 26 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/gprs_gb/Test.ttcn b/gprs_gb/Test.ttcn index e9cb40e..7251ef9 100644 --- a/gprs_gb/Test.ttcn +++ b/gprs_gb/Test.ttcn @@ -47,7 +47,7 @@ var BSSGP_CT bssgp_component; var MmContext g_mmctx := { - tlli := 0, + tlli := ''O, n_u := 0 }; @@ -334,7 +334,7 @@ /* compute a random TLLI; FIXME: what about TLLI prefix / local/foreign/...? */ function f_random_tlli() return GprsTlli { - var GprsTlli tlli := float2int(rnd()* 4294967295.0); + var GprsTlli tlli := f_rnd_octstring(4); return tlli; } @@ -402,7 +402,7 @@ [] BSSGP.receive(tr_BD_BSSGP(?)) -> value bd { log("BSSGP Rx: ", bd); //log("GMM Rx: ", dec_PDU_L3_MS_SGSN(pdu.payload)); - g_mmctx.tlli := oct2int(bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI); + g_mmctx.tlli := bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI; tx_gmm(LLC_CR_DL_CMD, gmm_auth_req); } [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index b86bfd7..c7b7991 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -16,7 +16,7 @@ type integer GsmRxLev (0..63); type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; type uint32_t GsmTmsi; - type uint32_t GprsTlli; + type OCT4 GprsTlli; type hexstring GsmMcc length(3); type hexstring GsmMnc length(2 .. 3); type uint16_t GsmLac; diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 2f2a8ba..a3121b5 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -551,7 +551,7 @@ template PDU_BSSGP ts_BSSGP_DL_UD(GprsTlli tlli, octetstring pdu) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, - tLLI_current := f_oct_or_wc(tlli, 4), + tLLI_current := tlli, qoS_Profile := t_defaultQos, pDU_Lifetime := t_DefaultLifetime(65535), mS_Radio_Access_Capability := omit, @@ -608,7 +608,7 @@ } } - template PDU_BSSGP ts_BSSGP_UL_UD(OCT4 tlli, BssgpCellId cell_id, octetstring payload) := { + template PDU_BSSGP ts_BSSGP_UL_UD(GprsTlli tlli, BssgpCellId cell_id, octetstring payload) := { pDU_BSSGP_UL_UNITDATA := { bssgpPduType := '01'O, tLLI := tlli, @@ -631,7 +631,7 @@ template octetstring payload := ?) := { pDU_BSSGP_UL_UNITDATA := { bssgpPduType := '01'O, - tLLI := f_oct_or_wc(tlli, 4), + tLLI := tlli, qoS_Profile := ?, cell_Identifier := t_BSSGP_IE_CellId(cell_id), pFI := *, diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 076b1c1..2335c29 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -52,7 +52,9 @@ type record TenTlli { BIT2presence ('10'B), GprsTllitlli - } with { variant "" }; + } with { variant "" + variant (tlli) "BYTEORDER(first)" + }; type union GlobalTfiOrTlli { NullGlobalTfi global_tfi, @@ -78,7 +80,9 @@ type record IO_Tlli { BIT2presence ('10'B), GprsTllitlli - } with { variant "" }; + } with { variant "" + variant (tlli) "BYTEORDER(first)" + }; type record IIO_Tqi { BIT3presence ('110'B), PacketRequestReference pkt_req_ref @@ -244,6 +248,7 @@ variant (cont_res_tlli) "PRESENCE(cont_res_tlli_present =
[MERGED] osmo-ttcn3-hacks[master]: Gb: avoid warnings about not-running timers
Harald Welte has submitted this change and it was merged. Change subject: Gb: avoid warnings about not-running timers .. Gb: avoid warnings about not-running timers If we have T.timeout clause in an alt/altstep, we should put [T.running] as guard expression to avoid warnings about matching on timers never started - at least for timers where this is a valid situation. Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3 --- M library/BSSGP_Emulation.ttcn M library/NS_Emulation.ttcn 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c4628be..06e4733 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -453,7 +453,7 @@ } altstep as_blocked() runs on BSSGP_CT { - [] g_T1.timeout { + [g_T1.running] g_T1.timeout { f_sendUnblock(); } [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0)) { @@ -483,7 +483,7 @@ g_T1.stop; f_change_state(BVC_S_BLOCKED); } - [] g_T1.timeout { + [g_T1.running] g_T1.timeout { f_sendBlock(BSSGP_CAUSE_OM_INTERVENTION); } [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(g_cfg.bvci), 0)) -> value udi { diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 5924bbe..27acae2 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -142,13 +142,13 @@ var ASP_Event evt; /* transition to DEAD if t_alive times out */ - [] Tns_alive.timeout { + [Tns_alive.running] Tns_alive.timeout { log("Tns-alive expired: changing to DEAD_BLOCKED + starting Tns-test"); f_change_state(NSE_S_DEAD_BLOCKED); Tns_test.start; } - [] Tns_test.timeout { + [Tns_test.running] Tns_test.timeout { log("Tns-test expired: sending NS-ALIVE"); f_sendAlive(); } -- To view, visit https://gerrit.osmocom.org/7071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
Build failure of network:osmocom:nightly/openbsc in Debian_9.0/aarch64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/openbsc/Debian_9.0/aarch64 Package network:osmocom:nightly/openbsc failed to build in Debian_9.0/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly openbsc Last lines of build log: [ 473s] | configure:14953: checking that generated files are newer than configure [ 473s] | configure:14959: result: done [ 473s] | configure:15018: creating ./config.status [ 473s] | [ 473s] | ## -- ## [ 473s] | ## Running config.status. ## [ 473s] | ## -- ## [ 473s] | [ 473s] | This file was extended by openbsc config.status UNKNOWN, which was [ 473s] | generated by GNU Autoconf 2.69. Invocation command line was [ 473s] | [ 473s] | CONFIG_FILES= [ 473s] | CONFIG_HEADERS = [ 473s] | CONFIG_LINKS= [ 473s] | CONFIG_COMMANDS = [ 473s] | $ ./config.status [ 473s] | [ 473s] | on obs-arm-2 [ 473s] | [ 473s] | config.status:1201: creating openbsc.pc [ 473s] | config.status:1201: creating include/openbsc/Makefile [ 473s] | config.status:1201: creating include/Makefile [ 475s] | config[ 444.189309] sysrq: SysRq : Power Off [ 476s] [ 444.207105] reboot: Power down [ 476s] qemu-system-aarch64: Failed to unlink socket /var/cache/obs/worker/root_14/root.monitor: Permission denied [ 476s] ### VM INTERACTION END ### [ 476s] [ 476s] obs-arm-2 failed "build openbsc_1.0.0.20180303.dsc" at Sat Mar 3 20:30:33 UTC 2018. [ 476s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[PATCH] osmo-ttcn3-hacks[master]: gb: Fix IEI of t_BSSGP_CAUSE()
Review at https://gerrit.osmocom.org/7066 gb: Fix IEI of t_BSSGP_CAUSE() Change-Id: I04b1744ad3e826592182de38e724191b8abd5a50 --- M library/Osmocom_Gb_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/7066/1 diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index e94eadc..2f2a8ba 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -309,7 +309,7 @@ function t_BSSGP_CAUSE(template BssgpCause cause) return template Cause_BSSGP { var template Cause_BSSGP ret; - ret.iEI := '08'O; + ret.iEI := '07'O; ret.ext := '1'B; ret.lengthIndicator := { length1 := 1 }; if (isvalue(cause)) { -- To view, visit https://gerrit.osmocom.org/7066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04b1744ad3e826592182de38e724191b8abd5a50 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: Gb: avoid warnings about not-running timers
Review at https://gerrit.osmocom.org/7071 Gb: avoid warnings about not-running timers If we have T.timeout clause in an alt/altstep, we should put [T.running] as guard expression to avoid warnings about matching on timers never started - at least for timers where this is a valid situation. Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3 --- M library/BSSGP_Emulation.ttcn M library/NS_Emulation.ttcn 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/71/7071/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index c4628be..06e4733 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -453,7 +453,7 @@ } altstep as_blocked() runs on BSSGP_CT { - [] g_T1.timeout { + [g_T1.running] g_T1.timeout { f_sendUnblock(); } [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(g_cfg.bvci), 0)) { @@ -483,7 +483,7 @@ g_T1.stop; f_change_state(BVC_S_BLOCKED); } - [] g_T1.timeout { + [g_T1.running] g_T1.timeout { f_sendBlock(BSSGP_CAUSE_OM_INTERVENTION); } [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(g_cfg.bvci), 0)) -> value udi { diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn index 5924bbe..27acae2 100644 --- a/library/NS_Emulation.ttcn +++ b/library/NS_Emulation.ttcn @@ -142,13 +142,13 @@ var ASP_Event evt; /* transition to DEAD if t_alive times out */ - [] Tns_alive.timeout { + [Tns_alive.running] Tns_alive.timeout { log("Tns-alive expired: changing to DEAD_BLOCKED + starting Tns-test"); f_change_state(NSE_S_DEAD_BLOCKED); Tns_test.start; } - [] Tns_test.timeout { + [Tns_test.running] Tns_test.timeout { log("Tns-test expired: sending NS-ALIVE"); f_sendAlive(); } -- To view, visit https://gerrit.osmocom.org/7071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: GSM_Types: Switch TLLI from uint32_t to OCT4
Review at https://gerrit.osmocom.org/7070 GSM_Types: Switch TLLI from uint32_t to OCT4 The TLLI is not really a number, but an opaque 4-byte value. Change-Id: I0901340a2211eeeb899f312bcc60573fec11f220 --- M gprs_gb/Test.ttcn M library/GSM_Types.ttcn M library/Osmocom_Gb_Types.ttcn M library/RLCMAC_CSN1_Types.ttcn M library/RLCMAC_EncDec.cc 5 files changed, 22 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/7070/1 diff --git a/gprs_gb/Test.ttcn b/gprs_gb/Test.ttcn index e9cb40e..7251ef9 100644 --- a/gprs_gb/Test.ttcn +++ b/gprs_gb/Test.ttcn @@ -47,7 +47,7 @@ var BSSGP_CT bssgp_component; var MmContext g_mmctx := { - tlli := 0, + tlli := ''O, n_u := 0 }; @@ -334,7 +334,7 @@ /* compute a random TLLI; FIXME: what about TLLI prefix / local/foreign/...? */ function f_random_tlli() return GprsTlli { - var GprsTlli tlli := float2int(rnd()* 4294967295.0); + var GprsTlli tlli := f_rnd_octstring(4); return tlli; } @@ -402,7 +402,7 @@ [] BSSGP.receive(tr_BD_BSSGP(?)) -> value bd { log("BSSGP Rx: ", bd); //log("GMM Rx: ", dec_PDU_L3_MS_SGSN(pdu.payload)); - g_mmctx.tlli := oct2int(bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI); + g_mmctx.tlli := bd.bssgp.pDU_BSSGP_UL_UNITDATA.tLLI; tx_gmm(LLC_CR_DL_CMD, gmm_auth_req); } [] BSSGP.receive(t_BssgpStsInd(?, ?, BVC_S_UNBLOCKED)) { repeat; } diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index b86bfd7..c7b7991 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -16,7 +16,7 @@ type integer GsmRxLev (0..63); type integer GsmTsc (0..7) with { variant "FIELDLENGTH(8)" }; type uint32_t GsmTmsi; - type uint32_t GprsTlli; + type OCT4 GprsTlli; type hexstring GsmMcc length(3); type hexstring GsmMnc length(2 .. 3); type uint16_t GsmLac; diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index 2f2a8ba..a3121b5 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -551,7 +551,7 @@ template PDU_BSSGP ts_BSSGP_DL_UD(GprsTlli tlli, octetstring pdu) := { pDU_BSSGP_DL_UNITDATA := { bssgpPduType := '00'O, - tLLI_current := f_oct_or_wc(tlli, 4), + tLLI_current := tlli, qoS_Profile := t_defaultQos, pDU_Lifetime := t_DefaultLifetime(65535), mS_Radio_Access_Capability := omit, @@ -608,7 +608,7 @@ } } - template PDU_BSSGP ts_BSSGP_UL_UD(OCT4 tlli, BssgpCellId cell_id, octetstring payload) := { + template PDU_BSSGP ts_BSSGP_UL_UD(GprsTlli tlli, BssgpCellId cell_id, octetstring payload) := { pDU_BSSGP_UL_UNITDATA := { bssgpPduType := '01'O, tLLI := tlli, @@ -631,7 +631,7 @@ template octetstring payload := ?) := { pDU_BSSGP_UL_UNITDATA := { bssgpPduType := '01'O, - tLLI := f_oct_or_wc(tlli, 4), + tLLI := tlli, qoS_Profile := ?, cell_Identifier := t_BSSGP_IE_CellId(cell_id), pFI := *, diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 076b1c1..2335c29 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -52,7 +52,9 @@ type record TenTlli { BIT2presence ('10'B), GprsTllitlli - } with { variant "" }; + } with { variant "" + variant (tlli) "BYTEORDER(first)" + }; type union GlobalTfiOrTlli { NullGlobalTfi global_tfi, @@ -78,7 +80,9 @@ type record IO_Tlli { BIT2presence ('10'B), GprsTllitlli - } with { variant "" }; + } with { variant "" + variant (tlli) "BYTEORDER(first)" + }; type record IIO_Tqi { BIT3presence ('110'B), PacketRequestReference pkt_req_ref @@ -244,6 +248,7 @@ variant (cont_res_tlli) "PRESENCE(cont_res_tlli_present = '1'B)" variant (pkt_ta)"PRESENCE(pkt_ta_present = '1'B)" variant (pwr_ctrl) "PRESENCE(pwr_ctrl_present
[PATCH] osmo-ttcn3-hacks[master]: l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK
Review at https://gerrit.osmocom.org/7069 l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK Change-Id: If2109ea87b15a0ed21b39ab7502813acb1d5dd1e --- M library/L1CTL_Types.ttcn 1 file changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/7069/1 diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 61d80cf..f853057 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -43,7 +43,8 @@ L1CTL_TBF_CFG_REQ, L1CTL_TBF_CFG_CONF, L1CTL_DATA_TBF_REQ, - L1CTL_DATA_TBF_CONF + L1CTL_DATA_TBF_CONF, + L1CTL_DATA_ABS_REQ } with { variant "FIELDLENGTH(8)" }; type enumerated L1ctlCcchMode { @@ -190,6 +191,16 @@ OCT2padding } with { variant "" }; + type record L1ctlUlAbsInfo { + uint8_t tbf_nr, + L1ctlGprsCs cs, + uint8_t ts_nr, + OCT1padding, + uint32_tfn, + Arfcn arfcn, + OCT2padding2 + } with { variant "" }; + type record L1ctlFbsbFlags { BIT5padding, boolean sb, @@ -295,6 +306,7 @@ L1ctlHeader header, L1ctlUlInfo ul_info optional, L1ctlUlTbfInfo ul_info_tbf optional, + L1ctlUlAbsInfo ul_info_abs optional, L1ctlUlPayload payload } with { variant (ul_info) "PRESENCE(header.msg_type = L1CTL_RACH_REQ, header.msg_type = L1CTL_PARAM_REQ, @@ -305,6 +317,7 @@ header.msg_type = L1CTL_DM_REL_REQ, header.msg_type = L1CTL_TRAFFIC_REQ)" variant (ul_info_tbf) "PRESENCE(header.msg_type = L1CTL_DATA_TBF_REQ)" +variant (ul_info_abs) "PRESENCE(header.msg_type = L1CTL_DATA_ABS_REQ)" variant (payload) "CROSSTAG(fbsb_req, header.msg_type = L1CTL_FBSB_REQ; ccch_mode_req, header.msg_type = L1CTL_CCCH_MODE_REQ; tch_mode_req, header.msg_type = L1CTL_TCH_MODE_REQ; @@ -350,6 +363,7 @@ header := t_L1ctlHeader(L1CTL_RESET_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { reset_req := { reset_type := rst_type, @@ -363,6 +377,7 @@ header := t_L1ctlHeader(L1CTL_FBSB_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { fbsb_req := { arfcn := arfcn, @@ -399,6 +414,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { rach_req := { ra := ra, @@ -416,6 +432,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { dm_est_req := { tsc := tsc, @@ -436,6 +453,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { other := ''O } @@ -449,6 +467,7 @@ padding := ''O }, ul_info_tbf := omit, + ul_info_abs := omit, payload := { other := l2_data } @@ -458,6 +477,7 @@ header := t_L1ctlHeader(L1CTL_TBF_CFG_REQ), ul_info := omit, ul_info_tbf := omit, + ul_info_abs := omit, payload := { tbf_cfg_req := { tbf_nr := 0, @@ -489,11 +509,34 @@ cs := cs, padding := ''O }, + ul_info_abs := omit, payload := { other := l2_data } } + template L1ctlUlMessage t_L1CTL_DATA_ABS_REQ(octetstring l2_data, Arfcn arfcn, +uint8_t ts, GsmFrameNumber fn, +L1ctlGprsCs cs := L1CTL_CS1, +uint8_t tbf_nr := 0) := { + header := t_L1ctlHeader(L1CTL_DATA_ABS_REQ), +
[PATCH] osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN ...
Review at https://gerrit.osmocom.org/7073 BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN role This code had been intended to be used, but commented out, and never really been completed or tested. Change-Id: Iaa573219548f2a6a2eb13408fec65c55f9e88ddb --- M library/BSSGP_Emulation.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 61 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/7073/1 diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index 06e4733..c7766dc 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -496,12 +496,13 @@ } /* simply acknowledge all Flow Control Messages */ -/* - [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_BVC), g_cfg.bvci) { - BSCP.send(f_BnsUdReq(t_BVC_FC_BVC_ACK), g_cfg.bvci); + [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(tr_BVC_FC_BVC, g_cfg.bvci)) -> value udi { + var OCT1 tag := udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + BSCP.send(f_BnsUdReq(t_BVC_FC_BVC_ACK(tag), g_cfg.bvci)); } - [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_MS), g_cfg.bvci) { - BSCP.send(f_BnsUdReq(t_BVC_FC_MS_ACK), g_cfg.bvci); +/* + [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_MS, g_cfg.bvci)) { + BSCP.send(f_BnsUdReq(t_BVC_FC_MS_ACK, g_cfg.bvci)); } */ diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index a3121b5..f943c9c 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -446,7 +446,7 @@ iEI := '1E'O, ext := '1'B, lengthIndicator := { - length1 := 2 + length1 := 1 }, unstructured_Value := tag }, @@ -462,7 +462,7 @@ iEI := '03'O, ext := '1'B, lengthIndicator := { - length1 := 1 + length1 := 2 }, r_Value := f_oct_or_wc(bucket_leak_rate, 2) }, @@ -487,6 +487,59 @@ flow_Control_Granularity := omit } } + template PDU_BSSGP tr_BVC_FC_BVC(template uint16_t bmax := ?, +template uint16_t bucket_leak_rate := ?, +template uint16_t bmax_default_ms := ?, +template uint16_t r_default_ms := ?, +template OCT1 tag := ?) := { + pDU_BSSGP_FLOW_CONTROL_BVC := { + bssgpPduType := '26'O, + tag := { + iEI := '1E'O, + ext := '1'B, + lengthIndicator := { + length1 := 1 + }, + unstructured_Value := tag + }, + bVC_Bucket_Size := { + iEI := '05'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + bmax := f_oct_or_wc(bmax, 2) + }, + bucket_Leak_Rate := { + iEI := '03'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + r_Value := f_oct_or_wc(bucket_leak_rate, 2) + }, + bmax_default_MS := { + iEI := '01'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + bmax := f_oct_or_wc(bmax_default_ms, 2) + }, + r_default_MS := { + iEI := '1C'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + r_default_MS_value := f_oct_or_wc(r_default_ms, 2) + }, + bucket_Full_Ratio := *, + bVC_Measurement := *, +
[PATCH] osmo-ttcn3-hacks[master]: rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648
Review at https://gerrit.osmocom.org/7072 rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648 It's RRBP_Nplus12_or_22_mod_2715648 not RRBP_Nplus22_or_22_mod_2715648 Change-Id: Idb2ab447611a0571292b8cb31e9f279d0e98966f --- M library/RLCMAC_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/7072/1 diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index a03dd86..a30a43c 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -17,7 +17,7 @@ type enumerated MacRrbp { RRBP_Nplus13_mod_2715648('00'B), RRBP_Nplus17_or_18_mod_2715648 ('01'B), - RRBP_Nplus22_or_22_mod_2715648 ('10'B), + RRBP_Nplus21_or_22_mod_2715648 ('10'B), RRBP_Nplus26_mod_2715648('11'B) } with { variant "FIELDLENGTH(2)" }; -- To view, visit https://gerrit.osmocom.org/7072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb2ab447611a0571292b8cb31e9f279d0e98966f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: gprs_gb: Update config files
Review at https://gerrit.osmocom.org/7068 gprs_gb: Update config files Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46 --- M gprs_gb/Test.cfg 1 file changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/7068/1 diff --git a/gprs_gb/Test.cfg b/gprs_gb/Test.cfg index 2f11dfb..2c2ffb8 100644 --- a/gprs_gb/Test.cfg +++ b/gprs_gb/Test.cfg @@ -1,5 +1,8 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" + [LOGGING] -SourceInfoFormat := Single; #*.FileMask := LOG_ALL ConsoleMask := ERROR | WARNING | TESTCASE | TIMEROP_START | DEBUG_ENCDEC @@ -8,8 +11,26 @@ #mp_local_udp_port := 23000 #mp_remote_ip := "192.168.100.196" #mp_remote_udp_port := 21000 -mp_nsei := 96 -mp_bvci := 196 +NS_Emulation.mp_local_ip := "127.0.0.1" +NS_Emulation.mp_local_udp_port := 23000 +NS_Emulation.mp_remote_ip := "127.0.0.1" +NS_Emulation.mp_remote_udp_port := 23001 +NS_Emulation.mp_nsei := 1234 +NS_Emulation.mp_nsvci := 1234 +Test.mp_gb_cfg := { + nsei := 1234, + bvci := 1234, + cell_id := { + ra_id := { + lai := { + mcc_mnc := '00101F'H, lac := 1 + }, + rac := 0 + }, + cell_id := 0 + }, + sgsn_role := true +} [TESTPORT_PARAMETERS] #*.BSCVTY.CTRL_MODE := "client" -- To view, visit https://gerrit.osmocom.org/7068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[PATCH] osmo-ttcn3-hacks[master]: gprs_gb: Add more comments to code
Review at https://gerrit.osmocom.org/7067 gprs_gb: Add more comments to code Change-Id: I89ab4d8be112ca44a64fecbadc60ca8ac3e6bbea --- M gprs_gb/Test.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/7067/1 diff --git a/gprs_gb/Test.ttcn b/gprs_gb/Test.ttcn index 732b3f5..e9cb40e 100644 --- a/gprs_gb/Test.ttcn +++ b/gprs_gb/Test.ttcn @@ -156,6 +156,7 @@ const octetstring gmm_auth_req := '081200102198c72477ea104895e8b959acc58b108182'O; + /* Wrap downlink GMM into LLC, encode + send it via BSSGP to PCU */ function tx_gmm(BIT1 c_r, in octetstring gmm_pdu, BIT4 sapi := c_LLC_SAPI_LLGMM) runs on dummy_CT { var PDU_LLC llc; @@ -171,6 +172,7 @@ BSSGP.send(ts_BSSGP_DL_UD(g_mmctx.tlli, enc_PDU_LLC(llc))); } + /* Establish BSSGP connection to PCU */ function f_bssgp_establish() runs on dummy_CT { timer T:= 60.0; @@ -185,6 +187,7 @@ log("BSSGP successfully initialized"); } + /* Send PS-PAGING via BSSGP to PCU, expect it to show up on L1/Um */ testcase TC_paging() runs on dummy_CT { var hexstring imsi := '262420123456789'H; var BssgpBvci bvci := 196; @@ -207,6 +210,7 @@ } } + /* Establish an UL TBF: Tune to ARFCN, send RACH, receive AGCH, enable TBF Rx */ function f_establish_ul_tbf() runs on dummy_CT { timer T := 5.0; var BCCH_tune_req tune_req := { { false, 871 }, true }; @@ -225,6 +229,7 @@ T.stop; } + /* Template fro uplink Data block */ template RlcmacUlBlock t_RLCMAC_UL_DATA(template uint5_t tfi, template uint4_t cv, template uint7_t bsn, template LlcBlocks blocks := {}, template boolean stall := false) := { data := { @@ -260,6 +265,7 @@ usf := usf } + /* Receive Template for Downlink ACK/NACK */ template RlcmacDlBlock tr_RLCMAC_ACK_NACK(template uint5_t ul_tfi, template GprsTlli tlli := ?) := { ctrl := { mac_hdr := { @@ -293,12 +299,14 @@ } } + /* Template for Uplink MAC Control Header */ template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType pt, template boolean retry := false) := { payload_type := pt, spare := '0'B, retry := retry } + /* Template for Uplink Conntrol ACK */ template RlcmacUlBlock ts_RLCMAC_CTRL_ACK(GprsTlli tlli, CtrlAck ack := MS_RCVD_TWO_RLC_SAME_RTI_DIFF_RBSN) := { ctrl := { mac_hdr := t_RLCMAC_UlMacCtrlH(MAC_PT_RLCMAC_NO_OPT), @@ -314,6 +322,7 @@ } } + /* Template for a LlcBlock (part of a LLC frame inside RlcMac?lDataBlock */ template LlcBlock t_RLCMAC_LLCBLOCK(octetstring data, BIT1 more := '0'B, boolean e := true) := { hdr := { length_ind := lengthof(data), @@ -323,11 +332,13 @@ payload := data } + /* compute a random TLLI; FIXME: what about TLLI prefix / local/foreign/...? */ function f_random_tlli() return GprsTlli { var GprsTlli tlli := float2int(rnd()* 4294967295.0); return tlli; } + /* Send a single Uplink Block via Um; Verify reception on BSSGP; Expect UL_ACK on Um */ function f_single_ul_block(GprsCodingScheme cs) runs on dummy_CT { var GprsTlli tlli := f_random_tlli(); var octetstring payload := '01020304'O; -- To view, visit https://gerrit.osmocom.org/7067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89ab4d8be112ca44a64fecbadc60ca8ac3e6bbea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald Welte
[MERGED] osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN ...
Harald Welte has submitted this change and it was merged. Change subject: BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN role .. BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN role This code had been intended to be used, but commented out, and never really been completed or tested. Change-Id: Iaa573219548f2a6a2eb13408fec65c55f9e88ddb --- M library/BSSGP_Emulation.ttcn M library/Osmocom_Gb_Types.ttcn 2 files changed, 61 insertions(+), 7 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSGP_Emulation.ttcn b/library/BSSGP_Emulation.ttcn index 06e4733..c7766dc 100644 --- a/library/BSSGP_Emulation.ttcn +++ b/library/BSSGP_Emulation.ttcn @@ -496,12 +496,13 @@ } /* simply acknowledge all Flow Control Messages */ -/* - [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_BVC), g_cfg.bvci) { - BSCP.send(f_BnsUdReq(t_BVC_FC_BVC_ACK), g_cfg.bvci); + [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(tr_BVC_FC_BVC, g_cfg.bvci)) -> value udi { + var OCT1 tag := udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value; + BSCP.send(f_BnsUdReq(t_BVC_FC_BVC_ACK(tag), g_cfg.bvci)); } - [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_MS), g_cfg.bvci) { - BSCP.send(f_BnsUdReq(t_BVC_FC_MS_ACK), g_cfg.bvci); +/* + [g_cfg.sgsn_role] BSCP.receive(f_BnsUdInd(t_BVC_FC_MS, g_cfg.bvci)) { + BSCP.send(f_BnsUdReq(t_BVC_FC_MS_ACK, g_cfg.bvci)); } */ diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn index a3121b5..f943c9c 100644 --- a/library/Osmocom_Gb_Types.ttcn +++ b/library/Osmocom_Gb_Types.ttcn @@ -446,7 +446,7 @@ iEI := '1E'O, ext := '1'B, lengthIndicator := { - length1 := 2 + length1 := 1 }, unstructured_Value := tag }, @@ -462,7 +462,7 @@ iEI := '03'O, ext := '1'B, lengthIndicator := { - length1 := 1 + length1 := 2 }, r_Value := f_oct_or_wc(bucket_leak_rate, 2) }, @@ -487,6 +487,59 @@ flow_Control_Granularity := omit } } + template PDU_BSSGP tr_BVC_FC_BVC(template uint16_t bmax := ?, +template uint16_t bucket_leak_rate := ?, +template uint16_t bmax_default_ms := ?, +template uint16_t r_default_ms := ?, +template OCT1 tag := ?) := { + pDU_BSSGP_FLOW_CONTROL_BVC := { + bssgpPduType := '26'O, + tag := { + iEI := '1E'O, + ext := '1'B, + lengthIndicator := { + length1 := 1 + }, + unstructured_Value := tag + }, + bVC_Bucket_Size := { + iEI := '05'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + bmax := f_oct_or_wc(bmax, 2) + }, + bucket_Leak_Rate := { + iEI := '03'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + r_Value := f_oct_or_wc(bucket_leak_rate, 2) + }, + bmax_default_MS := { + iEI := '01'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + bmax := f_oct_or_wc(bmax_default_ms, 2) + }, + r_default_MS := { + iEI := '1C'O, + ext := '1'B, + lengthIndicator := { + length1 := 2 + }, + r_default_MS_value :=
osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix automatic BVC flow control ACK in SGSN ...
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7073 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iaa573219548f2a6a2eb13408fec65c55f9e88ddb Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Idb2ab447611a0571292b8cb31e9f279d0e98966f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-ttcn3-hacks[master]: rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648
Harald Welte has submitted this change and it was merged. Change subject: rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648 .. rlcmac: Fix name of RRBP_Nplus21_or_22_mod_2715648 It's RRBP_Nplus12_or_22_mod_2715648 not RRBP_Nplus22_or_22_mod_2715648 Change-Id: Idb2ab447611a0571292b8cb31e9f279d0e98966f --- M library/RLCMAC_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/RLCMAC_Types.ttcn b/library/RLCMAC_Types.ttcn index a03dd86..a30a43c 100644 --- a/library/RLCMAC_Types.ttcn +++ b/library/RLCMAC_Types.ttcn @@ -17,7 +17,7 @@ type enumerated MacRrbp { RRBP_Nplus13_mod_2715648('00'B), RRBP_Nplus17_or_18_mod_2715648 ('01'B), - RRBP_Nplus22_or_22_mod_2715648 ('10'B), + RRBP_Nplus21_or_22_mod_2715648 ('10'B), RRBP_Nplus26_mod_2715648('11'B) } with { variant "FIELDLENGTH(2)" }; -- To view, visit https://gerrit.osmocom.org/7072 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb2ab447611a0571292b8cb31e9f279d0e98966f Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-ttcn3-hacks[master]: l1ctl: Add L1CTL_DATA_ABS_REQ for PACKET UPLINK ACK
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7069 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If2109ea87b15a0ed21b39ab7502813acb1d5dd1e Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: gb: Fix IEI of t_BSSGP_CAUSE()
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7066 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I04b1744ad3e826592182de38e724191b8abd5a50 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: gprs_gb: Add more comments to code
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7067 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89ab4d8be112ca44a64fecbadc60ca8ac3e6bbea Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: Gb: avoid warnings about not-running timers
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7071 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I96db5c288e0b9c47539cccab8ae7a886d0b9fff3 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: GSM_Types: Switch TLLI from uint32_t to OCT4
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7070 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I0901340a2211eeeb899f312bcc60573fec11f220 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-ttcn3-hacks[master]: gprs_gb: Update config files
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7068 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I647c2d99fe83a892a0bda89db1808066e2eb1d46 Gerrit-PatchSet: 1 Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Owner: Harald WelteGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: rsl: remove unused variable
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7065 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic07edfa04c2184bff4a043e96e69c07df38607e4 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
osmo-bts[master]: ipac: fix log output
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I61044edc0672b268aeebf48b59a772887703399f Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-bts[master]: ipac: fix log output
Harald Welte has submitted this change and it was merged. Change subject: ipac: fix log output .. ipac: fix log output The current log output logs connect_ip connect_port speech mode and payload type over multiple lines and without logging context (lchan name). Also the logging level incorrectly set. - shrink log output into one line. - add context (lchan name) - encode ip/port into human readable form Change-Id: I61044edc0672b268aeebf48b59a772887703399f Closes: OS#3001 --- M src/common/rsl.c 1 file changed, 10 insertions(+), 12 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index 98e8913..d048c82 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1689,6 +1689,7 @@ int rc, inc_ip_port = 0, port; char *name; struct in_addr ia; + struct in_addr addr; if (dch->c.msg_type == RSL_MT_IPAC_CRCX) name = "CRCX"; @@ -1705,31 +1706,28 @@ return tx_ipac_XXcx_nack(lchan, RSL_ERR_MAND_IE_ERROR, 0, dch->c.msg_type); + LOGP(DRSL, LOGL_DEBUG, "%s IPAC_%s: ", gsm_lchan_name(lchan), name); if (TLVP_PRES_LEN(, RSL_IE_IPAC_REMOTE_IP, 4)) { connect_ip = tlvp_val32_unal(, RSL_IE_IPAC_REMOTE_IP); - LOGP(DRSL, LOGL_NOTICE, "connect_ip %d \n", connect_ip ); + addr.s_addr = connect_ip; + LOGPC(DRSL, LOGL_DEBUG, "connect_ip=%s ", inet_ntoa(addr)); } - else - LOGP(DRSL, LOGL_NOTICE, "CRCX does not specify a remote IP\n"); if (TLVP_PRES_LEN(, RSL_IE_IPAC_REMOTE_PORT, 2)) { connect_port = tlvp_val16_unal(, RSL_IE_IPAC_REMOTE_PORT); - LOGP(DRSL, LOGL_NOTICE, "connect_port %d \n", connect_port ); + LOGPC(DRSL, LOGL_DEBUG, "connect_port=%u ", + ntohs(connect_port)); } - else - LOGP(DRSL, LOGL_NOTICE, "CRCX does not specify a remote port\n"); speech_mode = TLVP_VAL(, RSL_IE_IPAC_SPEECH_MODE); if (speech_mode) - LOGP(DRSL, LOGL_NOTICE, "speech mode: %d\n", *speech_mode); - else - LOGP(DRSL, LOGL_NOTICE, "speech mode: none\n"); + LOGPC(DRSL, LOGL_DEBUG, "speech_mode=%u ", *speech_mode); payload_type = TLVP_VAL(, RSL_IE_IPAC_RTP_PAYLOAD); if (payload_type) - LOGP(DRSL, LOGL_NOTICE, "payload type: %d\n",*payload_type); - else - LOGP(DRSL, LOGL_NOTICE, "payload type: none\n"); + LOGPC(DRSL, LOGL_DEBUG, "payload_type=%u ", *payload_type); + + LOGPC(DRSL, LOGL_DEBUG, "\n"); payload_type2 = TLVP_VAL(, RSL_IE_IPAC_RTP_PAYLOAD2); -- To view, visit https://gerrit.osmocom.org/7064 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61044edc0672b268aeebf48b59a772887703399f Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-msc[master]: msc_vlr_tests: improve cipher mode coverage
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7057 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id23bc245d4b5707edcd27c44db272fbb211bf9bd Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmocore[master]: features: move bts feature related functionality to libosmocore
Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/7034 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Id0c35aef11aa49aa40abe7deef1f9dbd12210776 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-HasComments: No
[MERGED] libosmocore[master]: features: move bts feature related functionality to libosmocore
Harald Welte has submitted this change and it was merged. Change subject: features: move bts feature related functionality to libosmocore .. features: move bts feature related functionality to libosmocore osmo-bsc and osmo-bts share enums and value strings to describe feature data that is exchanged via OML (manufacturer id) on startup. Also the functions to set and get the respecitive bits in the feature bitvectors are in osmo-bsc and osmo-bts. This is a code duplication and should be resolved. - add enum osmo_bts_features (replaces enum gsm_bts_features) - add osmo_bts_features_descs (replaces gsm_bts_features_descs) - add osmo_bts_set_feature (replaces gsm_btsmodel_set_feature) - add osmo_bts_has_feature (replaces gsm_btsmodel_has_feature) Change-Id: Id0c35aef11aa49aa40abe7deef1f9dbd12210776 --- M include/Makefile.am A include/osmocom/gsm/bts_features.h M src/gsm/Makefile.am A src/gsm/bts_features.c M src/gsm/libosmogsm.map 5 files changed, 95 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/Makefile.am b/include/Makefile.am index 8b05f80..f82012f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -67,6 +67,7 @@ osmocom/gsm/a5.h \ osmocom/gsm/abis_nm.h \ osmocom/gsm/apn.h \ + osmocom/gsm/bts_features.h \ osmocom/gsm/comp128.h \ osmocom/gsm/comp128v23.h \ osmocom/gsm/bitvec_gsm.h \ diff --git a/include/osmocom/gsm/bts_features.h b/include/osmocom/gsm/bts_features.h new file mode 100644 index 000..f9b0142 --- /dev/null +++ b/include/osmocom/gsm/bts_features.h @@ -0,0 +1,43 @@ +#pragma once + +#include +#include + +#define MAX_BTS_FEATURES 128 + +/* N. B: always add new features to the end of the list (right before _NUM_BTS_FEAT) to avoid breaking compatibility + with BTS compiled against earlier version of this header. Also make sure that the description strings + gsm_bts_features_descs[] in gsm_data.c are also updated accordingly! */ +enum osmo_bts_features { + BTS_FEAT_HSCSD, + BTS_FEAT_GPRS, + BTS_FEAT_EGPRS, + BTS_FEAT_ECSD, + BTS_FEAT_HOPPING, + BTS_FEAT_MULTI_TSC, + BTS_FEAT_OML_ALERTS, + BTS_FEAT_AGCH_PCH_PROP, + BTS_FEAT_CBCH, + BTS_FEAT_SPEECH_F_V1, + BTS_FEAT_SPEECH_H_V1, + BTS_FEAT_SPEECH_F_EFR, + BTS_FEAT_SPEECH_F_AMR, + BTS_FEAT_SPEECH_H_AMR, + _NUM_BTS_FEAT +}; + +extern const struct value_string osmo_bts_features_descs[]; + +const char *osmo_bts_feature_name(enum osmo_bts_features feature); + +inline int osmo_bts_set_feature(struct bitvec *features, enum osmo_bts_features feature) +{ + OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES); + return bitvec_set_bit_pos(features, feature, 1); +} + +inline bool osmo_bts_has_feature(const struct bitvec *features, enum osmo_bts_features feature) +{ + OSMO_ASSERT(_NUM_BTS_FEAT < MAX_BTS_FEATURES); + return bitvec_get_bit_pos(features, feature); +} diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index b0d6dbd..0439ce6 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -30,7 +30,7 @@ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ gsup.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ - gsm23003.c mncc.c + gsm23003.c mncc.c bts_features.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la diff --git a/src/gsm/bts_features.c b/src/gsm/bts_features.c new file mode 100644 index 000..4ec24fa --- /dev/null +++ b/src/gsm/bts_features.c @@ -0,0 +1,48 @@ +/*! \file bts_features.c + * osmo-bts features. */ +/* + * (C) 2018 by sysmocom s.f.m.c. GmbH + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#include + +const struct value_string osmo_bts_features_descs[] = { + { BTS_FEAT_HSCSD, "HSCSD" }, + {
osmo-bsc[master]: gsm_data: use feature list from libosmocore
Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/6993/4//COMMIT_MSG Commit Message: Line 13: - use feature list functionality provided by libosmocore this depends on a certain new feature in libosmcoore, henc you must include the Change-Id of the libosmcoore change here. -- To view, visit https://gerrit.osmocom.org/6993 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3e80517539cc5d0e5d8189d434a5e3cc0fdea1a0 Gerrit-PatchSet: 4 Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-HasComments: Yes
[MERGED] osmo-msc[master]: msc_vlr_tests: improve cipher mode coverage
Harald Welte has submitted this change and it was merged. Change subject: msc_vlr_tests: improve cipher mode coverage .. msc_vlr_tests: improve cipher mode coverage Actually call msc_vlr_set_ciph_mode() and wrap away a_iface_tx_cipher_mode() and ranap_iu_tx_sec_mode_cmd(). Hence we'll see decisions and errors in msc_vlr_set_ciph_mode() as well. Change-Id: Id23bc245d4b5707edcd27c44db272fbb211bf9bd --- M src/libmsc/gsm_04_08.c M tests/msc_vlr/Makefile.am M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c 7 files changed, 148 insertions(+), 55 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 18f8412..995bbf6 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -3611,10 +3611,11 @@ osmo_static_assert(sizeof(((struct gsm0808_encrypt_info*)0)->key) >= sizeof(((struct osmo_auth_vector*)0)->kc), gsm0808_encrypt_info_key_fits_osmo_auth_vec_kc); -/* VLR asks us to start using ciphering */ -static int msc_vlr_set_ciph_mode(void *msc_conn_ref, -bool umts_aka, -bool retrieve_imeisv) +/* VLR asks us to start using ciphering. + * (Keep non-static to allow regression testing on this function.) */ +int msc_vlr_set_ciph_mode(void *msc_conn_ref, + bool umts_aka, + bool retrieve_imeisv) { struct gsm_subscriber_connection *conn = msc_conn_ref; struct vlr_subscr *vsub; diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 43b4e07..8194f22 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -32,6 +32,8 @@ -Wl,--wrap=osmo_get_rand_id \ -Wl,--wrap=msc_mgcp_call_release \ -Wl,--wrap=msc_mgcp_call_assignment \ + -Wl,--wrap=a_iface_tx_cipher_mode \ + -Wl,--wrap=ranap_iu_tx_sec_mode_cmd \ $(NULL) LDADD = \ diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err index 2899daa..ea3b989 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err @@ -491,7 +491,9 @@ DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode -- sending SecurityModeControl for IMSI:90170010650 +DMM -> SECURITY MODE CONTROL IMSI:90170010650 +- sending SecurityModeControl for UE ctx 42 send_ck=0 new_key=1 +- ...ik=27497388b6cb044648f396aa155b95ef DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_WAIT_CIPH DMM IMSI:90170010650: bump: conn still being established (SUBSCR_CONN_S_NEW) DREF IMSI:90170010650: MSC conn use - dtap == 1 (0x4) @@ -669,7 +671,9 @@ DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: got VLR_AUTH_RES_PASSED DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode -- sending SecurityModeControl for MSISDN:42342 +DMM -> SECURITY MODE CONTROL MSISDN:42342 +- sending SecurityModeControl for UE ctx 42 send_ck=0 new_key=1 +- ...ik=27497388b6cb044648f396aa155b95ef DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DMM MSISDN:42342: bump: conn still being established (SUBSCR_CONN_S_NEW) DREF MSISDN:42342: MSC conn use - dtap == 1 (0x4) @@ -798,7 +802,9 @@ DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: got VLR_AUTH_RES_PASSED DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: _proc_arq_vlr_node2() DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: Set Ciphering Mode -- sending SecurityModeControl for MSISDN:42342 +DMM -> SECURITY MODE CONTROL MSISDN:42342 +- sending SecurityModeControl for UE ctx 42 send_ck=0 new_key=1 +- ...ik=1159ec926a50e98c034a6b7d7c9f418d DVLR Process_Access_Request_VLR(90170010650){PR_ARQ_S_WAIT_AUTH}: state_chg to PR_ARQ_S_WAIT_CIPH DMM MSISDN:42342: bump: conn still being established (SUBSCR_CONN_S_NEW) DREF MSISDN:42342: MSC conn use - dtap == 1 (0x4) @@ -1466,7 +1472,9 @@ DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: Received Event VLR_ULA_E_AUTH_RES DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: vlr_loc_upd_post_auth() DVLR vlr_lu_fsm(90170010650){VLR_ULA_S_WAIT_AUTH}: Set Ciphering Mode -- sending SecurityModeControl for IMSI:90170010650 +DMM -> SECURITY MODE CONTROL IMSI:90170010650 +- sending
[MERGED] osmo-bts[master]: rsl: remove unused variable
Harald Welte has submitted this change and it was merged. Change subject: rsl: remove unused variable .. rsl: remove unused variable The variable btsb in rsl_rx_mode_modif() is set but not used. - remove btsb Change-Id: Ic07edfa04c2184bff4a043e96e69c07df38607e4 --- M src/common/rsl.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index d048c82..47f59d8 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1343,7 +1343,6 @@ struct gsm_lchan *lchan = msg->lchan; struct rsl_ie_chan_mode *cm; struct tlv_parsed tp; - struct gsm_bts_role_bts *btsb = bts_role_bts(lchan->ts->trx->bts); rsl_tlv_parse(, msgb_l3(msg), msgb_l3len(msg)); -- To view, visit https://gerrit.osmocom.org/7065 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic07edfa04c2184bff4a043e96e69c07df38607e4 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Vadim Yanitskiy