Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 944s] ar: `u' modifier ignored since `D' is the default (see `U') [ 944s] libtool: link: ranlib .libs/libtransceiver_common.a [ 945s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 945s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 945s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 945s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 945s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 945s] collect2: error: ld returned 1 exit status [ 945s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 945s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 945s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 945s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 945s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 945s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 945s] make[1]: *** [Makefile:444: all] Error 2 [ 945s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 945s] dh_auto_build: make -j1 returned exit code 2 [ 945s] make: *** [debian/rules:6: build] Error 255 [ 945s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 946s] [ 946s] cloud117 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 04:47:55 UTC 2019. [ 946s] [ 946s] ### VM INTERACTION START ### [ 949s] [ 870.906408] sysrq: SysRq : Power Off [ 949s] [ 870.939802] reboot: Power down [ 950s] ### VM INTERACTION END ### [ 950s] [ 950s] cloud117 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 04:48:00 UTC 2019. [ 950s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 994s] ar: `u' modifier ignored since `D' is the default (see `U') [ 994s] libtool: link: ranlib .libs/libtransceiver_common.a [ 994s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 994s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 994s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 994s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 994s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 994s] collect2: error: ld returned 1 exit status [ 994s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 994s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 994s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 994s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 994s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 994s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 994s] make[1]: *** [Makefile:444: all] Error 2 [ 994s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 994s] dh_auto_build: make -j1 returned exit code 2 [ 994s] make: *** [debian/rules:6: build] Error 255 [ 994s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 995s] [ 995s] lamb17 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 04:35:41 UTC 2019. [ 995s] [ 995s] ### VM INTERACTION START ### [ 998s] [ 945.199891] sysrq: SysRq : Power Off [ 998s] [ 945.263612] reboot: Power down [ 998s] ### VM INTERACTION END ### [ 998s] [ 998s] lamb17 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 04:35:45 UTC 2019. [ 998s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/osmo-trx in Debian_Testing/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Testing/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 297s] ar: `u' modifier ignored since `D' is the default (see `U') [ 297s] libtool: link: ranlib .libs/libtransceiver_common.a [ 297s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 297s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 297s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 297s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 297s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 297s] collect2: error: ld returned 1 exit status [ 297s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 297s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 297s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 297s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 297s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 297s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 297s] make[1]: *** [Makefile:444: all] Error 2 [ 297s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 297s] dh_auto_build: make -j1 returned exit code 2 [ 297s] make: *** [debian/rules:6: build] Error 255 [ 297s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 297s] [ 297s] sheep84 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 03:02:00 UTC 2019. [ 297s] [ 297s] ### VM INTERACTION START ### [ 300s] [ 287.677292] sysrq: SysRq : Power Off [ 300s] [ 287.684090] reboot: Power down [ 300s] ### VM INTERACTION END ### [ 300s] [ 300s] sheep84 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Thu Sep 5 03:02:03 UTC 2019. [ 300s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-netif in Debian_10/armv7l
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-netif/Debian_10/armv7l Package network:osmocom:nightly/libosmo-netif failed to build in Debian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 211s] | #define HAVE_STDINT_H 1 [ 211s] | #define HAVE_UNISTD_H 1 [ 211s] | #define HAVE_DLFCN_H 1 [ 211s] | #define LT_OBJDIR ".libs/" [ 211s] | #define STDC_HEADERS 1 [ 211s] | #define HAVE_EXECINFO_H 1 [ 211s] | #define HAVE_SYS_SELECT_H 1 [ 211s] | #define HAVE_SYS_SOCKET_H 1 [ 211s] | #define HAVE_SYSLOG_H 1 [ 211s] | #define HAVE_CTYPE_H 1 [ 211s] | #define HAVE_LIBSCTP 1 [ 211s] | #define HAVE_PCAP_H 1 [ 211s] | [ 211s] | configure: exit 0 [ 211s] [ 211s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 211s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 211s] make: *** [debian/rules:13: build] Error 2 [ 211s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 211s] [ 211s] armbuild25 failed "build libosmo-netif_0.6.0.dsc" at Thu Sep 5 02:00:57 UTC 2019. [ 211s] [ 211s] ### VM INTERACTION START ### [ 214s] [ 188.164642] sysrq: SysRq : Power Off [ 214s] [ 188.165841] reboot: Power down [ 214s] ### VM INTERACTION END ### [ 214s] [ 214s] armbuild25 failed "build libosmo-netif_0.6.0.dsc" at Thu Sep 5 02:01:00 UTC 2019. [ 214s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-ttcn3-hacks[master]: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15410
Change subject: PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial
TA
..
PCU_Tests_RAW.ttcn: introduce TC_ta_init_prach to test initial TA
Change-Id: I21f76ae723519c0eb54515922a05ca8045b00ade
---
M library/GSM_RR_Types.ttcn
M pcu/PCU_Tests_RAW.ttcn
2 files changed, 68 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/10/15410/1
diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index 457f0f5..987f808 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -589,7 +589,8 @@
/* TODO: starting time TLV */
IaRestOctetsrest_octets optional
} with { variant (chan_desc) "PRESENCE(ded_or_tbf.tbf = false)"
-variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)" };
+variant (pkt_chan_desc) "PRESENCE(ded_or_tbf.tbf = true)"
+variant "PADDING(184), PADDING_PATTERN('00101011'B)" };
/* 9.1.20 */
type record ReqRefWaitInd {
@@ -766,6 +767,31 @@
}
};
+ template GsmRrMessage tr_IMM_TBF_ASS(template boolean dl := ?,
+template uint8_t ra := ?,
+template GsmFrameNumber fn := ?,
+template TimingAdvance ta := ?,
+template PacketChannelDescription
ch_desc := ?,
+template IaRestOctets rest := ?)
:= {
+ header := t_RrHeader(IMMEDIATE_ASSIGNMENT, ?),
+ payload := {
+ imm_ass := {
+ ded_or_tbf := {
+ spare := ?,
+ tma := ?,
+ downlink := dl,
+ tbf := true
+ },
+ page_mode := PAGE_MODE_NORMAL,
+ chan_desc := omit,
+ pkt_chan_desc := ch_desc,
+ req_ref := tr_compute_ReqRef(ra, fn),
+ timing_advance := ta,
+ mobile_allocation := ?,
+ rest_octets := rest
+ }
+ }
+ };
template (value) GsmRrL3Message ts_MEAS_REP(boolean valid, uint6_t
rxl_f, uint6_t rxl_s,
uint3_t rxq_f, uint3_t rxq_s,
diff --git a/pcu/PCU_Tests_RAW.ttcn b/pcu/PCU_Tests_RAW.ttcn
index 4732da6..03d914c 100644
--- a/pcu/PCU_Tests_RAW.ttcn
+++ b/pcu/PCU_Tests_RAW.ttcn
@@ -438,6 +438,44 @@
setverdict(pass);
}
+/* Test of correct Timing Advance at the time of TBF establishment
+ * (derived from timing offset during PRACH request). */
+testcase TC_ta_init_prach() runs on RAW_Test_CT {
+ /* Initialize NS codec
+* TODO: do we really need it? */
+ f_init_ns_codec();
+
+ /* Initialize PCU interface (emulate the BTS) */
+ f_init_pcuif();
+
+ /* Packet Immediate Assignment on AGCH */
+ var template PCUIF_Message data_req_tpl := tr_PCUIF_DATA_REQ(
+ bts_nr := 0, trx_nr := 0, ts_nr := 0,
+ sapi := PCU_IF_SAPI_AGCH);
+
+ for (var integer ta := 0; ta < 64; ta := ta + 16) {
+ /* Send an Access Burst (8-bit)
+* FIXME: properly encode RA,
+* HACK: we're using the same TDMA FN */
+ f_pcuif_tx(ts_PCUIF_RACH_IND(bts_nr := 0, ra := oct2int('3A'O),
is_11bit := 0,
+burst_type := BURST_TYPE_0,
+fn := 1337, arfcn := 871,
+qta := ta * 4));
+
+ /* Expect Immediate (TBF) Assignment on TS0/AGCH */
+ data_req_tpl.u.data_req.data := decmatch tr_IMM_TBF_ASS(
+ dl := false, ra := oct2int('3A'O), fn := 1337, ta :=
ta);
+ alt {
+ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, data_req_tpl)) {
+ log("Rx Immediate Assignment for UL TBF");
+ setverdict(pass);
+ }
+ [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, PCUIF_Message:?)) {
+ repeat;
+ }
+ }
+ }
+}
control {
execute( TC_ns_reset() );
@@ -450,6 +488,9 @@
execute( TC_ns_so_block() );
execute( TC_pcuif_suspend() );
+
+ /* Timing Advance tests (see GSM TS 43.064, section 6) */
+ execute( TC_ta_init_prach() );
}
--
To view,
Change in ...osmo-ttcn3-hacks[master]: sgsn: add Iu Attach Request
lynxis lazus has uploaded a new patch set (#7) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 ) Change subject: sgsn: add Iu Attach Request .. sgsn: add Iu Attach Request MS -> SGSN: Attach Request IMSI MS <- SGSN: Identity Request IMEI MS -> SGSN: Identity Response IMEI MS <- SGSN: Auth Request MS -> SGSN: Auth Response MS <- SGSN: Attach Accept MS -> SGSN: Attach Complete Change-Id: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 --- M sgsn/SGSN_Tests.ttcn A sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/13866/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I66069e31c30d33934ad57cc2b8794f56ffd5c7d6 Gerrit-Change-Number: 13866 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_geran_attach_iu_rau
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15397 to look at the new patch set (#2). Change subject: sgsn: add TC_geran_attach_iu_rau .. sgsn: add TC_geran_attach_iu_rau MS <-> SGSN: Successful Attach over Geran MS <-> SGSN: Routing Area Update over Iu The tess case will crash the SGSN and is not included in the default run. Change-Id: Id23244aa6ca329579300b66b73ce238bd4d01eef --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/15397/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id23244aa6ca329579300b66b73ce238bd4d01eef Gerrit-Change-Number: 15397 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_geran_rau
Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 to look at the new patch set (#3). Change subject: sgsn: add TC_iu_attach_geran_rau .. sgsn: add TC_iu_attach_geran_rau MS <-> SGSN: Attach over Iu MS <-> SGSN: Routing Area Update over Geran The tess case will crash the SGSN and is not included in the default run. Change-Id: Ie043639638a640a2041324fc910964385a41c77d --- M sgsn/SGSN_Tests_Iu.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/15163/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie043639638a640a2041324fc910964385a41c77d Gerrit-Change-Number: 15163 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-iuh[master]: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect in...
lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15182 ) Change subject: iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication .. iu_client: emit RANAP_IU_EVENT_LINK_INVALIDATED on SCCP disconnect indication Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 --- M src/iu_client.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/iu_client.c b/src/iu_client.c index c7ed341..7a0a78e 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -812,6 +812,13 @@ rc = 0; if (msgb_l2len(oph->msg) > 0) rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + + /* A Iu Release event might be used to free the UE in cn_ranap_handle_co. */ + ue = ue_conn_ctx_find(prim->u.disconnect.conn_id); + if (!ue) + break; + + global_iu_event_cb(ue, RANAP_IU_EVENT_LINK_INVALIDATED, NULL); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I168b5c67336c4d1cb9fcebb9c26a7cf2fc46e420 Gerrit-Change-Number: 15182 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-iuh[master]: iu_client: introduce ranap_iu_free_ue() to free the UE connections
lynxis lazus has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-iuh/+/15161 )
Change subject: iu_client: introduce ranap_iu_free_ue() to free the UE
connections
..
iu_client: introduce ranap_iu_free_ue() to free the UE connections
When freeing the UE connection object, disconnect the SCCP connection.
Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b
---
M include/osmocom/ranap/iu_client.h
M src/iu_client.c
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
diff --git a/include/osmocom/ranap/iu_client.h
b/include/osmocom/ranap/iu_client.h
index 873b2d2..0cb84da 100644
--- a/include/osmocom/ranap/iu_client.h
+++ b/include/osmocom/ranap/iu_client.h
@@ -70,5 +70,9 @@
int ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi);
int ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct
RANAP_Cause *cause);
+/* freeing the UE will release all resources
+ * This will close the SCCP connection connected to the UE */
+void ranap_iu_free_ue(struct ranap_ue_conn_ctx *ue_ctx);
+
void ranap_iu_vty_init(int iu_parent_node, enum ranap_nsap_addr_enc
*rab_assign_addr_enc);
int ranap_iu_vty_config_write(struct vty *vty, const char *indent);
diff --git a/src/iu_client.c b/src/iu_client.c
index ce06f8a..c7ed341 100644
--- a/src/iu_client.c
+++ b/src/iu_client.c
@@ -131,6 +131,16 @@
return NULL;
}
+void ranap_iu_free_ue(struct ranap_ue_conn_ctx *ue_ctx)
+{
+ if (!ue_ctx)
+ return;
+
+ osmo_sccp_tx_disconn(g_scu, ue_ctx->conn_id, NULL, 0);
+ llist_del(_ctx->list);
+ talloc_free(ue_ctx);
+}
+
static struct ranap_iu_rnc *iu_rnc_alloc(uint16_t rnc_id, struct
osmo_sccp_addr *addr)
{
struct ranap_iu_rnc *rnc = talloc_zero(talloc_iu_ctx, struct
ranap_iu_rnc);
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15161
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: I6812edb4da487507ccf9f483de801c1c65c4b72b
Gerrit-Change-Number: 15161
Gerrit-PatchSet: 10
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...osmo-iuh[master]: iu_client: sccp_sap_up: don't decode empty disconnect indications
lynxis lazus has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-iuh/+/15180 ) Change subject: iu_client: sccp_sap_up: don't decode empty disconnect indications .. iu_client: sccp_sap_up: don't decode empty disconnect indications Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 --- M src/iu_client.c 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/iu_client.c b/src/iu_client.c index 8da9a43..ce06f8a 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -799,7 +799,9 @@ if (!ue) break; - rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); + rc = 0; + if (msgb_l2len(oph->msg) > 0) + rc = ranap_cn_rx_co(cn_ranap_handle_co, ue, msgb_l2(oph->msg), msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/15180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1fea8f19433d908583de71d8d2401bbb8c0c7900 Gerrit-Change-Number: 15180 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: library/PCUIF_Types.ttcn: inform RAW codec about PADDING in PCUIF_data
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15409
Change subject: library/PCUIF_Types.ttcn: inform RAW codec about PADDING in
PCUIF_data
..
library/PCUIF_Types.ttcn: inform RAW codec about PADDING in PCUIF_data
PADDING is one of the TITAN specific language extensions [1], which
tells the RAW codec that an encoded payload shall end at a boundary
fixed by a multiple of 'padding' unit bits counted from the
beginning of the message.
Let's use it for record 'PCUIF_data', where the fixed-size buffer
is located in between the other fields, so padding will be ignored
by the RAW coding after decoding:
$HOST: dec_PCUIF_Message(): Decoded @PCUIF_Types.PCUIF_Message: {
msg_type := PCU_IF_MSG_DATA_REQ (0),
bts_nr := 0, spare := ''O,
u := {
data_req := {
sapi := PCU_IF_SAPI_AGCH (2),
len := 23,
data := '2D063F100FE3673A096BC800300B2B2B2B2B2B2B2B',
...
}
}
}
As a result, we don't have to deal with padding manually and
can safely use 'decmatch' statement in the receive templates.
[1] usrguide/referenceguide/4-ttcn3_language_extensions.adoc
Change-Id: I5808954b5c67c3239e795e43ae77035152d359ef
---
M library/PCUIF_Types.ttcn
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/09/15409/1
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index 132b72d..551081b 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -76,10 +76,15 @@
PCUIF_Text text
} with { variant "" };
+/* This is a bad side of the current protocol design: fixed-size buffer is
located
+ * in between the other fields of the message, so if the payload is smaller
than
+ * 162 octets (1296 bits), we need to fill the remaining space with padding. */
+type octetstring PCUIF_DataPad with { variant "ALIGN(left), PADDING(1296)" };
+
type record PCUIF_data {
PCUIF_Sapi sapi,
uint8_t len,
- octetstring data length(162),
+ PCUIF_DataPad data,
uint32_tfn,
uint16_tarfcn,
uint8_t trx_nr,
@@ -89,7 +94,7 @@
uint16_tber10k,
int16_t ta_offs_qbits,
int16_t lqual_cb
-} with { variant (data) "FIELDLENGTH(162), ALIGN(left)" };
+} with { variant (len) "LENGTHTO(data)" };
type record PCUIF_data_cnf_dt {
PCUIF_Sapi sapi,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15409
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I5808954b5c67c3239e795e43ae77035152d359ef
Gerrit-Change-Number: 15409
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 991s] ar: `u' modifier ignored since `D' is the default (see `U') [ 991s] libtool: link: ranlib .libs/libtransceiver_common.a [ 991s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 991s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 991s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 991s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 991s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 991s] collect2: error: ld returned 1 exit status [ 991s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 991s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 991s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 991s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 991s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 991s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 991s] make[1]: *** [Makefile:444: all] Error 2 [ 991s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 991s] dh_auto_build: make -j1 returned exit code 2 [ 991s] make: *** [debian/rules:6: build] Error 255 [ 991s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 991s] [ 991s] lamb53 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Sep 4 19:35:57 UTC 2019. [ 991s] [ 991s] ### VM INTERACTION START ### [ 995s] [ 949.553669] sysrq: SysRq : Power Off [ 995s] [ 949.559855] reboot: Power down [ 995s] ### VM INTERACTION END ### [ 995s] [ 995s] lamb53 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Sep 4 19:36:01 UTC 2019. [ 995s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 477s] ar: `u' modifier ignored since `D' is the default (see `U') [ 477s] libtool: link: ranlib .libs/libtransceiver_common.a [ 477s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 477s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 477s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 478s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 478s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 478s] collect2: error: ld returned 1 exit status [ 478s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 478s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 478s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 478s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 478s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 478s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 478s] make[1]: *** [Makefile:444: all] Error 2 [ 478s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 478s] dh_auto_build: make -j1 returned exit code 2 [ 478s] make: *** [debian/rules:6: build] Error 255 [ 478s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 478s] [ 478s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 4 19:27:47 UTC 2019. [ 478s] [ 478s] ### VM INTERACTION START ### [ 481s] [ 461.753587] sysrq: SysRq : Power Off [ 481s] [ 461.765656] reboot: Power down [ 481s] ### VM INTERACTION END ### [ 481s] [ 481s] lamb18 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 4 19:27:50 UTC 2019. [ 481s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...osmo-bsc[master]: a_reset.c: Don't wait 2 seconds to send first BSSMAP RESET
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15406 Change subject: a_reset.c: Don't wait 2 seconds to send first BSSMAP RESET .. a_reset.c: Don't wait 2 seconds to send first BSSMAP RESET Function fsm_reset_ack_timeout_cb() could be called directly from within a_reset_alloc(), but it's still desirable to deferr the BSSMAP RESET to be sent asynchronously by the timer upon next main loop step as soon as possible, so whole process is already configured properly. 1ms needs to be set instead of 0 (immediate asynchronous) because value 0 actually disables the timer. As a result, moving the state_chg() after the msc->a.reset_fsm assignment is not really needed, but still makes it more clear that the pointer will be set upon call of the timer callback. Related: OS#4188 Change-Id: I68d76a4050d4dec7d53b0031d67e0dd35ddd8764 --- M src/osmo-bsc/a_reset.c 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/15406/1 diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c index fc59ff4..b75272f 100644 --- a/src/osmo-bsc/a_reset.c +++ b/src/osmo-bsc/a_reset.c @@ -161,11 +161,10 @@ reset_ctx->conn_loss_counter = 0; reset_fsm = osmo_fsm_inst_alloc(, msc, reset_ctx, LOGL_DEBUG, name); OSMO_ASSERT(reset_fsm); - - /* kick off reset-ack sending mechanism */ - osmo_fsm_inst_state_chg(reset_fsm, ST_DISC, RESET_RESEND_INTERVAL, RESET_RESEND_TIMER_NO); - msc->a.reset_fsm = reset_fsm; + + /* Immediatelly (1ms) kick off reset sending mechanism */ + osmo_fsm_inst_state_chg_ms(reset_fsm, ST_DISC, 1, RESET_RESEND_TIMER_NO); } /* Confirm that we sucessfully received a reset acknowlege message */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I68d76a4050d4dec7d53b0031d67e0dd35ddd8764 Gerrit-Change-Number: 15406 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-bsc[master]: bsc: gsm_08_08.c: Remove repeated conn not null check
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15407 Change subject: bsc: gsm_08_08.c: Remove repeated conn not null check .. bsc: gsm_08_08.c: Remove repeated conn not null check msc_is_connected() already checks against NULL. Change-Id: Ie9635cd2c6149cd0f8c017cfcb47481f91c4bed1 --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/15407/1 diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 43117a8..4b0752f 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -128,7 +128,7 @@ int rc; struct msgb *resp; - if (!conn || !msc_connected(conn)) + if (!msc_connected(conn)) return; LOGP(DMSC, LOGL_NOTICE, "Tx MSC SAPI N REJECT DLCI=0x%02x\n", dlci); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie9635cd2c6149cd0f8c017cfcb47481f91c4bed1 Gerrit-Change-Number: 15407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-bsc[master]: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel c...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/15408
Change subject: bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated
channel closed during WAIT_CC
..
bsc_subscr_conn_fsm: Cleanly clear BSSAP conn if associated channel closed
during WAIT_CC
TTCN3 BSC_Tests.TC_ms_rel_ind_does_not_cause_bssmap_reset seems to
sometimes run into a race condition on the order of messages received by
osmo-bsc comming from MSC and BTS.
Usual (expected) scenario):
BTS->BSC EST IND
BSC->MSC CL3 Info
BSC<-MSC CC
BTS->BSC REL IND
BTS<-BSC DEACT SACCH
BSC->MSC ClearRequest
BSC<-MSC ClearCommand
BSC->MSC ClearComplete
BTS<-BSC RF Chan Release
BTS->BSC RF Chan Release ACK
Sometimes CC message and REL IND message are received swapped (because they
are sent by different components asynchronously in TTCN3).
As a result, osmo-bsc was failing to go into CLEARING state and was
unable to send the ClearRequest because CC was still not received.
So the idea is to stay in WAIT_CC until CC is received, then check if
the lchan was dropped and in that case go into clearing state.
Change-Id: Id1abf5ee44c60925b478123409f26bd29006202b
---
M src/osmo-bsc/bsc_subscr_conn_fsm.c
1 file changed, 24 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/15408/1
diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c
b/src/osmo-bsc/bsc_subscr_conn_fsm.c
index f8784f9..b5edeb8 100644
--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c
+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c
@@ -99,6 +99,12 @@
conn->network->T_defs, \
-1)
+static bool gscon_is_active(struct gsm_subscriber_connection *conn)
+{
+ enum gscon_fsm_states st = conn->fi->state;
+ return st == ST_ACTIVE || st == ST_ASSIGNMENT || st == ST_HANDOVER;
+}
+
/* forward MT DTAP from BSSAP side to RSL side */
static inline void submit_dtap(struct gsm_subscriber_connection *conn, struct
msgb *msg)
{
@@ -333,10 +339,19 @@
switch (event) {
case GSCON_EV_A_CONN_CFM:
/* MSC has confirmed the connection, we now change into the
-* active state and wait there for further operations */
- conn_fsm_state_chg(ST_ACTIVE);
- /* if there's user payload, forward it just like EV_MT_DTAP */
- /* FIXME: Question: if there's user payload attached to the CC,
forward it like EV_MT_DTAP? */
+* active state and wait there for further operations. */
+ if (conn->lchan) {
+ conn_fsm_state_chg(ST_ACTIVE);
+ /* if there's user payload, forward it just like
EV_MT_DTAP */
+ /* FIXME: Question: if there's user payload attached to
the CC, forward it like EV_MT_DTAP? */
+ } else {
+ /* If associated lchan was released while we were
+* waiting for the confirmed connection, then instead
+* simply drop the connection */
+ LOGPFSML(fi, LOGL_INFO, "Connection confirmed but lchan
was dropped before, clearing conn\n");
+ osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999);
+ gscon_bssmap_clear(conn,
GSM0808_CAUSE_EQUIPMENT_FAILURE);
+ }
break;
default:
OSMO_ASSERT(false);
@@ -589,7 +604,7 @@
[ST_WAIT_CC] = {
.name = "WAIT_CC",
.in_event_mask = S(GSCON_EV_A_CONN_CFM),
- .out_state_mask = S(ST_ACTIVE),
+ .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING),
.action = gscon_fsm_wait_cc,
},
[ST_ACTIVE] = {
@@ -651,9 +666,10 @@
lchan_forget_conn(conn->lchan);
conn->lchan = NULL;
}
- if (!conn->lchan) {
- if (conn->fi->state != ST_CLEARING)
- osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999);
+ /* if conn is not active we cannot send bssap. If on WAIT_CC, then let's
+* wait until CC is received to tear down */
+ if (!conn->lchan && gscon_is_active(conn)) {
+ osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, 999);
gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE);
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15408
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id1abf5ee44c60925b478123409f26bd29006202b
Gerrit-Change-Number: 15408
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: f_ran_adapter_cleanup() check if adapter is bound
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15391 ) Change subject: RAN_Adapter: f_ran_adapter_cleanup() check if adapter is bound .. Patch Set 3: Code-Review-1 Don't merge it yet, I think lynxis wanted to retry about this one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9c974a850949829728c35cf5dbdd0858fdef Gerrit-Change-Number: 15391 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 19:08:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: L3 Templates: PDU_L3_MS_SGSN: export ptmsi in template signature
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15395 ) Change subject: L3 Templates: PDU_L3_MS_SGSN: export ptmsi in template signature .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15395 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7ba51a28524261dd1c7f4f2586ee6ebc970ea944 Gerrit-Change-Number: 15395 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 18:55:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: sgsn: introduce f_send_l3() to allow one function for Gb & Iu
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171 )
Change subject: sgsn: introduce f_send_l3() to allow one function for Gb & Iu
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/#/c/15171/2/sgsn/SGSN_Tests.ttcn
File sgsn/SGSN_Tests.ttcn:
https://gerrit.osmocom.org/#/c/15171/2/sgsn/SGSN_Tests.ttcn@525
PS2, Line 525: function f_send_l3(template (value) PDU_L3_MS_SGSN l3_mo,
integer gb_index := 0, boolean initial := false) runs on BSSGP_ConnHdlr {
> good idea. […]
ACK.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15171
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If47ad2be459ca7b87d9071d9ff020a51821e4433
Gerrit-Change-Number: 15171
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: neels
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Comment-Date: Wed, 04 Sep 2019 18:54:34 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: lynxis lazus
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: RAN_Adapter: f_ran_adapter_cleanup() check if adapter is bound
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15391 ) Change subject: RAN_Adapter: f_ran_adapter_cleanup() check if adapter is bound .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I9c974a850949829728c35cf5dbdd0858fdef Gerrit-Change-Number: 15391 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 18:51:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-sccp[master]: ss7: Do not queue messages if stream is not connected
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/15405 ) Change subject: ss7: Do not queue messages if stream is not connected .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic7d3571848faf28221dcfa8eb8b33b42964d988e Gerrit-Change-Number: 15405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Sep 2019 18:51:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...pysim[master]: Add an option to read the iccid and batch-program the new card data
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/pysim/+/15394 )
Change subject: Add an option to read the iccid and batch-program the new card
data
..
Add an option to read the iccid and batch-program the new card data
This can be used to reprogram everything including IMSI on the card:
while true; do
./pySim-prog.py -p 0 -t sysmoUSIM-SJS1 --source=csv --read-csv=cards.csv
--read-iccid &&
paplay complete.oga
sleep 2
done
Change-Id: Ib343a29141b5255f67a59ab76959b51e162b7916
---
M pySim-prog.py
1 file changed, 26 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/pySim-prog.py b/pySim-prog.py
index 2ac4dad..8abce0a 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -39,7 +39,7 @@
from pySim.commands import SimCardCommands
from pySim.cards import _cards_classes
-from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc,
calculate_luhn
+from pySim.utils import h2b, swap_nibbles, rpad, derive_milenage_opc,
calculate_luhn, dec_iccid
from pySim.ts_51_011 import EF
def parse_options():
@@ -131,6 +131,9 @@
parser.add_option("--read-imsi", dest="read_imsi", action="store_true",
help="Read the IMSI from the CARD", default=False
)
+ parser.add_option("--read-iccid", dest="read_iccid",
action="store_true",
+ help="Read the ICCID from the CARD", default=False
+ )
parser.add_option("-z", "--secret", dest="secret", metavar="STR",
help="Secret used for ICCID/IMSI autogen",
)
@@ -171,8 +174,8 @@
return options
if options.source == 'csv':
- if (options.imsi is None) and (options.batch_mode is False) and
(options.read_imsi is False):
- parser.error("CSV mode needs either an IMSI,
--read-imsi or batch mode")
+ if (options.imsi is None) and (options.batch_mode is False) and
(options.read_imsi is False) and (options.read_iccid is False):
+ parser.error("CSV mode needs either an IMSI,
--read-imsi, --read-iccid or batch mode")
if options.read_csv is None:
parser.error("CSV mode requires a CSV input file")
elif options.source == 'cmdline':
@@ -444,7 +447,7 @@
cw.writerow([params[x] for x in row])
f.close()
-def _read_params_csv(opts, imsi):
+def _read_params_csv(opts, iccid=None, imsi=None):
import csv
f = open(opts.read_csv, 'r')
cr = csv.DictReader(f)
@@ -452,11 +455,15 @@
if not 'iccid' in cr.fieldnames:
raise Exception("CSV file in wrong format!")
for row in cr:
- if opts.num is not None and opts.read_imsi is False:
+ if opts.num is not None and opts.read_iccid is False and
opts.read_imsi is False:
if opts.num == i:
f.close()
return row;
i += 1
+ if row['iccid'] == iccid:
+ f.close()
+ return row;
+
if row['imsi'] == imsi:
f.close()
return row;
@@ -464,8 +471,8 @@
f.close()
return None
-def read_params_csv(opts, imsi):
- row = _read_params_csv(opts, imsi)
+def read_params_csv(opts, imsi=None, iccid=None):
+ row = _read_params_csv(opts, iccid=iccid, imsi=imsi)
if row is not None:
row['mcc'] = int(row.get('mcc', row['imsi'][0:3]))
row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))
@@ -655,7 +662,17 @@
if opts.source == 'cmdline':
cp = gen_parameters(opts)
elif opts.source == 'csv':
- if opts.read_imsi:
+imsi = None
+iccid = None
+ if opts.read_iccid:
+ if opts.dry_run:
+ # Connect transport
+ print "Insert card now (or CTRL-C to
cancel)"
+ sl.wait_for_card(newcardonly=not first)
+ (res,_) = scc.read_binary(['3f00', '2fe2'],
length=10)
+ iccid = dec_iccid(res)
+print iccid
+elif opts.read_imsi:
if opts.dry_run:
# Connect transport
print "Insert card now (or CTRL-C to
cancel)"
@@ -664,7 +681,7 @@
imsi = swap_nibbles(res)[3:]
else:
Change in ...pysim[master]: pySim-prog: Add option for hex ADM keys
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15393 ) Change subject: pySim-prog: Add option for hex ADM keys .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id75a03482aa7f8cc3bdbb8d5967f1e8ab45c179a Gerrit-Change-Number: 15393 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 04 Sep 2019 18:50:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...pysim[master]: pySim-prog: Add option for hex ADM keys
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/pysim/+/15393 )
Change subject: pySim-prog: Add option for hex ADM keys
..
pySim-prog: Add option for hex ADM keys
pySim-prog would implicitly try to use the raw or hex-escaped format
depending on the length of the parameter, now there is the option "-A"
to explicitly specify the hex-escaped ADM1 key.
pysim-test.sh: Explicitly use the "-A" option to pass the hex adm1 key
for wavemobile cards
Change-Id: Id75a03482aa7f8cc3bdbb8d5967f1e8ab45c179a
---
M pySim-prog.py
M pysim-testdata/Wavemobile-SIM.data
M tests/Wavemobile-SIM.data.example
M tests/pysim-test.sh
4 files changed, 28 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/pySim-prog.py b/pySim-prog.py
index e00c2d0..2ac4dad 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -73,6 +73,9 @@
parser.add_option("-a", "--pin-adm", dest="pin_adm",
help="ADM PIN used for provisioning (overwrites
default)",
)
+ parser.add_option("-A", "--pin-adm-hex", dest="pin_adm_hex",
+ help="ADM PIN used for provisioning, as hex string (16
characters long",
+ )
parser.add_option("-e", "--erase", dest="erase", action='store_true',
help="Erase beforehand [default: %default]",
default=False,
@@ -376,17 +379,27 @@
else:
opc = ''.join(['%02x' % random.randrange(0,256) for i in
range(16)])
+
+ pin_adm = None
+
if opts.pin_adm is not None:
if len(opts.pin_adm) <= 8:
pin_adm = ''.join(['%02x'%(ord(x)) for x in
opts.pin_adm])
pin_adm = rpad(pin_adm, 16)
- elif len(opts.pin_adm) == 16:
- pin_adm = opts.pin_adm
- else:
- raise ValueError("PIN-ADM needs to be <=8 digits
(ascii) or exactly 16 digits (raw hex)")
- else:
- pin_adm = None
+ else:
+ raise ValueError("PIN-ADM needs to be <=8 digits
(ascii)")
+
+if opts.pin_adm_hex is not None:
+ if len(opts.pin_adm_hex) == 16:
+ pin_adm = opts.pin_adm_hex
+ # Ensure that it's hex-encoded
+ try:
+ try_encode = h2b(pin_adm)
+ except ValueError:
+ raise ValueError("PIN-ADM needs to be hex encoded
using this option")
+ else:
+ raise ValueError("PIN-ADM needs to be exactly 16 digits
(hex encoded)")
# Return that
return {
diff --git a/pysim-testdata/Wavemobile-SIM.data
b/pysim-testdata/Wavemobile-SIM.data
index 46690b4..0c3379a 100644
--- a/pysim-testdata/Wavemobile-SIM.data
+++ b/pysim-testdata/Wavemobile-SIM.data
@@ -1,5 +1,5 @@
MCC=001
MNC=01
IMSI=00101000102
-ADM=15E31383624FDC8A
+ADM_HEX=15E31383624FDC8A
diff --git a/tests/Wavemobile-SIM.data.example
b/tests/Wavemobile-SIM.data.example
index e9ba965..bdf2d65 100644
--- a/tests/Wavemobile-SIM.data.example
+++ b/tests/Wavemobile-SIM.data.example
@@ -1,5 +1,5 @@
MCC=001
MNC=01
IMSI=00101000102
-ADM=0123456789ABCDEF
+ADM_HEX=0123456789ABCDEF
diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh
index 5af7a93..f97722d 100755
--- a/tests/pysim-test.sh
+++ b/tests/pysim-test.sh
@@ -156,9 +156,14 @@
OPC=
IMSI=0010101
ADM=
+ ADM_OPT="-a"
- . "$CARD_NAME.data"
- python $PYSIM_PROG -p $I -t $CARD_NAME -o $OPC -k $KI -x $MCC -y $MNC
-i $IMSI -s $ICCID -a $ADM
+ source "$CARD_NAME.data"
+ if [ -n "$ADM_HEX" ]; then
+ ADM_OPT="-A"
+ ADM=$ADM_HEX
+ fi
+ python $PYSIM_PROG -p $I -t $CARD_NAME -o $OPC -k $KI -x $MCC -y $MNC
-i $IMSI -s $ICCID $ADM_OPT $ADM
check_card $I $CARD_NAME
echo ""
done
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15393
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Id75a03482aa7f8cc3bdbb8d5967f1e8ab45c179a
Gerrit-Change-Number: 15393
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-MessageType: merged
Change in ...pysim[master]: pySim-prog: Use CSV format with headers
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/pysim/+/15313 )
Change subject: pySim-prog: Use CSV format with headers
..
pySim-prog: Use CSV format with headers
This way we can have optional fields like pin_adm in the file
Also require iccid as identifier for the SIM card
Set defaults for optional card parameters.
Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236
---
A csv-format
M pySim-prog.py
2 files changed, 44 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
diff --git a/csv-format b/csv-format
new file mode 100644
index 000..808003a
--- /dev/null
+++ b/csv-format
@@ -0,0 +1,16 @@
+This file aims to describe the format of the CSV file pySim uses.
+
+The first line contains the fieldnames which will be used by pySim. This
+avoids having a specific order.
+
+The field names are the following:
+
+iccid: ICCID of the card. Used to identify the cards (with --read-iccid)
+imsi: IMSI of the card
+mcc: Mobile Country Code (optional)
+mnc: Mobile Network Code (optional)
+smsp: MSISDN of the SMSC (optional)
+ki: Ki
+opc: OPc
+acc: Access class of the SIM (optional)
+pin_adm: Admin PIN of the SIM. Needed to reprogram various files
diff --git a/pySim-prog.py b/pySim-prog.py
index 7edadd7..e00c2d0 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -405,17 +405,20 @@
def print_parameters(params):
- print """Generated card parameters :
- > Name : %(name)s
- > SMSP : %(smsp)s
- > ICCID: %(iccid)s
- > MCC/MNC : %(mcc)d/%(mnc)d
- > IMSI : %(imsi)s
- > Ki : %(ki)s
- > OPC : %(opc)s
- > ACC : %(acc)s
- > ADM1(hex): %(pin_adm)s
-"""% params
+ s = ["Generated card parameters :"]
+ if 'name' in params:
+ s.append(" > Name : %(name)s")
+ if 'smsp' in params:
+ s.append(" > SMSP : %(smsp)s")
+ s.append(" > ICCID: %(iccid)s")
+ s.append(" > MCC/MNC : %(mcc)d/%(mnc)d")
+ s.append(" > IMSI : %(imsi)s")
+ s.append(" > Ki : %(ki)s")
+ s.append(" > OPC : %(opc)s")
+ if 'acc' in params:
+ s.append(" > ACC : %(acc)s")
+ s.append(" > ADM1(hex): %(pin_adm)s")
+ print("\n".join(s) % params)
def write_params_csv(opts, params):
@@ -430,10 +433,11 @@
def _read_params_csv(opts, imsi):
import csv
- row = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'smsp', 'ki', 'opc']
f = open(opts.read_csv, 'r')
- cr = csv.DictReader(f, row)
+ cr = csv.DictReader(f)
i = 0
+if not 'iccid' in cr.fieldnames:
+raise Exception("CSV file in wrong format!")
for row in cr:
if opts.num is not None and opts.read_imsi is False:
if opts.num == i:
@@ -450,8 +454,17 @@
def read_params_csv(opts, imsi):
row = _read_params_csv(opts, imsi)
if row is not None:
- row['mcc'] = int(row['mcc'])
- row['mnc'] = int(row['mnc'])
+ row['mcc'] = int(row.get('mcc', row['imsi'][0:3]))
+ row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))
+ pin_adm = None
+ # We need to escape the pin_adm we get from the csv
+ if 'pin_adm' in row:
+ pin_adm = ''.join(['%02x'%(ord(x)) for x in
row['pin_adm']])
+ # Stay compatible to the odoo csv format
+ elif 'adm1' in row:
+ pin_adm = ''.join(['%02x'%(ord(x)) for x in
row['adm1']])
+ if pin_adm:
+ row['pin_adm'] = rpad(pin_adm, 16)
return row
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15313
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236
Gerrit-Change-Number: 15313
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: daniel
Gerrit-CC: pespin
Gerrit-MessageType: merged
Change in ...pysim[master]: pySim-prog: Use CSV format with headers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15313 ) Change subject: pySim-prog: Use CSV format with headers .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236 Gerrit-Change-Number: 15313 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 18:50:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15402 ) Change subject: manual: Update statements regarding SCCPlite .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5 Gerrit-Change-Number: 15402 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 18:49:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-bsc/+/15402 )
Change subject: manual: Update statements regarding SCCPlite
..
manual: Update statements regarding SCCPlite
SCCPlite is long supported (again) by osmo-bsc, let's remove the
outdated pointers to osmo-bsc-sccplite.
Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5
---
M doc/manuals/chapters/overview.adoc
1 file changed, 7 insertions(+), 14 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/doc/manuals/chapters/overview.adoc
b/doc/manuals/chapters/overview.adoc
index 869bd26..a27b0bf 100644
--- a/doc/manuals/chapters/overview.adoc
+++ b/doc/manuals/chapters/overview.adoc
@@ -39,14 +39,13 @@
Osmocom offers two variants of the 'A' interface's protocol stacking:
- 'BSSAP/SCCPlite'
-- 'BSSAP/SCCP/M3UA'
+- 'BSSAP/SCCP/M3UA' (called AoIP)
Traditionally, OsmoBSC only implemented the BSSAP/SCCPlite protocol, but since
a
-proper M3UA implementation is available from 'libosmo-sigtran'
-('libosmo-sccp.git'), the stock OsmoBSC now supports only BSSAP/SCCP/M3UA. (The
-idea is that SCCPlite support may be added to libosmo-sigtran at some point
-in the future, after which the new `osmo-bsc` would support both variants of
-the A interface.)
+proper M3UA implementation became available in 2017 as part of
'libosmo-sigtran'
+('libosmo-sccp.git'), the stock OsmoBSC now supports BSSAP/SCCP/M3UA. SCCPlite
+support has been subsequently added to libosmo-sigtran in 2018, and now both
+variants of the 'A' interface are supported by `osmo-bsc`.
The difference between an BSSAP/SCCPlite and BSSAP/SCCP/M3UA is illustrated in
<> and <>.
@@ -54,16 +53,12 @@
= BSSAP/SCCPlite
Unlike classic A interface implementations for E1 interfacs,
-`osmo-bsc-sccplite` implements a variant of encapsulating the A interface over
+`osmo-bsc` implements a variant of encapsulating the A interface over
IP. To do so, the SCCP messages are wrapped in an IPA multiplex and then
communicated over TCP. The audio channels are mapped to RTP streams.
This protocol stacking is sometimes called "SCCPlite".
-At the time of writing, if you would like to use the old BSSAP/SCCPlite
protocol,
-look for binary packages named `osmo-bsc-sccplite`, or compile `osmo-bsc` from
-the 'openbsc.git' repository.
-
[[fig-sccplite]]
.`osmo-bsc-sccplite` operation using 'BSSAP/SCCPlite'
[graphviz]
@@ -98,9 +93,7 @@
|IP
|=
-To use the now-default BSSAP/SCCP/M3UA protocol, look for binary packages named
-`osmo-bsc`, or compile `osmo-bsc` from the 'osmo-bsc.git' repository. It is
-recommended to use the M3UA variant, which is required to operate with OsmoMSC.
+It is recommended to use the M3UA variant, which is required to operate with
OsmoMSC.
To route SCCP/M3UA messages between OsmoBSC and and MSC, an STP instance like
OsmoSTP is required.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5
Gerrit-Change-Number: 15402
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in ...libosmo-netif[master]: stream: Fix scheduling of queued messages during connecting state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15404 ) Change subject: stream: Fix scheduling of queued messages during connecting state .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I289495f9aad6389c5f2623fb072d676235b7d24c Gerrit-Change-Number: 15404 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Sep 2019 18:49:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmo-netif[master]: stream: Introduce API osmo_stream_cli_is_connected
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/15403 ) Change subject: stream: Introduce API osmo_stream_cli_is_connected .. Patch Set 1: Code-Review+1 It might make sense to think about exposing the state in general, so that we could just have a "get_state" function and an enum for the states. But I'm happy to merge this check for only a single of the possible states as-is. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15403 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5402430e5f39eef22dfa18f33807ab6b1e771f1b Gerrit-Change-Number: 15403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Sep 2019 18:48:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 484s] ar: `u' modifier ignored since `D' is the default (see `U') [ 484s] libtool: link: ranlib .libs/libtransceiver_common.a [ 484s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 484s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 484s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 485s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 485s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 485s] collect2: error: ld returned 1 exit status [ 485s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 485s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 485s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 485s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 485s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 485s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 485s] make[1]: *** [Makefile:444: all] Error 2 [ 485s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 485s] dh_auto_build: make -j1 returned exit code 2 [ 485s] make: *** [debian/rules:6: build] Error 255 [ 485s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 485s] [ 485s] lamb08 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 4 17:16:50 UTC 2019. [ 485s] [ 485s] ### VM INTERACTION START ### [ 488s] [ 468.025380] sysrq: SysRq : Power Off [ 488s] [ 468.036875] reboot: Power down [ 488s] ### VM INTERACTION END ### [ 488s] [ 488s] lamb08 failed "build osmo-trx_1.1.1.dsc" at Wed Sep 4 17:16:54 UTC 2019. [ 488s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...libosmo-sccp[master]: ss7: Do not queue messages if stream is not connected
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/15405
Change subject: ss7: Do not queue messages if stream is not connected
..
ss7: Do not queue messages if stream is not connected
Consider them as lost by the lower layer, otherwise lots of old messages
and retransmissions can end up queued in there until stream becomes
connected, and then will flood the peer with all those messages.
Depends: libosmo-netif.git 962bf9a48eed418354685dc733b8271d2dd62c27
Related: OS#4188
Change-Id: Ic7d3571848faf28221dcfa8eb8b33b42964d988e
---
M src/osmo_ss7.c
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/05/15405/1
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index e8a6918..053feca 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -1810,6 +1810,11 @@
msgb_free(msg);
return -EIO;
}
+ if (!osmo_stream_cli_is_connected(asp->client)) {
+ LOGPASP(asp, DLSS7, LOGL_ERROR, "Cannot transmit,
asp->client not connected\n");
+ msgb_free(msg);
+ return -EIO;
+ }
osmo_stream_cli_send(asp->client, msg);
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/15405
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ic7d3571848faf28221dcfa8eb8b33b42964d988e
Gerrit-Change-Number: 15405
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...libosmo-netif[master]: stream: Fix scheduling of queued messages during connecting state
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/15404 to look at the new patch set (#2). Change subject: stream: Fix scheduling of queued messages during connecting state .. stream: Fix scheduling of queued messages during connecting state If messages are sent using osmo_stream_cli_send() while the stream is still (re)connecting, they won't have a chance to be sent until the stream is connected, and hence they are queued until CONNECTING->CONNECTED is done. However, at that time (osmo_stream_cli_fd_cb), the WRITE flag was dropped unconditionally, which meant already queued packets didn't have the opportunity to be sent by the same callback until first message is enqueued and WRITE flag is set (again by osmo_stream_cli_send()). Let's make them be sent as soon as possible once the connection is available. Related: OS#4188 Change-Id: I289495f9aad6389c5f2623fb072d676235b7d24c --- M src/stream.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/04/15404/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I289495f9aad6389c5f2623fb072d676235b7d24c Gerrit-Change-Number: 15404 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...libosmo-netif[master]: stream: Fix scheduling of queued messages during connecting state
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/15404
Change subject: stream: Fix scheduling of queued messages during connecting
state
..
stream: Fix scheduling of queued messages during connecting state
If messages are sent using osmo_stream_cli_send() while the stream
is still (re)connecting, they won't have a chance to be sent until the
stream is connected, and hence they are queued until
CONNECTING->CONNECTED is done. However, at that time
(osmo_stream_cli_fd_cb), the WRITE flag was dropped unconditionally,
which meant already queued packets didn't have the opportunity to be
sent by the same callback until first message is enqueued and WRITE flag
is set (again by osmo_stream_cli_send()).
Let's make them be sent as soon as possible once the connection is
available.
Change-Id: I289495f9aad6389c5f2623fb072d676235b7d24c
---
M src/stream.c
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/04/15404/1
diff --git a/src/stream.c b/src/stream.c
index 74fe8b6..e9307a5 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -283,7 +283,12 @@
osmo_stream_cli_reconnect(cli);
return 0;
}
- ofd->when &= ~BSC_FD_WRITE;
+
+ /* If messages got enqueued while 'connecting', keep WRITE flag
+ up to dispatch them upon next main loop step */
+ if (llist_empty(>tx_queue))
+ cli->ofd.when &= ~BSC_FD_WRITE;
+
LOGSCLI(cli, LOGL_DEBUG, "connection done.\n");
cli->state = STREAM_CLI_STATE_CONNECTED;
if (cli->proto == IPPROTO_SCTP) {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15404
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I289495f9aad6389c5f2623fb072d676235b7d24c
Gerrit-Change-Number: 15404
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 1178s] ar: `u' modifier ignored since `D' is the default (see `U') [ 1178s] libtool: link: ranlib .libs/libtransceiver_common.a [ 1178s] libtool: link: ( cd ".libs" && rm -f "libtransceiver_common.la" && ln -s "../libtransceiver_common.la" "libtransceiver_common.la" ) [ 1178s] /bin/bash ../libtool --tag=CXX --mode=link g++ -lpthread -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/libdevice.la libtransceiver_common.la ../Transceiver52M/arch/x86/libarch.la ../GSM/libGSM.la ../CommonLibs/libcommon.la -lfftw3f -ltalloc -losmocore -ltalloc -losmoctrl -losmogsm -losmocore -ltalloc -losmovty -losmocore -luhd [ 1179s] libtool: link: g++ -I/usr/include/ -I/usr/include/ -I/usr/include/ -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z -Wl,relro -Wl,-z -Wl,now -o osmo-trx-uhd osmo_trx_uhd-osmo-trx.o ./device/uhd/.libs/libdevice.a ./.libs/libtransceiver_common.a ../Transceiver52M/arch/x86/.libs/libarch.a ../GSM/.libs/libGSM.a ../CommonLibs/.libs/libcommon.a -lpthread -lfftw3f /usr/lib/x86_64-linux-gnu/libosmoctrl.so /usr/lib/x86_64-linux-gnu/libosmogsm.so -ltalloc /usr/lib/x86_64-linux-gnu/libosmovty.so /usr/lib/x86_64-linux-gnu/libosmocore.so -luhd [ 1179s] /usr/bin/ld: ./device/uhd/.libs/libdevice.a(UHDDevice.o): undefined reference to symbol '_ZN5boost6system16generic_categoryEv' [ 1179s] /usr/bin/ld: /usr/lib/x86_64-linux-gnu/libboost_system.so.1.67.0: error adding symbols: DSO missing from command line [ 1179s] collect2: error: ld returned 1 exit status [ 1179s] make[4]: *** [Makefile:681: osmo-trx-uhd] Error 1 [ 1179s] make[4]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1179s] make[3]: *** [Makefile:820: all-recursive] Error 1 [ 1179s] make[3]: Leaving directory '/usr/src/packages/BUILD/Transceiver52M' [ 1179s] make[2]: *** [Makefile:513: all-recursive] Error 1 [ 1179s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1179s] make[1]: *** [Makefile:444: all] Error 2 [ 1179s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1179s] dh_auto_build: make -j1 returned exit code 2 [ 1179s] make: *** [debian/rules:6: build] Error 255 [ 1179s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1179s] [ 1179s] lamb21 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Sep 4 15:22:31 UTC 2019. [ 1179s] [ 1179s] ### VM INTERACTION START ### [ 1182s] [ 1156.980674] sysrq: SysRq : Power Off [ 1182s] [ 1157.039407] reboot: Power down [ 1182s] ### VM INTERACTION END ### [ 1182s] [ 1182s] lamb21 failed "build osmo-trx_1.1.1.10.77f3.dsc" at Wed Sep 4 15:22:34 UTC 2019. [ 1182s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Change in ...libosmo-netif[master]: stream: Introduce API osmo_stream_cli_is_connected
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-netif/+/15403
Change subject: stream: Introduce API osmo_stream_cli_is_connected
..
stream: Introduce API osmo_stream_cli_is_connected
Can be used by users to fetch current status of the stream.
Change-Id: I5402430e5f39eef22dfa18f33807ab6b1e771f1b
---
M include/osmocom/netif/stream.h
M src/stream.c
2 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/03/15403/1
diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index f1c160c..3427df5 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -67,6 +67,7 @@
void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int
(*disconnect_cb)(struct osmo_stream_cli *cli));
void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int
(*read_cb)(struct osmo_stream_cli *cli));
void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli);
+bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli);
struct osmo_stream_cli *osmo_stream_cli_create(void *ctx);
void osmo_stream_cli_destroy(struct osmo_stream_cli *cli);
diff --git a/src/stream.c b/src/stream.c
index 3d0b665..74fe8b6 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -184,6 +184,14 @@
cli->state = STREAM_CLI_STATE_CONNECTING;
}
+/*! \brief Check if Osmocom Stream Client is in connected state
+ * \param[in] cli Osmocom Stream Client
+ */
+bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli)
+{
+ return cli->state == STREAM_CLI_STATE_CONNECTED;
+}
+
/*! \brief Close an Osmocom Stream Client
* \param[in] cli Osmocom Stream Client to be closed
* We unregister the socket fd from the osmocom select() loop
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/15403
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I5402430e5f39eef22dfa18f33807ab6b1e771f1b
Gerrit-Change-Number: 15403
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15402 ) Change subject: manual: Update statements regarding SCCPlite .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5 Gerrit-Change-Number: 15402 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 14:22:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15402 ) Change subject: manual: Update statements regarding SCCPlite .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/15402/1/doc/manuals/chapters/overview.adoc File doc/manuals/chapters/overview.adoc: https://gerrit.osmocom.org/#/c/15402/1/doc/manuals/chapters/overview.adoc@96 PS1, Line 96: which is required to operate with OsmoMSC > is that actually correct? Or can OsmoMSC also run in SCCPlite mode these days? AFAIK only BSSAP/SCCP/M3UA is currently supported in MSC, but probably Neels can confirm. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5 Gerrit-Change-Number: 15402 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 11:10:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...pysim[master]: pySim-prog: Print out hex-escaped pin_adm in card parameters
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/pysim/+/15392 )
Change subject: pySim-prog: Print out hex-escaped pin_adm in card parameters
..
pySim-prog: Print out hex-escaped pin_adm in card parameters
Use h2b to convert pin_adm back to binary form for sysmoSIMgr2
Change-Id: Ia178c9938f3e6a4fbac24d767437894297d1e708
---
M pySim-prog.py
M pySim/cards.py
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/pySim-prog.py b/pySim-prog.py
index 2638eef..7edadd7 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -406,14 +406,15 @@
def print_parameters(params):
print """Generated card parameters :
- > Name: %(name)s
- > SMSP: %(smsp)s
- > ICCID : %(iccid)s
- > MCC/MNC : %(mcc)d/%(mnc)d
- > IMSI: %(imsi)s
- > Ki : %(ki)s
- > OPC : %(opc)s
- > ACC : %(acc)s
+ > Name : %(name)s
+ > SMSP : %(smsp)s
+ > ICCID: %(iccid)s
+ > MCC/MNC : %(mcc)d/%(mnc)d
+ > IMSI : %(imsi)s
+ > Ki : %(ki)s
+ > OPC : %(opc)s
+ > ACC : %(acc)s
+ > ADM1(hex): %(pin_adm)s
"""% params
diff --git a/pySim/cards.py b/pySim/cards.py
index 55282aa..cda337a 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -496,7 +496,7 @@
# P2: CHV number, as in VERIFY CHV for PIN, and as in UNBLOCK
CHV for PUK
# P3: 08, CHV length (curiously the PUK is also 08 length,
instead of 10)
if p['pin_adm']:
- pin = p['pin_adm']
+ pin = h2b(p['pin_adm'])
else:
pin = h2b("")
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/15392
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ia178c9938f3e6a4fbac24d767437894297d1e708
Gerrit-Change-Number: 15392
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: dexter
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...pysim[master]: pySim-prog: Print out hex-escaped pin_adm in card parameters
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15392 ) Change subject: pySim-prog: Print out hex-escaped pin_adm in card parameters .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia178c9938f3e6a4fbac24d767437894297d1e708 Gerrit-Change-Number: 15392 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 04 Sep 2019 10:47:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15402 ) Change subject: manual: Update statements regarding SCCPlite .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/15402/1/doc/manuals/chapters/overview.adoc File doc/manuals/chapters/overview.adoc: https://gerrit.osmocom.org/#/c/15402/1/doc/manuals/chapters/overview.adoc@96 PS1, Line 96: which is required to operate with OsmoMSC is that actually correct? Or can OsmoMSC also run in SCCPlite mode these days? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5 Gerrit-Change-Number: 15402 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 04 Sep 2019 10:47:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...pysim[master]: pySim-prog: Print out hex-escaped pin_adm in card parameters
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15392 ) Change subject: pySim-prog: Print out hex-escaped pin_adm in card parameters .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia178c9938f3e6a4fbac24d767437894297d1e708 Gerrit-Change-Number: 15392 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 04 Sep 2019 10:45:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Add CBSP_CodecPort + CBSP_Adapter
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15375 ) Change subject: Add CBSP_CodecPort + CBSP_Adapter .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15375/1/library/CBSP_CodecPort_CtrlFunctdef.cc File library/CBSP_CodecPort_CtrlFunctdef.cc: https://gerrit.osmocom.org/#/c/15375/1/library/CBSP_CodecPort_CtrlFunctdef.cc@16 PS1, Line 16: > several whitespace in this file. this is just a copy+paste of the other CtrlFunctdef.cc files we have for other protocols, I didn't change any whitespace. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I36b39b320c21502395f9d51d769d76adf5f5d602 Gerrit-Change-Number: 15375 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 10:45:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Add CBSP_CodecPort + CBSP_Adapter
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15375 )
Change subject: Add CBSP_CodecPort + CBSP_Adapter
..
Add CBSP_CodecPort + CBSP_Adapter
Change-Id: I36b39b320c21502395f9d51d769d76adf5f5d602
---
A library/CBSP_Adapter.ttcn
A library/CBSP_CodecPort.ttcn
A library/CBSP_CodecPort_CtrlFunct.ttcn
A library/CBSP_CodecPort_CtrlFunctdef.cc
4 files changed, 259 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/CBSP_Adapter.ttcn b/library/CBSP_Adapter.ttcn
new file mode 100644
index 000..8dbee6a
--- /dev/null
+++ b/library/CBSP_Adapter.ttcn
@@ -0,0 +1,77 @@
+module CBSP_Adapter {
+
+/* CBSP Adapter layer, sitting on top of CBSP_CodecPort.
+ * test suites can 'inherit' in order to have a CBSP connection to the IUT
which they're testing
+ *
+ * (C) 2018-2019 by Harald Welte
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ */
+
+
+import from Osmocom_Types all;
+import from General_Types all;
+import from CBSP_Types all;
+import from CBSP_Templates all;
+import from CBSP_CodecPort all;
+import from CBSP_CodecPort_CtrlFunct all;
+import from IPL4asp_Types all;
+import from IPL4asp_PortType all;
+import from Socket_API_Definitions all;
+
+const integer NUM_CBSP := 3;
+
+type component CBSP_Adapter_CT {
+ /* down-facing port to CBSP Codec port */
+ port CBSP_CODEC_PT CBSP[NUM_CBSP];
+ var IPL4asp_Types.ConnectionId g_cbsp_conn_id[NUM_CBSP] := { -1, -1, -1
};
+}
+
+private function f_set_tcp_segmentation(integer idx) runs on CBSP_Adapter_CT {
+ /* Set function for dissecting the binary stream into packets */
+ var f_IPL4_getMsgLen vl_f := refers(f_IPL4_fixedMsgLen);
+ /* Offset: 1, size of length: 3, delta: 4, multiplier: 1, big-endian */
+ CBSP_CodecPort_CtrlFunct.f_IPL4_setGetMsgLen(CBSP[idx],
g_cbsp_conn_id[idx], vl_f, {1, 3, 4, 1, 0});
+}
+
+function f_connect(charstring remote_host, IPL4asp_Types.PortNumber
remote_port,
+ charstring local_host, IPL4asp_Types.PortNumber local_port,
integer idx := 0)
+runs on CBSP_Adapter_CT {
+ var IPL4asp_Types.Result res;
+ map(self:CBSP[idx], system:CBSP);
+ res := CBSP_CodecPort_CtrlFunct.f_IPL4_connect(CBSP[idx], remote_host,
remote_port,
+ local_host, local_port,
0, { tcp :={} });
+ if (not ispresent(res.connId)) {
+ setverdict(fail, "Could not connect to CBSP port, check your
configuration");
+ mtc.stop;
+ }
+ g_cbsp_conn_id[idx] := res.connId;
+
+ f_set_tcp_segmentation(idx);
+}
+
+/* Function to use to bind to a local port as IPA server, accepting remote
clients */
+function f_bind(charstring local_host, IPL4asp_Types.PortNumber local_port,
integer idx := 0)
+runs on CBSP_Adapter_CT {
+ var IPL4asp_Types.Result res;
+ map(self:CBSP[idx], system:CBSP);
+ res := CBSP_CodecPort_CtrlFunct.f_IPL4_listen(CBSP[idx], local_host,
local_port, { tcp:={} });
+ g_cbsp_conn_id[idx] := res.connId;
+
+ f_set_tcp_segmentation(idx);
+}
+
+function f_cbsp_send(template (value) CBSP_PDU pdu, integer idx := 0) runs on
CBSP_Adapter_CT {
+ CBSP[idx].send(ts_CBSP_Send(g_cbsp_conn_id[idx], pdu));
+}
+
+function f_cbsp_exp(template CBSP_PDU exp, integer idx := 0) runs on
CBSP_Adapter_CT return CBSP_PDU {
+ var CBSP_RecvFrom rf;
+ CBSP[idx].receive(tr_CBSP_Recv(g_cbsp_conn_id[idx], exp)) -> value rf;
+ return rf.msg;
+}
+
+
+}
diff --git a/library/CBSP_CodecPort.ttcn b/library/CBSP_CodecPort.ttcn
new file mode 100644
index 000..442b3e4
--- /dev/null
+++ b/library/CBSP_CodecPort.ttcn
@@ -0,0 +1,64 @@
+module CBSP_CodecPort {
+
+/* Simple CBSP Codec Port, translating between raw TCP octetstring payload
+ * towards the IPL4asp port provider, and CBSP primitives
+ * which carry the decoded CBSP data types as payload.
+ *
+ * (C) 2018 by Harald Welte
+ * All rights reserved.
+ *
+ * Released under the terms of GNU General Public License, Version 2 or
+ * (at your option) any later version.
+ */
+
+
+import from IPL4asp_PortType all;
+import from IPL4asp_Types all;
+import from CBSP_Types all;
+
+type record CBSP_RecvFrom {
+ ConnectionIdconnId,
+ CBSP_PDUmsg
+}
+
+type record CBSP_Send {
+ ConnectionIdconnId,
+ CBSP_PDUmsg
+}
+
+template (value) CBSP_Send ts_CBSP_Send(ConnectionId conn_id, template (value)
CBSP_PDU msg) := {
+ connId := conn_id,
+ msg := msg
+}
+
+template CBSP_RecvFrom tr_CBSP_Recv(template ConnectionId conn_id, template
CBSP_PDU msg) := {
+ connId := conn_id,
+ msg := msg
+}
+
+private function
Change in ...osmo-bsc[master]: manual: Update statements regarding SCCPlite
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/15402
Change subject: manual: Update statements regarding SCCPlite
..
manual: Update statements regarding SCCPlite
SCCPlite is long supported (again) by osmo-bsc, let's remove the
outdated pointers to osmo-bsc-sccplite.
Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5
---
M doc/manuals/chapters/overview.adoc
1 file changed, 7 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/15402/1
diff --git a/doc/manuals/chapters/overview.adoc
b/doc/manuals/chapters/overview.adoc
index 869bd26..a27b0bf 100644
--- a/doc/manuals/chapters/overview.adoc
+++ b/doc/manuals/chapters/overview.adoc
@@ -39,14 +39,13 @@
Osmocom offers two variants of the 'A' interface's protocol stacking:
- 'BSSAP/SCCPlite'
-- 'BSSAP/SCCP/M3UA'
+- 'BSSAP/SCCP/M3UA' (called AoIP)
Traditionally, OsmoBSC only implemented the BSSAP/SCCPlite protocol, but since
a
-proper M3UA implementation is available from 'libosmo-sigtran'
-('libosmo-sccp.git'), the stock OsmoBSC now supports only BSSAP/SCCP/M3UA. (The
-idea is that SCCPlite support may be added to libosmo-sigtran at some point
-in the future, after which the new `osmo-bsc` would support both variants of
-the A interface.)
+proper M3UA implementation became available in 2017 as part of
'libosmo-sigtran'
+('libosmo-sccp.git'), the stock OsmoBSC now supports BSSAP/SCCP/M3UA. SCCPlite
+support has been subsequently added to libosmo-sigtran in 2018, and now both
+variants of the 'A' interface are supported by `osmo-bsc`.
The difference between an BSSAP/SCCPlite and BSSAP/SCCP/M3UA is illustrated in
<> and <>.
@@ -54,16 +53,12 @@
= BSSAP/SCCPlite
Unlike classic A interface implementations for E1 interfacs,
-`osmo-bsc-sccplite` implements a variant of encapsulating the A interface over
+`osmo-bsc` implements a variant of encapsulating the A interface over
IP. To do so, the SCCP messages are wrapped in an IPA multiplex and then
communicated over TCP. The audio channels are mapped to RTP streams.
This protocol stacking is sometimes called "SCCPlite".
-At the time of writing, if you would like to use the old BSSAP/SCCPlite
protocol,
-look for binary packages named `osmo-bsc-sccplite`, or compile `osmo-bsc` from
-the 'openbsc.git' repository.
-
[[fig-sccplite]]
.`osmo-bsc-sccplite` operation using 'BSSAP/SCCPlite'
[graphviz]
@@ -98,9 +93,7 @@
|IP
|=
-To use the now-default BSSAP/SCCP/M3UA protocol, look for binary packages named
-`osmo-bsc`, or compile `osmo-bsc` from the 'osmo-bsc.git' repository. It is
-recommended to use the M3UA variant, which is required to operate with OsmoMSC.
+It is recommended to use the M3UA variant, which is required to operate with
OsmoMSC.
To route SCCP/M3UA messages between OsmoBSC and and MSC, an STP instance like
OsmoSTP is required.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15402
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ia3d831aca7c3c7ef9f257e974faf6e8e360c59f5
Gerrit-Change-Number: 15402
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in ...osmo-bsc[master]: Cell Broadcast: CBSP and CBCH scheduling support
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15373 ) Change subject: Cell Broadcast: CBSP and CBCH scheduling support .. Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc File doc/manuals/chapters/smscb.adoc: https://gerrit.osmocom.org/#/c/15373/2/doc/manuals/chapters/smscb.adoc@44 PS2, Line 44: connecting to the CBC. This way the BSCs all need to know the CBC IP > 1- Extra space after dot. […] 1- I always use double spacing after the end of a sentence. It probably shows that I was using Emaacs in the 1990ies, where this was pretty much default. I still think it's much more readable this way. And it's an easy way to programmatically distinguish the dot as part of an abbreviation (e.g. ...) and the dot at the end of the sentence. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia0a0de862a104d0f447a5d6e56c7c83981b825c7 Gerrit-Change-Number: 15373 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 10:44:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Add CBSP (Cell Broadcast Service Protocol) types + templates
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15374 ) Change subject: Add CBSP (Cell Broadcast Service Protocol) types + templates .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ida2e0af7d282fd7d5318110c05efa5a10114242c Gerrit-Change-Number: 15374 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 10:44:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...pysim[master]: pySim-prog: Add option for hex ADM keys
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15393 ) Change subject: pySim-prog: Add option for hex ADM keys .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15393 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id75a03482aa7f8cc3bdbb8d5967f1e8ab45c179a Gerrit-Change-Number: 15393 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 04 Sep 2019 10:45:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: doc: update bsc_vty_reference.xml
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-bsc/+/15378 ) Change subject: doc: update bsc_vty_reference.xml .. doc: update bsc_vty_reference.xml Change-Id: I6244a0de8802f437b5b291c76b4fc7bd4262baf8 --- M doc/manuals/vty/bsc_vty_reference.xml 1 file changed, 140 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml index 6a3e4fb..178e5b5 100644 --- a/doc/manuals/vty/bsc_vty_reference.xml +++ b/doc/manuals/vty/bsc_vty_reference.xml @@ -402,6 +402,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1070,6 +1120,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2602,7 +2702,7 @@ - + @@ -2612,7 +2712,7 @@ - + @@ -2622,8 +2722,8 @@ - - + + @@ -2662,7 +2762,7 @@ - + @@ -2672,7 +2772,7 @@ - + @@ -2682,8 +2782,8 @@ - - + + @@ -2720,7 +2820,7 @@ - + @@ -2740,7 +2840,7 @@ - + @@ -2801,7 +2901,7 @@ - + @@ -2810,7 +2910,7 @@ - + @@ -2819,7 +2919,7 @@ - + @@ -2827,7 +2927,7 @@ - + @@ -2836,7 +2936,7 @@ - + @@ -2920,15 +3020,15 @@ - - + + - + @@ -2959,8 +3059,8 @@ - - + + @@ -4072,6 +4172,12 @@ + + + + + + @@ -4129,7 +4235,7 @@ - + @@ -4139,7 +4245,7 @@ - + @@ -4149,8 +4255,8 @@ - - + + @@ -4189,7 +4295,7 @@ - + @@ -4199,7 +4305,7 @@ - + @@ -4209,8 +4315,8 @@ - - + + @@ -4247,7 +4353,7 @@ - + @@ -4267,7 +4373,7 @@ - + @@ -4328,7 +4434,7 @@ - + @@ -4337,7 +4443,7 @@ - + @@ -4346,7 +4452,7 @@ - + @@ -4354,7 +4460,7 @@ - + -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/15378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id:
Change in ...pysim[master]: Add an option to read the iccid and batch-program the new card data
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15394 ) Change subject: Add an option to read the iccid and batch-program the new card data .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15394 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib343a29141b5255f67a59ab76959b51e162b7916 Gerrit-Change-Number: 15394 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Comment-Date: Wed, 04 Sep 2019 10:41:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "bts: f_init_pcu: sleep before connect"
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401 ) Change subject: Revert "bts: f_init_pcu: sleep before connect" .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2115c337f4601a4614b140715323c42803b003ee Gerrit-Change-Number: 15401 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 10:31:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: Revert "bts: f_init_pcu: sleep before connect"
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401
Change subject: Revert "bts: f_init_pcu: sleep before connect"
..
Revert "bts: f_init_pcu: sleep before connect"
This reverts commit c089b415f5e3bbf5eb2de435b925581ca42d8872. The
additional sleep caused other tests to break, probably because it
triggered race conditions:
* TC_pcu_socket_connect_multi
* TC_pcu_socket_connect_si3gprs
* TC_si_sched_13_2bis_2ter_2quater
Adjust TC_pcu_socket_verify_info_ind test case error message to mention
OS#4179. This test is flapping now, most of the time the BTS sends a
CellID 0 because it did not receive the real CellID from the BSC yet.
Related: OS#4179
Change-Id: I2115c337f4601a4614b140715323c42803b003ee
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/01/15401/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 15948a3..2c11ca2 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -324,9 +324,6 @@
pcu_conn_id := -1;
return;
}
-
- f_sleep(0.5); /* workaround for OS#4179 */
-
pcu_conn_id := f_pcuif_connect(pt, mp_pcu_socket);
T.start;
@@ -4876,7 +4873,9 @@
var uint16_t cell_id_si3 := si3.payload.si3.cell_id;
var uint16_t cell_id_pcu := g_pcu_last_info.u.info_ind.cell_id;
if (cell_id_si3 != cell_id_pcu) {
- setverdict(fail, "Expected cell_id ", cell_id_si3, " got: ",
cell_id_pcu);
+ setverdict(fail, "Expected cell_id '", cell_id_si3, "' and got
'", cell_id_pcu, "'. This either means,",
+" that the BTS is sending the wrong cell_id,
or that the BTS sent it too early",
+" (OS#4179)");
}
/* Verify LAC */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15401
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2115c337f4601a4614b140715323c42803b003ee
Gerrit-Change-Number: 15401
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-MessageType: newchange
Change in ...pysim[master]: pySim-prog: Use CSV format with headers
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15313 ) Change subject: pySim-prog: Use CSV format with headers .. Patch Set 3: Verified+1 Code-Review+1 > Patch Set 3: > > I refactored the code and split it up into different commits as well. There > were quite a few corner cases we weren't handling before, and there should be > less now. I have tested it with a CSV file, seems to work fine for me. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236 Gerrit-Change-Number: 15313 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 04 Sep 2019 09:31:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...gr-gsm[master]: Fix uplink sub_slot and sub_types assignment in the sdcch4 and bcch_c...
ptrkrysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/gr-gsm/+/14948 )
Change subject: Fix uplink sub_slot and sub_types assignment in the sdcch4 and
bcch_ccch demappers blocks
..
Fix uplink sub_slot and sub_types assignment in the sdcch4 and bcch_ccch
demappers blocks
Add support for RACH bursts although they are not yet supported in the
receiver and control channel decoder blocks.
3GPP TS 45.002 version 15.1.0 Release 15
Table 3 : Mapping of logical channels onto physical channels (see subclauses
6.3, 6.4, 6.5)
Figure 8a: TDMA frame mapping for FCCH + SCH + BCCH + CCCH
Fixes the following tests:
qa_gsm_bcch_ccch_demapper.test_uplink
qa_gsm_bcch_ccch_sdcch4_demapper.test_uplink
Change-Id: Ia6b3070c1085bcdda6d98fd94a89c6e0982e2aec
---
M hier_blocks/demapping/gsm_bcch_ccch_demapper.grc
M hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc
M lib/demapping/universal_ctrl_chans_demapper_impl.cc
M python/demapping/gsm_bcch_ccch_demapper.py
M python/demapping/gsm_bcch_ccch_sdcch4_demapper.py
M python/qa_gsm_bcch_ccch_demapper.py
M python/qa_gsm_bcch_ccch_sdcch4_demapper.py
7 files changed, 300 insertions(+), 14 deletions(-)
Approvals:
ptrkrysik: Looks good to me, approved; Verified
laforge: Looks good to me, but someone else must approve
diff --git a/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc
b/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc
index 79033ef..5f751b1 100644
--- a/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc
+++ b/hier_blocks/demapping/gsm_bcch_ccch_demapper.grc
@@ -137,15 +137,15 @@
uplink_channel_types
-
[2,2,2,2,0,0,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,0,0,2,2,2,2,]
+
[3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,]
uplink_starts_fn_mod51
-
[0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,41,41,41,41,0,0,47,47,47,47]
+
[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,]
uplink_subslots
-
[0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3,0,0,0,0,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3]
+
[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
diff --git a/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc
b/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc
index 9d722ba..235feb2 100644
--- a/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc
+++ b/hier_blocks/demapping/gsm_bcch_ccch_sdcch4_demapper.grc
@@ -137,15 +137,15 @@
uplink_channel_types
-
[7,7,7,7,0,0,135,135,135,135,135,135,135,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,7,7,7,7,7,7,0,0,7,7,7,7]
+
[7,7,7,7,3,3,135,135,135,135,135,135,135,135,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,7,7,7,7,7,7,7,7,3,3,7,7,7,7]
uplink_starts_fn_mod51
-
[0,0,0,0,0,0,6,6,6,6,10,10,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,37,37,41,41,41,41,0,0,47,47,47,47]
+
[0,0,0,0,4,5,6,6,6,6,10,10,10,10,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,37,37,37,41,41,41,41,45,46,47,47,47,47,]
uplink_subslots
-
[0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3,0,0,0,0,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,0,0,3,3,3,3]
+
[3,3,3,3,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,2,2,2,2,3,3,3,3,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,2,2,2,2,]
diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
index a6ab956..94e8648 100644
--- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
+++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
@@ -128,9 +128,6 @@
frame_numbers = d_downlink_frame_numbers;
bursts = d_downlink_bursts;
}
-
-uint32_t fn51_start = starts_fn_mod51[fn_mod51];
-uint32_t fn51_stop = fn51_start + 3;
//set type
new_header->type = GSMTAP_TYPE_UM;
@@ -141,7 +138,16 @@
new_header->sub_type = ch_type;
}
new_header->sub_slot = subslots[fn_mod102];
-
+
+if (ch_type == GSMTAP_CHANNEL_RACH)
+{
+message_port_pub(pmt::mp("bursts"), burst_out);
+
Change in ...gr-gsm[master]: Add control channels demappers tests
ptrkrysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/gr-gsm/+/14945 )
Change subject: Add control channels demappers tests
..
Add control channels demappers tests
3GPP TS 45.002 version 15.1.0 Release 15
Table 3 : Mapping of logical channels onto physical channels (see subclauses
6.3, 6.4, 6.5)
Table 4 : Mapping of logical channels onto physical channels (see subclauses
6.3, 6.4, 6.5)
Figure 8a: TDMA frame mapping for FCCH + SCH + BCCH + CCCH
Figure 8b: TDMA frame mapping for FCCH + SCH + BCCH + CCCH + SDCCH/4(0...3) +
SACCH/4(0...3)
Five of the six tests currently fail and are marked with
@unittest.expectedFailure. Fixes in subsequent commits.
Change-Id: I33b0948832a0c2506bffd389cc134c3236c74d27
---
M include/grgsm/qa_utils/burst_sink.h
M include/grgsm/qa_utils/burst_source.h
M lib/qa_utils/burst_sink_impl.cc
M lib/qa_utils/burst_sink_impl.h
M lib/qa_utils/burst_source_impl.cc
M lib/qa_utils/burst_source_impl.h
M python/CMakeLists.txt
A python/qa_gsm_bcch_ccch_demapper.py
A python/qa_gsm_bcch_ccch_sdcch4_demapper.py
A python/qa_gsm_demapper_data.py
A python/qa_gsm_sdcch8_demapper.py
11 files changed, 653 insertions(+), 3 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
ptrkrysik: Looks good to me, approved; Verified
diff --git a/include/grgsm/qa_utils/burst_sink.h
b/include/grgsm/qa_utils/burst_sink.h
index 774075f..ed811ed 100644
--- a/include/grgsm/qa_utils/burst_sink.h
+++ b/include/grgsm/qa_utils/burst_sink.h
@@ -54,6 +54,8 @@
virtual std::vector get_timeslots() = 0;
virtual std::vector get_burst_data() = 0;
virtual pmt::pmt_t get_bursts() = 0;
+ virtual std::vector get_sub_types() = 0;
+ virtual std::vector get_sub_slots() = 0;
};
} // namespace gsm
} // namespace gr
diff --git a/include/grgsm/qa_utils/burst_source.h
b/include/grgsm/qa_utils/burst_source.h
index e74a8aa..2f249ad 100644
--- a/include/grgsm/qa_utils/burst_source.h
+++ b/include/grgsm/qa_utils/burst_source.h
@@ -54,6 +54,7 @@
virtual void set_framenumbers(const std::vector ) = 0;
virtual void set_timeslots(const std::vector ) = 0;
virtual void set_burst_data(const std::vector _data)
= 0;
+ virtual void set_arfcn(uint16_t arfcn) = 0;
};
} // namespace gsm
diff --git a/lib/qa_utils/burst_sink_impl.cc b/lib/qa_utils/burst_sink_impl.cc
index bdc2192..5151bf6 100644
--- a/lib/qa_utils/burst_sink_impl.cc
+++ b/lib/qa_utils/burst_sink_impl.cc
@@ -90,6 +90,8 @@
d_framenumbers.push_back(frame_nr);
d_timeslots.push_back(header->timeslot);
d_burst_data.push_back(burst_str.str());
+d_sub_types.push_back(header->sub_type);
+d_sub_slots.push_back(header->sub_slot);
}
std::vector burst_sink_impl::get_framenumbers()
@@ -110,6 +112,14 @@
{
return d_bursts;
}
+std::vector burst_sink_impl::get_sub_types()
+{
+return d_sub_types;
+}
+std::vector burst_sink_impl::get_sub_slots()
+{
+return d_sub_slots;
+}
} /* namespace gsm */
} /* namespace gr */
diff --git a/lib/qa_utils/burst_sink_impl.h b/lib/qa_utils/burst_sink_impl.h
index e87422d..15e3bcf 100644
--- a/lib/qa_utils/burst_sink_impl.h
+++ b/lib/qa_utils/burst_sink_impl.h
@@ -36,6 +36,8 @@
std::vector d_timeslots;
std::vector d_burst_data;
pmt::pmt_t d_bursts;
+ std::vector d_sub_types;
+ std::vector d_sub_slots;
public:
burst_sink_impl();
~burst_sink_impl();
@@ -44,6 +46,8 @@
virtual std::vector get_timeslots();
virtual std::vector get_burst_data();
virtual pmt::pmt_t get_bursts();
+ virtual std::vector get_sub_types();
+ virtual std::vector get_sub_slots();
};
} // namespace gsm
diff --git a/lib/qa_utils/burst_source_impl.cc
b/lib/qa_utils/burst_source_impl.cc
index f415eaf..276ed0e 100644
--- a/lib/qa_utils/burst_source_impl.cc
+++ b/lib/qa_utils/burst_source_impl.cc
@@ -52,7 +52,8 @@
: gr::block("burst_source",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0)),
- d_finished(false)
+ d_finished(false),
+ d_arfcn(0)
{
message_port_register_out(pmt::mp("out"));
set_framenumbers(framenumbers);
@@ -85,6 +86,11 @@
d_burst_data = burst_data;
}
+void burst_source_impl::set_arfcn(uint16_t arfcn)
+{
+d_arfcn = arfcn;
+}
+
bool burst_source_impl::start()
{
d_finished = false;
@@ -122,7 +128,7 @@
tap_header->timeslot = d_timeslots[i];
tap_header->frame_number = htobe32(d_framenumbers[i]);
tap_header->sub_type = GSMTAP_BURST_NORMAL;
-tap_header->arfcn = 0;
+tap_header->arfcn = d_arfcn;
tap_header->signal_dbm = 0;
Change in ...gr-gsm[master]: Fix sub_slot assignment in the universal_ctrl_chans_demapper block
ptrkrysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/gr-gsm/+/14946 )
Change subject: Fix sub_slot assignment in the universal_ctrl_chans_demapper
block
..
Fix sub_slot assignment in the universal_ctrl_chans_demapper block
3GPP TS 45.002 version 15.1.0 Release 15
Table 3 : Mapping of logical channels onto physical channels (see subclauses
6.3, 6.4, 6.5)
Table 4 : Mapping of logical channels onto physical channels (see subclauses
6.3, 6.4, 6.5)
Fixes the following tests:
qa_gsm_bcch_ccch_sdcch4_demapper.test_downlink
qa_gsm_sdcch8_demapper.test_downlink
Change-Id: Idc63407694fd1f7be962ab630d4e8c13b4a5d348
---
M lib/demapping/universal_ctrl_chans_demapper_impl.cc
M python/qa_gsm_bcch_ccch_sdcch4_demapper.py
M python/qa_gsm_sdcch8_demapper.py
3 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
ptrkrysik: Looks good to me, approved; Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
diff --git a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
index 98bcc9c..a6ab956 100644
--- a/lib/demapping/universal_ctrl_chans_demapper_impl.cc
+++ b/lib/demapping/universal_ctrl_chans_demapper_impl.cc
@@ -140,7 +140,7 @@
{
new_header->sub_type = ch_type;
}
-new_header->sub_slot = subslots[fn_mod51 + (51 * (frame_nr % 2))];
+new_header->sub_slot = subslots[fn_mod102];
if(fn_mod51>=fn51_start && fn_mod51<=fn51_stop)
{
diff --git a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
b/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
index c71a2e1..76f8ecc 100644
--- a/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
+++ b/python/qa_gsm_bcch_ccch_sdcch4_demapper.py
@@ -37,7 +37,6 @@
def tearDown (self):
self.tb = None
-@unittest.expectedFailure
def test_downlink (self):
"""
BCCH_CCCH_SDCCH4 demapper downlink test
diff --git a/python/qa_gsm_sdcch8_demapper.py b/python/qa_gsm_sdcch8_demapper.py
index 83d745c..21841a7 100644
--- a/python/qa_gsm_sdcch8_demapper.py
+++ b/python/qa_gsm_sdcch8_demapper.py
@@ -37,7 +37,6 @@
def tearDown (self):
self.tb = None
-@unittest.expectedFailure
def test_downlink (self):
"""
SDCCH8 demapper downlink test
--
To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/14946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: gr-gsm
Gerrit-Branch: master
Gerrit-Change-Id: Idc63407694fd1f7be962ab630d4e8c13b4a5d348
Gerrit-Change-Number: 14946
Gerrit-PatchSet: 2
Gerrit-Owner: vvvelichkov
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: ptrkrysik
Gerrit-MessageType: merged
Change in ...gr-gsm[master]: Fix uplink sub_slot assignment in the sdcch8 demapper block
ptrkrysik has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/gr-gsm/+/14947 ) Change subject: Fix uplink sub_slot assignment in the sdcch8 demapper block .. Fix uplink sub_slot assignment in the sdcch8 demapper block 3GPP TS 45.002 version 15.1.0 Release 15 Table 4 : Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) Fixes qa_gsm_sdcch8_demapper.test_uplink test Change-Id: I29e9055805c8478010c51ceb40f86ba3aed5ecab --- M hier_blocks/demapping/gsm_sdcch8_demapper.grc M python/demapping/gsm_sdcch8_demapper.py M python/qa_gsm_sdcch8_demapper.py 3 files changed, 148 insertions(+), 3 deletions(-) Approvals: ptrkrysik: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve diff --git a/hier_blocks/demapping/gsm_sdcch8_demapper.grc b/hier_blocks/demapping/gsm_sdcch8_demapper.grc index d9496cb..8a1f509 100644 --- a/hier_blocks/demapping/gsm_sdcch8_demapper.grc +++ b/hier_blocks/demapping/gsm_sdcch8_demapper.grc @@ -145,7 +145,7 @@ uplink_subslots - [1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4] + [5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4] diff --git a/python/demapping/gsm_sdcch8_demapper.py b/python/demapping/gsm_sdcch8_demapper.py index 3d3a5a0..b412594 100644 --- a/python/demapping/gsm_sdcch8_demapper.py +++ b/python/demapping/gsm_sdcch8_demapper.py @@ -51,7 +51,153 @@ ## # Blocks ## -self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper(timeslot_nr, ([0,0,0,0,4,4,4,4,8,8,8,8,12,12,12,12,16,16,16,16,20,20,20,20,24,24,24,24,28,28,28,28,32,32,32,32,36,36,36,36,40,40,40,40,44,44,44,44,0,0,0]), ([8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,136,0,0,0]), ([0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0]), ([0,0,0,0,4,4,4,4,8,8,8,8,0,0,0,15,15,15,15,19,19,19,19,23,23,23,23,27,27,27,27,31,31,31,31,35,35,35,35,39,39,39,39,43,43,43,43,47,47,47,47]), ([136,136,136,136,136,136,136,136,136,136,136,136,0,0,0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,136,136,136,136]), ([1,1,1,1,2,2,2,2,3,3,3,3,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,5,5,5,5,6,6,6,6,7,7,7,7,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7,4,4,4,4])) + +# 3GPP TS 45.002 version 15.1.0 Release 15 +# Table 4 : Mapping of logical channels onto physical channels (see subclauses 6.3, 6.4, 6.5) +# SDCCH/8 0 D 0 ... 7 C0 ... Cn NB1 51 B (0 ... 3) +# U B (15 ... 18) +# 1 D B (4 ... 7) +# U B (19 ... 22) +# 2 D B (8 ... 11) +# U B (23 ... 26) +# 3 D B (12 ... 15) +# U B (27 ... 30) +# 4 D B (16 ... 19) +# U B (31 ... 34) +# 5 D B (20 ... 23) +# U B (35 ... 38) +# 6 D B (24 ... 27) +# U B (39 ... 42) +# 7 D B (28 ... 31) +# U B (43 ... 46) +# SACCH/C8 0 D 0 ... 7 C0 ... Cn NB3 102 B (32 ... 35) +#U B (47 ... 50) +# 1 D B (36 ... 39) +#U B (51 ... 54) +# 2 D B (40 ... 43) +#U B (55 ... 58) +# 3 D B (44 ... 47) +#U B (59 ... 62) +# 4 D B (83 ... 86) +#U B (98 ... 101) +# 5 D B (87 ... 90) +#U B (0 ... 3) +# 6 D B (91 ... 94) +#U B (4 ... 7) +# 7 D B (95 ... 98) +#U B (8 ... 11) +self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper( +timeslot_nr, ([ #downlink +0,0,0,0, +4,4,4,4, +8,8,8,8, +12,12,12,12, +16,16,16,16, +20,20,20,20, +24,24,24,24, +28,28,28,28, +32,32,32,32, +36,36,36,36, +40,40,40,40, +44,44,44,44, +
Change in ...gr-gsm[master]: Fix uplink sub_slot and sub_types assignment in the sdcch4 and bcch_c...
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/14948 ) Change subject: Fix uplink sub_slot and sub_types assignment in the sdcch4 and bcch_ccch demappers blocks .. Patch Set 2: Verified+1 Code-Review+2 :D -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/14948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: Ia6b3070c1085bcdda6d98fd94a89c6e0982e2aec Gerrit-Change-Number: 14948 Gerrit-PatchSet: 2 Gerrit-Owner: vvvelichkov Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Wed, 04 Sep 2019 07:16:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...gr-gsm[master]: Fix uplink sub_slot assignment in the sdcch8 demapper block
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/14947 ) Change subject: Fix uplink sub_slot assignment in the sdcch8 demapper block .. Patch Set 2: Verified+1 Code-Review+2 Thank you for looking carefully at those assignments and fixing them. -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/14947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I29e9055805c8478010c51ceb40f86ba3aed5ecab Gerrit-Change-Number: 14947 Gerrit-PatchSet: 2 Gerrit-Owner: vvvelichkov Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: ptrkrysik Gerrit-Comment-Date: Wed, 04 Sep 2019 07:06:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...gr-gsm[master]: Add control channels demappers tests
ptrkrysik has posted comments on this change. ( https://gerrit.osmocom.org/c/gr-gsm/+/14945 ) Change subject: Add control channels demappers tests .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/gr-gsm/+/14945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-Change-Id: I33b0948832a0c2506bffd389cc134c3236c74d27 Gerrit-Change-Number: 14945 Gerrit-PatchSet: 2 Gerrit-Owner: vvvelichkov Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: ptrkrysik Gerrit-Reviewer: vvvelichkov Gerrit-Comment-Date: Wed, 04 Sep 2019 06:30:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
