Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 121s] [COMPILING apps/dfu/main.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 121s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 121s] Memory region Used Size Region Size %age Used [ 121s] rom: 16580 B16 KB101.20% [ 121s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 121s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 122s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 122s] collect2: error: ld returned 1 exit status [ 122s] % [ 122s] make[2]: *** [Makefile:234: flash] Error 1 [ 122s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 122s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 122s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 122s] dh_auto_build: error: make -j1 returned exit code 2 [ 122s] make: *** [debian/rules:16: build] Error 25 [ 122s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 122s] ### VM INTERACTION START ### [ 125s] [ 105.250980] sysrq: Power Off [ 125s] [ 105.258451] reboot: Power down [ 125s] ### VM INTERACTION END ### [ 125s] [ 125s] goat11 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 9 02:41:56 UTC 2021. [ 125s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 171s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 171s] [COMPILING libboard/qmod/source/card_pres.c] [ 171s] [COMPILING libboard/qmod/source/wwan_led.c] [ 171s] [COMPILING libboard/qmod/source/i2c.c] [ 171s] [COMPILING libboard/qmod/source/board_qmod.c] [ 171s] [COMPILING apps/dfu/main.c] [ 171s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 172s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 172s] Memory region Used Size Region Size %age Used [ 172s] rom: 16588 B16 KB101.25% [ 172s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 172s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 172s] collect2: error: ld returned 1 exit status [ 172s] % [ 172s] make[2]: *** [Makefile:234: flash] Error 1 [ 172s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 172s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 172s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 172s] dh_auto_build: error: make -j1 returned exit code 2 [ 172s] make: *** [debian/rules:16: build] Error 25 [ 172s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 172s] ### VM INTERACTION START ### [ 175s] [ 160.243393] sysrq: Power Off [ 175s] [ 160.249197] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb07 failed "build simtrace2_0.7.0.70.657c.dsc" at Tue Feb 9 02:12:33 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: enb,epc,ms: refactor KPI API .. Patch Set 4: Code-Review+2 thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 21:44:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 to look at the new patch set (#4). Change subject: enb,epc,ms: refactor KPI API .. enb,epc,ms: refactor KPI API we previously mixed component specific and component agnostic APIs (stdout vs. log file for example) for setting and retrieving KPI. This patch propose to use a single abstract get_kpis() method for all components that can be enriched with component-specific stuff as desired. In the case of srsLTE blocks, the main implementation will remain in srslte_common() and is shared among srsENB/srsUE/srsEPC. The KPI analyzer in srslte_common() extract and also manages all three KPI sources (log, csv and stdout) independently. In addition to the get_kpis() method that always returns a flat dictionary, it also exposes get_kpi_tree() that return a dict of KPI dicts that will be used for the Junit.xml generation. Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 --- M src/osmo_gsm_tester/obj/enb.py M src/osmo_gsm_tester/obj/enb_amarisoft.py M src/osmo_gsm_tester/obj/enb_srs.py M src/osmo_gsm_tester/obj/epc.py M src/osmo_gsm_tester/obj/epc_amarisoft.py M src/osmo_gsm_tester/obj/epc_srs.py M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/obj/srslte_common.py 8 files changed, 53 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/00/22600/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gbproxy[master]: gb_proxy_peer:Add Function to get gbproxy cell by cell id
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652 )
Change subject: gb_proxy_peer:Add Function to get gbproxy cell by cell id
..
Patch Set 4:
The libosmocore change-id has been merged 4 days ago, but this one still fails.
gb_proxy_peer.c:215:11: error: ‘struct gbproxy_cell’ has no member named ‘id’
if (cell->id.cid == cid && gsm48_compare_ra(>id.raid, raid) == 0) {
^~
gb_proxy_peer.c:215:30: error: implicit declaration of function
‘gsm48_compare_ra’ [-Werror=implicit-function-declaration]
if (cell->id.cid == cid && gsm48_compare_ra(>id.raid, raid) == 0) {
^~~~
gb_proxy_peer.c:215:52: error: ‘struct gbproxy_cell’ has no member named ‘id’
if (cell->id.cid == cid && gsm48_compare_ra(>id.raid, raid) == 0) {
^~
--
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22652
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: I3403736eed9d6819634c26db0b90393ac6f4416a
Gerrit-Change-Number: 22652
Gerrit-PatchSet: 4
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-CC: dexter
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Comment-Date: Mon, 08 Feb 2021 20:21:25 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 )
Change subject: msc: finish and enable test case for MT Call T310 timer
..
msc: finish and enable test case for MT Call T310 timer
The test suite needs to handle MGCP messages, otherwise the related
FSMs in the IUT would tear everything down before T310 is expired.
Change-Id: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281
Related: SYS#5340
---
M msc/MSC_Tests.ttcn
1 file changed, 41 insertions(+), 15 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index e6681bb..206effa 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -1679,43 +1679,69 @@
/* Test MT Call T310 timer */
friend function f_tc_mt_t310(charstring id, BSC_ConnHdlrPars pars) runs on
BSC_ConnHdlr {
- f_init_handler(pars, 200.0);
var CallParameters cpars := valueof(t_CallParams('123456'H, 0));
- var MNCC_PDU mncc;
var MgcpCommand mgcp_cmd;
+ var PDU_BSSAP bssap;
+ timer T310;
+ f_init_handler(pars);
+
+ /* Initiate a MT call, establish connection */
f_mt_call_start(cpars);
/* MS->MSC: CALL CONFIRMED */
BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CALL_CONF(cpars.transaction_id)));
MNCC.receive(tr_MNCC_CALL_CONF_ind(cpars.mncc_callref));
- MGCP.receive(tr_CRCX) -> value mgcp_cmd;
- cpars.mgcp_call_id := f_MgcpCmd_extract_call_id(mgcp_cmd);
- cpars.mgcp_ep := mgcp_cmd.line.ep;
- /* FIXME: Respond to CRCX */
+ /* NOTE: MSC is expected to start T310 here */
- /* old libosmocore T310 default timeout is 180s. so let's wait 190 */
- timer T := 190.0;
- T.start;
+ /* MSC->MGW: CRCX (first) */
+ MGCP.receive(tr_CRCX) -> value mgcp_cmd;
+ f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */
+
+ /* BSC->BSC: BSSMAP ASSIGNMENT REQ */
+ BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, ?)) -> value bssap;
+ BSSAP.send(ts_BSSMAP_AssignmentComplete(omit,
+ aoip := f_ts_BSSMAP_IE_AoIP_TLA(cpars.bss_rtp_ip,
cpars.bss_rtp_port),
+ speechCodec := ts_BSSMAP_IE_SpeechCodec({ ts_CodecFR })));
+
+ /* MSC->MGW: MDCX */
+ MGCP.receive(tr_MDCX) -> value mgcp_cmd;
+ MGCP.send(ts_MDCX_ACK(mgcp_cmd.line.trans_id,
cpars.mgw_conn_1.mgcp_connection_id,
+ sdp := omit));
+
+ /* MSC->MGW: CRCX (second) */
+ MGCP.receive(tr_CRCX) -> value mgcp_cmd;
+ f_handle_crcx(cpars, mgcp_cmd); /* MSC<-MGW: OK */
+ MNCC.receive(tr_MNCC_RTP_CREATE(cpars.mncc_callref));
+
+ /* Reschedule the guard timeout */
+ g_Tguard.start(30.0 + 10.0);
+
+ /* NOTE: the BSC is expected to respond with CC ALERTING at this state,
so
+* the MSC would stop T310. However, the idea is to verify T310
expiration
+* here, so grab some popcorn and wait for MNCC DISC.ind. */
+ T310.start(30.0 + 2.0);
alt {
- [] T.timeout {
- setverdict(fail, "Timeout waiting for T310");
+ [] T310.timeout {
+ setverdict(fail, "Timeout waiting for MNCC DISC.ind due to
T310");
mtc.stop;
}
[] MNCC.receive(tr_MNCC_DISC_ind(cpars.mncc_callref)) {
MNCC.send(ts_MNCC_REL_req(cpars.mncc_callref,
valueof(ts_MNCC_cause(23;
+ log("Rx MNCC DISC.ind, T310.read yelds ", T310.read);
+ setverdict(pass);
}
}
+
BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_DISC(cpars.transaction_id)));
BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id)));
- /* FIXME: We're sending this with TIflag 0: allocated by sender, which
is wrong */
-
BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id)));
+ BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id,
'1'B)));
alt {
[] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {
MGCP.send(ts_DLCX_ACK2(mgcp_cmd.line.trans_id));
- f_create_mgcp_delete_ep(cpars.mgcp_ep);
+ // FIXME: f_create_mgcp_delete_ep(cpars.mgcp_ep);
repeat;
}
[] as_clear_cmd_compl_disc();
@@ -6342,7 +6368,7 @@
execute( TC_mo_crcx_ran_reject() );
execute( TC_mt_crcx_ran_reject() );
execute( TC_mo_setup_and_dtmf_dup() );
- //execute( TC_mt_t310() );
+ execute( TC_mt_t310() );
execute( TC_gsup_cancel() );
execute( TC_lu_imsi_auth_tmsi_encr_1_13() );
execute( TC_lu_imsi_auth_tmsi_encr_3_13() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 )
Change subject: msc: test reaction on Clear Request during a MO/MT Call
..
msc: test reaction on Clear Request during a MO/MT Call
Change-Id: Id16969fe0de04445d1320a96d35cf1d48cc8cf09
Related: SYS#5340
---
M msc/MSC_Tests.ttcn
1 file changed, 62 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 206effa..6bad9c3 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -935,6 +935,66 @@
vc_conn.done;
}
+/* Test reaction on Clear Request during a MO Call */
+friend function f_TC_mo_mt_call_clear_request(charstring id, BSC_ConnHdlrPars
pars)
+runs on BSC_ConnHdlr {
+ var CallParameters cpars := valueof(t_CallParams);
+ var MNCC_PDU mncc_pdu;
+ timer T := 2.0;
+
+ f_init_handler(pars);
+
+ f_perform_lu();
+
+ /* HACK: reducing code duplication ('66'H - MO, '68'H - MT) */
+ if (pars.imsi == '262420002532766'H)
+ { f_mo_call_establish(cpars); }
+ else
+ { f_mt_call_establish(cpars); }
+
+ /* Hold the line for a while... */
+ f_sleep(2.0);
+
+ /* BSC sends BSSMAP Clear Request (e.g. due to RR failure) */
+ BSSAP.send(ts_BSSMAP_ClearRequest(1));
+
+ /* Expect (optional) CC RELEASE and Clear Command */
+ var default ccrel := activate(as_optional_cc_rel(cpars));
+ f_expect_clear();
+ deactivate(ccrel);
+
+ /* Expect RELease indication on the MNCC socket */
+ T.start;
+ alt {
+ [] MNCC.receive(tr_MNCC_REL_ind(cpars.mncc_callref)) -> value mncc_pdu {
+ log("Rx MNCC REL.ind, cause := ", mncc_pdu.u.signal.cause);
+ setverdict(pass);
+ }
+ [] MNCC.receive(MNCC_PDU:?) -> value mncc_pdu {
+ setverdict(fail, "Rx unexpected MNCC PDU: ", mncc_pdu);
+ }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for MNCC REL.ind");
+ }
+ }
+}
+testcase TC_mo_call_clear_request() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+
+ f_init();
+
+ vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request),
2532766); // '66'H - MO
+ vc_conn.done;
+}
+testcase TC_mt_call_clear_request() runs on MTC_CT {
+ var BSC_ConnHdlr vc_conn;
+
+ f_init();
+
+ vc_conn := f_start_handler(refers(f_TC_mo_mt_call_clear_request),
2532768); // '68'H - MT
+ vc_conn.done;
+}
+
/* Test LU but BSC will send a clear request in the middle */
friend function f_tc_lu_disconnect(charstring id, BSC_ConnHdlrPars pars) runs
on BSC_ConnHdlr {
f_init_handler(pars);
@@ -6345,6 +6405,8 @@
execute( TC_lu_auth_sai_timeout() );
execute( TC_lu_auth_sai_err() );
execute( TC_lu_clear_request() );
+ execute( TC_mo_call_clear_request() );
+ execute( TC_mt_call_clear_request() );
execute( TC_lu_disconnect() );
execute( TC_lu_by_imei() );
execute( TC_lu_by_tmsi_noauth_unknown() );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719
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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09
Gerrit-Change-Number: 22719
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: msc: test reaction on Clear Request during a MO/MT Call
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 ) Change subject: msc: test reaction on Clear Request during a MO/MT Call .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22719 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: Id16969fe0de04445d1320a96d35cf1d48cc8cf09 Gerrit-Change-Number: 22719 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:18:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: msc: finish and enable test case for MT Call T310 timer
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 ) Change subject: msc: finish and enable test case for MT Call T310 timer .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22716 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: I79d9ae3b086d05c3d7c0a1241720d6c3f1e90281 Gerrit-Change-Number: 22716 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 20:18:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746 )
Change subject: pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default
locally
..
pcu: TC_rim_ran_info_req_single_rep: don't duplicate si_default locally
The same values are available for several tests as gloval consts.
Change-Id: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3
---
M pcu/PCU_Tests.ttcn
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 5f75992..0b887db 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -4124,9 +4124,6 @@
* PCUIF on startup. */
testcase TC_rim_ran_info_req_single_rep() runs on RAW_PCU_Test_CT {
const BssgpBvci bvci := mp_gb_cfg.bvc[0].bvci;
- var octetstring si1_expect :=
'198fb1792b'O;
- var octetstring si3_expect :=
'1b753000f110236ec9033c274740793c0b2b2b'O;
- var octetstring si13_expect :=
'009000185a6fc9e08410ab2b2b2b2b2b2b2b2b2b2b'O;
timer T := 2.0;
/* Initialize NS/BSSGP side */
@@ -4139,11 +4136,11 @@
f_bssgp_establish();
/* Send sysinfo to the PCU */
- var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '5506'O & si1_expect, 0, 0, 0, 0, 32767);
+ var template PCUIF_Message si1_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '5506'O & si1_default, 0, 0, 0, 0, 32767);
BTS.send(si1_data_ind);
- var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '4906'O & si3_expect, 0, 0, 0, 0, 32767);
+ var template PCUIF_Message si3_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '4906'O & si3_default, 0, 0, 0, 0, 32767);
BTS.send(si3_data_ind);
- var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '0106'O & si13_expect, 0, 0, 0, 0, 32767);
+ var template PCUIF_Message si16_data_ind := ts_PCUIF_DATA_IND(0, 0, 0,
0, PCU_IF_SAPI_BCCH, '0106'O & si13_default, 0, 0, 0, 0, 32767);
BTS.send(si16_data_ind);
f_sleep(1.0);
@@ -4158,9 +4155,6 @@
src_addr := valueof(t_RIM_Routing_Address_cid(src_cid));
dst_addr :=
valueof(t_RIM_Routing_Address_cid(mp_gb_cfg.bvc[0].cell_id));
-
- var octetstring si_expect := si1_expect & si3_expect & si13_expect;
-
req_cont :=
ts_RAN_Information_Request_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC),
ts_RIM_Sequence_Number(1),
ts_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP),
@@ -4175,7 +4169,7 @@
tr_RIM_Sequence_Number(1),
tr_RIM_PDU_Indications(false, RIM_PDU_TYPE_SING_REP),
tr_RIM_Protocol_Version_Number(1),
-
tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id,
false, 3, si_expect)),
+
tru_ApplContainer_or_ApplErrContainer_NACC(tru_ApplContainer_NACC(mp_gb_cfg.bvc[0].cell_id,
false, 3, si_default)),
omit);
bssgp_rim_pdu_expect :=
tr_PDU_BSSGP_RAN_INFORMATION(tr_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID,
src_addr),
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22746
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: I32b7d841bc1fa896f9866c5d7fba857e1ca65ab3
Gerrit-Change-Number: 22746
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 )
Change subject: VTY: Fix warning: control reaches end of non-void function
..
VTY: Fix warning: control reaches end of non-void function
Change-Id: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77
---
M library/Osmocom_VTY_Functions.ttcn
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/Osmocom_VTY_Functions.ttcn
b/library/Osmocom_VTY_Functions.ttcn
index 9410c9e..49f587d 100644
--- a/library/Osmocom_VTY_Functions.ttcn
+++ b/library/Osmocom_VTY_Functions.ttcn
@@ -10,6 +10,8 @@
*/
module Osmocom_VTY_Functions {
+
+ import from Misc_Helpers all;
import from TELNETasp_PortType all;
import from Osmocom_Types all;
@@ -218,9 +220,10 @@
num_attempts := num_attempts - 1;
}
- setverdict(fail, "No matching VTY response for regular expression '",
regex,
- "' after ", num_attempts, " attempts." );
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("No matching VTY response for regular
expression '",
+ regex, "' after ", num_attempts, "
attempts." ));
+ return "";
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737
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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77
Gerrit-Change-Number: 22737
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 ) Change subject: Fix tons of warnings in RLCMAC and pcu .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 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: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830 Gerrit-Change-Number: 22745 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:16:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Fix tons of warnings in RLCMAC and pcu
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22745 )
Change subject: Fix tons of warnings in RLCMAC and pcu
..
Fix tons of warnings in RLCMAC and pcu
Change-Id: Ia3b7c5f9fdf571f99859027dbab8731ea1a8e830
---
M library/RLCMAC_CSN1_Templates.ttcn
M library/RLCMAC_Templates.ttcn
M pcu/GPRS_Components.ttcn
M pcu/PCU_Tests.ttcn
4 files changed, 44 insertions(+), 41 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/RLCMAC_CSN1_Templates.ttcn
b/library/RLCMAC_CSN1_Templates.ttcn
index 1becddd..39f240b 100644
--- a/library/RLCMAC_CSN1_Templates.ttcn
+++ b/library/RLCMAC_CSN1_Templates.ttcn
@@ -284,7 +284,7 @@
pwr_ctrl := *
};
- template EgprsAckNackDescriptionIE
ts_EgprsAckNackDescriptionIE(template EgprsAckNackDescription andesc) := {
+ template (value) EgprsAckNackDescriptionIE
ts_EgprsAckNackDescriptionIE(template (value) EgprsAckNackDescription andesc)
:= {
len_present := '1'B,
len := 0, /* Overwritten by RAW encoder */
acknack_desc := andesc
diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 6b5fb9f..e398491 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -369,7 +369,7 @@
}
/* Send Template for Downlink ACK/NACK */
- template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template uint5_t tfi,
AckNackDescription andesc, boolean retry := false,
+ template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK(template (value)
uint5_t tfi, AckNackDescription andesc, boolean retry := false,
template (omit)
ChannelReqDescription chreq_desc := omit) := {
ctrl := {
mac_hdr := {
@@ -393,8 +393,10 @@
}
/* Send Template for Egprs Downlink ACK/NACK */
- template RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template uint5_t
tfi, EgprsAckNackDescription andesc, boolean retry := false,
- template (omit)
ChannelReqDescription chreq_desc := omit) := {
+ template (value) RlcmacUlBlock ts_RLCMAC_DL_ACK_NACK_EGPRS(template
(value) uint5_t tfi,
+
EgprsAckNackDescription andesc,
+ boolean
retry := false,
+ template
(omit) ChannelReqDescription chreq_desc := omit) := {
ctrl := {
mac_hdr := {
payload_type := MAC_PT_RLCMAC_NO_OPT,
@@ -762,7 +764,8 @@
}
/* Template for Uplink MAC Control Header */
- template UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template MacPayloadType
pt, template boolean retry := false) := {
+ template (value) UlMacCtrlHeader t_RLCMAC_UlMacCtrlH(template (value)
MacPayloadType pt,
+template (value)
boolean retry := false) := {
payload_type := pt,
spare := '0'B,
retry := retry
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 830f8d3..34b7e79 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -424,7 +424,7 @@
function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs :=
false,
template (omit) ChannelReqDescription
chreq_desc := omit)
-runs on MS_BTS_IFACE_CT return template RlcmacUlBlock {
+runs on MS_BTS_IFACE_CT return template (value) RlcmacUlBlock {
if (use_egprs) {
return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi,
dl_tbf.egprs_acknack_desc, false, chreq_desc);
} else {
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 8c9b469..5f75992 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -310,7 +310,7 @@
/* Send a random block, so this TBF becomes "active" */
if (do_activate) {
/* FIXME: use the new APU by Pau to get correct TRX/TS
here */
- var template TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod
8);
+ var template (value) TsTrxBtsNum nr :=
ts_TsTrxBtsNum(7, i mod 8);
var octetstring dummy := f_rnd_octstring(12);
var RlcmacDlBlock dl_block;
var uint32_t poll_fn;
@@ -353,8 +353,8 @@
pkt_res_req := ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit);
}
- f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(pkt_res_req), 0, nr :=
f_ms_tx_TsTrxBtsNum(ms));
- /* Store 1st UlTBF context before receiving next one, will will
+ f_ms_tx_ul_block(ms,
Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 ) Change subject: VTY: Fix warning: control reaches end of non-void function .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 20:15:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: improve backlog handling on interface up/down
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22638 )
Change subject: ns2: improve backlog handling on interface up/down
..
ns2: improve backlog handling on interface up/down
This patch improves the behavior of the newly-added backlog in
situations where the interface goes up/down.
* don't add new packets to the backlog while if_running == false
* flush the backlog on both ifup and ifdown events
Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9
---
M src/gb/gprs_ns2_fr.c
1 file changed, 35 insertions(+), 9 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c
index cae03ee..2662df6 100644
--- a/src/gb/gprs_ns2_fr.c
+++ b/src/gb/gprs_ns2_fr.c
@@ -376,6 +376,10 @@
priv->backlog.lmi_msg = msg;
return 0;
default:
+ /* there's no point in trying to enqueue messages if the
interface is down */
+ if (!priv->if_running)
+ break;
+
if (msgb_length(msg) < 3)
break;
ns_pdu_type = msg->data[2];
@@ -559,6 +563,35 @@
return NULL;
}
+static void link_state_change(struct gprs_ns2_vc_bind *bind, bool if_running)
+{
+ struct priv_bind *bpriv = bind->priv;
+ struct msgb *msg, *msg2;
+
+ if (bpriv->if_running == if_running)
+ return;
+
+ LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s': Physical link state
changed: %s\n",
+ bpriv->netif, if_running ? "UP" : "DOWN");
+
+ /* free any backlog, both on IFUP and IFDOWN. Keep the LMI, as it makes
+* sense to get one out of the door ASAP. */
+ llist_for_each_entry_safe(msg, msg2, >backlog.list, list) {
+ msgb_free(msg);
+ }
+
+ if (if_running) {
+ /* interface just came up */
+ if (bpriv->backlog.lmi_msg)
+ osmo_timer_schedule(>backlog.timer, 0,
bpriv->backlog.retry_us);
+ } else {
+ /* interface just went down; no need to retransmit */
+ osmo_timer_del(>backlog.timer);
+ }
+
+ bpriv->if_running = if_running;
+}
+
/* handle a single netlink message received via libmnl */
static int linkmon_mnl_cb(const struct nlmsghdr *nlh, void *data)
{
@@ -586,15 +619,8 @@
if_running = !!(ifm->ifi_flags & IFF_RUNNING);
bind = bind4netdev(nsi, ifname);
- if (bind) {
- struct priv_bind *bpriv = bind->priv;
- if (bpriv->if_running != if_running) {
- /* update running state */
- LOGBIND(bind, LOGL_NOTICE, "FR net-device '%s':
Physical link state changed: %s\n",
- ifname, if_running ? "UP" : "DOWN");
- bpriv->if_running = if_running;
- }
- }
+ if (bind)
+ link_state_change(bind, if_running);
return MNL_CB_OK;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9
Gerrit-Change-Number: 22638
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22709 )
Change subject: ns2: Don't try to add packets to the backlog on real errors
..
ns2: Don't try to add packets to the backlog on real errors
When writing to the AF_PACKET socket, we have to distinguish the
pseudo-errors like -ENOBUFS (where we do want to add to the backlog)
from real errors like -ENETDOWN, -EMSGSIZE, ... where we don't want
to add the failed packet to the backlog.
Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794
---
M src/gb/gprs_ns2_fr.c
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c
index 2662df6..93b7759 100644
--- a/src/gb/gprs_ns2_fr.c
+++ b/src/gb/gprs_ns2_fr.c
@@ -311,10 +311,14 @@
switch (errno) {
case EAGAIN:
case ENOBUFS:
+ /* not a real error, but more a normal event on
AF_PACKET */
+ /* don't free the message and let the caller re-enqueue
*/
return -errno;
default:
+ /* an actual error, like -ENETDOWN, -EMSGSIZE */
LOGBIND(bind, LOGL_ERROR, "error during write to
AF_PACKET: %s\n", strerror(errno));
- return -errno;
+ msgb_free(msg);
+ return 0;
}
} else {
/* short write */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794
Gerrit-Change-Number: 22709
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22637 )
Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones
..
ns2: Don't queue Q.933 LMI messages; only store most recent ones
There's not really any point in storing multiple LMI messages,
and then transmitting them in inverse order, as the existing code
does. Instead, we shall store only the last (failed) LMI message
and try to transmit that at highest priority, before any NS messages
in the actual queue.
Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593
---
M src/gb/gprs_ns2_fr.c
1 file changed, 18 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_fr.c b/src/gb/gprs_ns2_fr.c
index 78abddc..cae03ee 100644
--- a/src/gb/gprs_ns2_fr.c
+++ b/src/gb/gprs_ns2_fr.c
@@ -105,7 +105,9 @@
struct {
/* file-descriptor for AF_PACKET socket */
struct osmo_fd ofd;
- /* list of msgb (backlog) */
+ /* LMI bucket (we only store the last LMI message, no need to
queue */
+ struct msgb *lmi_msg;
+ /* list of NS msgb (backlog) */
struct llist_head list;
/* timer to trigger next attempt of AF_PACKET write */
struct osmo_timer_list timer;
@@ -173,6 +175,7 @@
llist_for_each_entry_safe(msg, msg2, >backlog.list, list) {
msgb_free(msg);
}
+ msgb_free(priv->backlog.lmi_msg);
osmo_fr_link_free(priv->link);
osmo_fd_close(>backlog.ofd);
@@ -357,6 +360,7 @@
/* enqueue to backlog (LMI, signaling) or drop (userdata msg) */
static int backlog_enqueue_or_free(struct gprs_ns2_vc_bind *bind, struct msgb
*msg)
{
+ struct priv_bind *priv = bind->priv;
uint8_t dlci = msg->data[0];
uint8_t ns_pdu_type;
uint16_t bvci;
@@ -367,8 +371,9 @@
/* we want to enqueue only Q.933 LMI traffic or NS signaling; NOT user
traffic */
switch (dlci) {
case LMI_Q933A_DLCI:
- /* enqueue Q.933 LMI at head of queue */
- enqueue_at_head(bind, msg);
+ /* always store only the last LMI message in the lmi_msg bucket
*/
+ msgb_free(priv->backlog.lmi_msg);
+ priv->backlog.lmi_msg = msg;
return 0;
default:
if (msgb_length(msg) < 3)
@@ -405,6 +410,15 @@
struct priv_bind *priv = bind->priv;
int i, rc;
+ /* first try to get rid of the LMI message, if any */
+ if (priv->backlog.lmi_msg) {
+ rc = fr_netif_write_one(bind, priv->backlog.lmi_msg);
+ if (rc < 0)
+ goto restart_timer;
+ /* fr_netif_write_one() has just free'd it */
+ priv->backlog.lmi_msg = NULL;
+ }
+
/* attempt to send up to 10 messages in every timer */
for (i = 0; i < 10; i++) {
struct msgb *msg = msgb_dequeue(>backlog.list);
@@ -420,6 +434,7 @@
osmo_stat_item_dec(bind->statg->items[NS2_BIND_STAT_BACKLOG_LEN], 1);
}
+restart_timer:
/* re-start timer if we still have data in the queue */
if (!llist_empty(>backlog.list))
osmo_timer_schedule(>backlog.timer, 0,
priv->backlog.retry_us);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593
Gerrit-Change-Number: 22637
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmocore[master]: ns2: Name NSVC FSM events consistently
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22734 )
Change subject: ns2: Name NSVC FSM events consistently
..
ns2: Name NSVC FSM events consistently
Reading a log line like this:
<0026> gprs_ns2_vc_fsm.c:808
GPRS-NS2-VC(FR-hdlcnet1-DLCI16-NSE02001-NSVC1)[0x612024a0]{UNBLOCKED}:
Received Event RESET
is very ambiguous. Does it mean we received a NS-RESET message? Does it
mean the FSM was instructed to send a NS-RESET? ...
Let's make sure the human-readable names give a very clear indication
of what exactly is happening.
Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e
---
M src/gb/gprs_ns2_vc_fsm.c
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c
index f6424de..66ee450 100644
--- a/src/gb/gprs_ns2_vc_fsm.c
+++ b/src/gb/gprs_ns2_vc_fsm.c
@@ -122,18 +122,18 @@
};
static const struct value_string ns2_vc_event_names[] = {
- { GPRS_NS2_EV_REQ_START,"START" },
- { GPRS_NS2_EV_RX_RESET, "RESET" },
- { GPRS_NS2_EV_RX_RESET_ACK, "RESET_ACK" },
- { GPRS_NS2_EV_RX_UNBLOCK, "UNBLOCK" },
- { GPRS_NS2_EV_RX_UNBLOCK_ACK, "UNBLOCK_ACK" },
- { GPRS_NS2_EV_RX_BLOCK, "BLOCK" },
- { GPRS_NS2_EV_RX_BLOCK_ACK, "BLOCK_ACK" },
- { GPRS_NS2_EV_RX_ALIVE, "ALIVE" },
- { GPRS_NS2_EV_RX_ALIVE_ACK, "ALIVE_ACK" },
- { GPRS_NS2_EV_RX_STATUS,"STATUS" },
- { GPRS_NS2_EV_RX_UNITDATA, "UNITDATA" },
- { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "FORCE_UNCONFIGURED" },
+ { GPRS_NS2_EV_REQ_START,"REQ-START" },
+ { GPRS_NS2_EV_RX_RESET, "RX-RESET" },
+ { GPRS_NS2_EV_RX_RESET_ACK, "RX-RESET_ACK" },
+ { GPRS_NS2_EV_RX_UNBLOCK, "RX-UNBLOCK" },
+ { GPRS_NS2_EV_RX_UNBLOCK_ACK, "RX-UNBLOCK_ACK" },
+ { GPRS_NS2_EV_RX_BLOCK, "RX-BLOCK" },
+ { GPRS_NS2_EV_RX_BLOCK_ACK, "RX-BLOCK_ACK" },
+ { GPRS_NS2_EV_RX_ALIVE, "RX-ALIVE" },
+ { GPRS_NS2_EV_RX_ALIVE_ACK, "RX-ALIVE_ACK" },
+ { GPRS_NS2_EV_RX_STATUS,"RX-STATUS" },
+ { GPRS_NS2_EV_RX_UNITDATA, "RX-UNITDATA" },
+ { GPRS_NS2_EV_REQ_FORCE_UNCONFIGURED, "REQ-FORCE_UNCONFIGURED" },
{ GPRS_NS2_EV_REQ_OM_BLOCK, "REQ-O"},
{ GPRS_NS2_EV_REQ_OM_UNBLOCK, "REQ-O"},
{ 0, NULL }
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e
Gerrit-Change-Number: 22734
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class
srs_andre has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 )
Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class
..
Patch Set 3:
(1 comment)
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py
File src/osmo_gsm_tester/obj/epc.py:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py@124
PS3, Line 124: return {'total_errors': 0, 'total_warnings': 0}
> Still missing to remove trailing whitespace.
ahh, check it in the wrong file. fixed now
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32
Gerrit-Change-Number: 22601
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Mon, 08 Feb 2021 17:52:23 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs
srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py@50 PS3, Line 50: def get_stdout_kpis(self): > I'm in general not happy to see new public APIs like this popping up (is it > public to be used by tes […] Yes, its really more of a helper. The testcase can use `get_kpi` but then each TC has to do "self.kpis["stdout_" + self.name()]", which is is better placed here, no? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:50:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME .. Patch Set 3: Code-Review-1 Yes please, let's name it "subscriber_count". -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:49:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: improve backlog handling on interface up/down
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:48:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME
srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME .. Patch Set 3: > Patch Set 3: > > Thanks. Can we move the field to something more descriptive? Like > "subscriber_count" ? That's possible, yes. In the Amarisoft config it's called count only. But we can call it subscriber_count if you prefer in the dict -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:48:26 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:47:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c@209 PS1, Line 209: return 0; > the problem with a global counter is that it has very limited use. […] Or simply start counting after first RTP packet has arrived? -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:45:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: VTY: Fix warning: control reaches end of non-void function
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 to look at the new patch set (#2). Change subject: VTY: Fix warning: control reaches end of non-void function .. VTY: Fix warning: control reaches end of non-void function Change-Id: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 --- M library/Osmocom_VTY_Functions.ttcn 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/22737/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22737 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: Ie9415afecbcaf12e210fd4f481fcbb1f5ba52c77 Gerrit-Change-Number: 22737 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: cosmetic: fix typo in comment
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/22790 ) Change subject: cosmetic: fix typo in comment .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d Gerrit-Change-Number: 22790 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 08 Feb 2021 17:39:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: improve backlog handling on interface up/down
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:38:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Don't try to add packets to the backlog on real errors
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22709 ) Change subject: ns2: Don't try to add packets to the backlog on real errors .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibbb6805da0f118466c4c91e458e62b63b84cb794 Gerrit-Change-Number: 22709 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Don't queue Q.933 LMI messages; only store most recent ones
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22637 ) Change subject: ns2: Don't queue Q.933 LMI messages; only store most recent ones .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5407a76a34d7e687966fe1a915febf3a87256593 Gerrit-Change-Number: 22637 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: Name NSVC FSM events consistently
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22734 ) Change subject: ns2: Name NSVC FSM events consistently .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b7615b3eca04212831163ff0ea4aea35069cd0e Gerrit-Change-Number: 22734 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:37:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: improve backlog handling on interface up/down
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22638 ) Change subject: ns2: improve backlog handling on interface up/down .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c File src/gb/gprs_ns2_fr.c: https://gerrit.osmocom.org/c/libosmocore/+/22638/1/src/gb/gprs_ns2_fr.c@589 PS1, Line 589: bpriv->if_running = if_running; > Since you are moving use of this field here, it probably makes sense to move > the "if (bpriv->if_runn […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:36:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmocore[master]: ns2: improve backlog handling on interface up/down
Hello Jenkins Builder, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/22638 to look at the new patch set (#3). Change subject: ns2: improve backlog handling on interface up/down .. ns2: improve backlog handling on interface up/down This patch improves the behavior of the newly-added backlog in situations where the interface goes up/down. * don't add new packets to the backlog while if_running == false * flush the backlog on both ifup and ifdown events Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 --- M src/gb/gprs_ns2_fr.c 1 file changed, 35 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/22638/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib35d099526544fe2cff64566fd56147a906adab9 Gerrit-Change-Number: 22638 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: cosmetic: fix typo in comment
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/22790 )
Change subject: cosmetic: fix typo in comment
..
cosmetic: fix typo in comment
Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d
---
M src/gsm_rlcmac.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/22790/1
diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index 9b8782d..c56526e 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -5832,7 +5832,7 @@
LOGP(DRLCMACDATA, LOGL_NOTICE, "Payload Type: RESERVED (3)\n");
return CSN_ERROR_GENERAL;
}
- /* We can decode the message */
+ /* We can encode the message */
else
{
/* First print the message type and create a tree item */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/22790
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I5a384985ef54234e915bf6334125f8d087988d1d
Gerrit-Change-Number: 22790
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/22756 ) Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c File src/ranap_msg_factory.c: https://gerrit.osmocom.org/c/osmo-iuh/+/22756/1/src/ranap_msg_factory.c@205 PS1, Line 205: /*! \brief generate RANAP SECURITY MODE COMMAND message */ > Now that masks are passed it would be great having more verbose description. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:34:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-iuh[master]: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded
Hello Jenkins Builder, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 to look at the new patch set (#2). Change subject: ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded .. ranap_msg_factory: Allow detailed control over UEA/UIA algorithm encoded Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Closes: OS#4143 --- M include/osmocom/ranap/ranap_msg_factory.h M src/ranap_msg_factory.c 2 files changed, 51 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/22756/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/22756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6d2d033b0427bdc84fee61e0f3cb7b29935214bf Gerrit-Change-Number: 22756 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN .. Removed Code-Review+2 by laforge -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in libosmocore[master]: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22743 ) Change subject: gprs_ns2_sns: add timeout to ST_CONFIG_SGSN .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2700c1ad40ebe30658e9937d86a4861b0b59d6b6 Gerrit-Change-Number: 22743 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:26:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: reset the N of timeout when entering a new state
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22744 ) Change subject: gprs_ns2_sns: reset the N of timeout when entering a new state .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iefde0c89965f0be899d6d1f096480f6fc79a92be Gerrit-Change-Number: 22744 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:26:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}()
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/21054 )
Change subject: migrate to osmo_fd_{read,write}_{enable,disable}()
..
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d
Gerrit-Change-Number: 21054
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-CC: pespin
Gerrit-Comment-Date: Mon, 08 Feb 2021 17:25:49 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/21054 )
Change subject: migrate to osmo_fd_{read,write}_{enable,disable}()
..
migrate to osmo_fd_{read,write}_{enable,disable}()
Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d
Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d
---
M src/input/dahdi.c
M src/input/e1d.c
M src/input/ipa.c
M src/input/ipaccess.c
M src/input/misdn.c
M src/input/rs232.c
M src/input/unixsocket.c
M src/trau/osmo_ortp.c
8 files changed, 21 insertions(+), 21 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index e59518a..cdaa8eb 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -205,7 +205,7 @@
return 0;
}
- e1i_ts->driver.dahdi.fd.when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(_ts->driver.dahdi.fd);
return 0;
}
@@ -251,7 +251,7 @@
struct e1inp_sign_link *sign_link;
struct msgb *msg;
- bfd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(bfd);
/* get the next msg for this timeslot */
msg = e1inp_tx_ts(e1i_ts, _link);
diff --git a/src/input/e1d.c b/src/input/e1d.c
index 3ae1d89..cab219d 100644
--- a/src/input/e1d.c
+++ b/src/input/e1d.c
@@ -100,7 +100,7 @@
struct e1inp_sign_link *sign_link;
struct msgb *msg;
- bfd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(bfd);
/* get the next msg for this timeslot */
msg = e1inp_tx_ts(e1i_ts, _link);
@@ -316,7 +316,7 @@
return 0;
}
- e1i_ts->driver.e1d.fd.when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(_ts->driver.e1d.fd);
return 0;
}
diff --git a/src/input/ipa.c b/src/input/ipa.c
index 8281b4f..f01ecd9 100644
--- a/src/input/ipa.c
+++ b/src/input/ipa.c
@@ -89,7 +89,7 @@
LOGIPA(link, LOGL_DEBUG, "sending data\n");
if (llist_empty(>tx_queue)) {
- ofd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(ofd);
return 0;
}
lh = link->tx_queue.next;
@@ -124,7 +124,7 @@
link->updown_cb(link, 0);
return 0;
}
- ofd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(ofd);
LOGIPA(link, LOGL_NOTICE, "connection done\n");
link->state = IPA_CLIENT_LINK_STATE_CONNECTED;
if (link->updown_cb)
@@ -228,7 +228,7 @@
if (ret < 0)
return ret;
link->ofd->fd = ret;
- link->ofd->when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(link->ofd);
if (osmo_fd_register(link->ofd) < 0) {
close(ret);
link->ofd->fd = -1;
@@ -241,7 +241,7 @@
void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg)
{
msgb_enqueue(>tx_queue, msg);
- link->ofd->when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(link->ofd);
}
size_t ipa_client_conn_clear_queue(struct ipa_client_conn *link)
@@ -254,7 +254,7 @@
deleted += 1;
}
- link->ofd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(link->ofd);
return deleted;
}
@@ -387,7 +387,7 @@
msg = msgb_dequeue(>tx_queue);
if (!msg) {
- conn->ofd.when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(>ofd);
return;
}
@@ -532,5 +532,5 @@
void ipa_server_conn_send(struct ipa_server_conn *conn, struct msgb *msg)
{
msgb_enqueue(>tx_queue, msg);
- conn->ofd.when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(>ofd);
}
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 8843191..be882a9 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -434,7 +434,7 @@
static int ts_want_write(struct e1inp_ts *e1i_ts)
{
- e1i_ts->driver.ipaccess.fd.when |= OSMO_FD_WRITE;
+ osmo_fd_write_enable(_ts->driver.ipaccess.fd);
return 0;
}
@@ -486,7 +486,7 @@
int ret;
e1i_ts = ipaccess_line_ts(bfd, line);
- bfd->when &= ~OSMO_FD_WRITE;
+ osmo_fd_write_disable(bfd);
/* get the next msg for this timeslot */
msg = e1inp_tx_ts(e1i_ts, _link);
@@ -501,7 +501,7 @@
case E1INP_SIGN_OSMO:
break;
default:
- bfd->when |= OSMO_FD_WRITE; /* come back for more msg */
+ osmo_fd_write_enable(bfd); /* come back for more msg */
ret = -EINVAL;
goto out;
}
diff --git a/src/input/misdn.c b/src/input/misdn.c
index 0237cb9..874b627 100644
--- a/src/input/misdn.c
+++ b/src/input/misdn.c
@@ -217,7 +217,7 @@
e1i_ts->type == E1INP_TS_TYPE_I460)
return 0;
- e1i_ts->driver.misdn.fd.when |= OSMO_FD_WRITE;
+
Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 )
Change subject: stp: Introduce M3UA SSNM tests
..
stp: Introduce M3UA SSNM tests
Tests for M3UA SSNM behavior. This is just being introduced in
osmo-stp, so all tests will fail on 'latest', and some will still fail
until SSNM processing inside osmo-stp is becoming more complete.
Change-Id: I5074dccde9940956439235e8d02e6a722b8da5f5
Related: OS#2623
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 137 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 1bc5ad5..66a3f6f 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -233,13 +233,15 @@
}
}
-friend function f_init_m3ua() runs on RAW_M3UA_CT {
+friend function f_init_m3ua(boolean ignore_ssnm := true) runs on RAW_M3UA_CT {
var integer i;
f_init_common();
activate(as_m3ua_sctp());
- activate(as_m3ua_ssnm_ignore());
+ if (ignore_ssnm) {
+ activate(as_m3ua_ssnm_ignore());
+ }
for (i := 0; i < NR_M3UA; i:=i+1) {
map(self:M3UA[i], system:M3UA_CODEC_PT);
@@ -304,6 +306,12 @@
f_M3UA_exp(idx, tr_M3UA_ASPAC_ACK(tmt, rctx));
}
+/* perform an outbound ASP-INACTIVATE procedure */
+friend function f_M3UA_asp_inact(integer idx, template (omit) OCT4 rctx :=
omit) runs on RAW_M3UA_CT {
+ f_M3UA_send(idx, ts_M3UA_ASPIA(rctx));
+ f_M3UA_exp(idx, tr_M3UA_ASPIA_ACK(rctx));
+}
+
/* perform outbound ASP-UP and ASP-ACT, optionally expect interemittent NOTIFY
*/
friend function f_M3UA_asp_up_act(integer idx, template (omit)
M3UA_Traffic_Mode_Type tmt := omit,
template (omit) OCT4 rctx := omit,
@@ -742,6 +750,126 @@
f_clear_m3ua();
}
+/* Test if ASPAC / ASPIA of one ASP generates DAVA / DUNA on other ASP */
+testcase TC_ssnm_aspac_dava_aspia_duna() runs on RAW_M3UA_CT {
+ var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
+
+ f_init_m3ua(ignore_ssnm := false);
+ /* activate the first ASP */
+ f_M3UA_asp_up_act(0);
+
+ /* activate the second ASP */
+ f_M3UA_asp_up_act(1, c_M3UA_TMT_override, omit);
+ /* expect DAVA for PC of second ASP on first ASP */
+ f_M3UA_exp(0, tr_M3UA_DAVA({ts_M3UA_PC(mp_m3ua_configs[1].point_code,
0)}, rctx0));
+ /* TODO: expect no DAVA on second ASP */
+
+ /* deactivate the second ASP */
+ f_M3UA_asp_inact(1);
+ /* expect DUNA for PC of second ASP on first ASP */
+ f_M3UA_exp(0, tr_M3UA_DUNA({ts_M3UA_PC(mp_m3ua_configs[1].point_code,
0)}, rctx0));
+ /* TODO: expect no DUNA on second ASP */
+
+ f_clear_m3ua();
+}
+
+/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP
*/
+testcase TC_ssnm_distribution_dava_duna() runs on RAW_M3UA_CT {
+ var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4);
+ /* some random point code whose availability we advertise */
+ var template (value) M3UA_Point_Code adv_pc := ts_M3UA_PC(1234, 0);
+
+ f_init_m3ua(ignore_ssnm := false);
+
+ /* activate the first ASP */
+ f_M3UA_asp_up_act(0);
+
+ /* activate SG-role ASP (ASP on STP) */
+ f_init_m3ua_srv();
+ f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx :=
int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4));
+
+ /* transmit a DAVA to the remote ASP */
+ f_M3UA_send(M3UA_SRV(0), ts_M3UA_DAVA({adv_pc}, rctxS0));
+ /* expect that to show up on other ASP */
+ f_M3UA_exp(0, tr_M3UA_DAVA({adv_pc}, rctx0));
+
+ /* transmit a DUNA to the remote ASP */
+ f_M3UA_send(M3UA_SRV(0), ts_M3UA_DUNA({adv_pc}, rctxS0));
+ /* expect that to show up on other ASP */
+ f_M3UA_exp(0, tr_M3UA_DUNA({adv_pc}, rctx0));
+}
+
+/* Test if DAVA/DUNA sent from SG to ASP-role STP gets forwarded to other ASP
*/
+testcase TC_ssnm_distribution_dava_duna_multipc() runs on RAW_M3UA_CT {
+ var OCT4 rctx0 := int2oct(mp_m3ua_configs[0].routing_ctx, 4);
+ var OCT4 rctxS0 := int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4);
+ /* some random point code whose availability we advertise */
+ var template (value) M3UA_Point_Codes adv_pcs := { ts_M3UA_PC(1234, 0),
ts_M3UA_PC(5678, 0) };
+
+ f_init_m3ua(ignore_ssnm := false);
+
+ /* activate the first ASP */
+ f_M3UA_asp_up_act(0);
+
+ /* activate SG-role ASP (ASP on STP) */
+ f_init_m3ua_srv();
+ f_M3UA_CLNT_asp_up_act(M3UA_SRV(0), rctx :=
int2oct(mp_m3ua_configs[M3UA_SRV(0)].routing_ctx, 4));
+
+ /* transmit a DAVA to the remote ASP */
+ f_M3UA_send(M3UA_SRV(0),
Change in libosmocore[master]: Fix struct bitfields on big endian systems
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/22679 )
Change subject: Fix struct bitfields on big endian systems
..
Fix struct bitfields on big endian systems
Changes done by contrib/struct_endianess.py.
Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46
---
M include/osmocom/gprs/protocol/gsm_08_18.h
M include/osmocom/gsm/protocol/gsm_23_032.h
M src/gb/frame_relay.c
3 files changed, 88 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/gprs/protocol/gsm_08_18.h
b/include/osmocom/gprs/protocol/gsm_08_18.h
index c10c244..0d002b5 100644
--- a/include/osmocom/gprs/protocol/gsm_08_18.h
+++ b/include/osmocom/gprs/protocol/gsm_08_18.h
@@ -4,6 +4,7 @@
#pragma once
#include
+#include
/*! Fixed BVCI definitions (Section 5.4.1) */
#define BVCI_SIGNALLING0x
diff --git a/include/osmocom/gsm/protocol/gsm_23_032.h
b/include/osmocom/gsm/protocol/gsm_23_032.h
index 5be98a2..a4c0506 100644
--- a/include/osmocom/gsm/protocol/gsm_23_032.h
+++ b/include/osmocom/gsm/protocol/gsm_23_032.h
@@ -50,8 +50,13 @@
};
struct gad_raw_head {
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t spare:4,
type:4;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t type:4, spare:4;
+#endif
} __attribute__ ((packed));
struct gad_raw_ell_point {
@@ -61,14 +66,23 @@
} __attribute__ ((packed));
struct gad_raw_ell_point_unc_circle {
+#if OSMO_IS_LITTLE_ENDIAN
struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_CIRCLE */
uint8_t lat[3];
uint8_t lon[3];
uint8_t unc:7,
spare2:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ struct gad_raw_head h;
+ uint8_t lat[3];
+ uint8_t lon[3];
+ uint8_t spare2:1, unc:7;
+#endif
} __attribute__ ((packed));
struct gad_raw_ell_point_unc_ellipse {
+#if OSMO_IS_LITTLE_ENDIAN
struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_UNC_ELLIPSE */
uint8_t lat[3];
uint8_t lon[3];
@@ -79,12 +93,27 @@
uint8_t major_ori;
uint8_t confidence:7,
spare3:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ struct gad_raw_head h;
+ uint8_t lat[3];
+ uint8_t lon[3];
+ uint8_t spare1:1, unc_semi_major:7;
+ uint8_t spare2:1, unc_semi_minor:7;
+ uint8_t major_ori;
+ uint8_t spare3:1, confidence:7;
+#endif
} __attribute__ ((packed));
struct gad_raw_polygon {
struct {
+#if OSMO_IS_LITTLE_ENDIAN
uint8_t num_points:4;
uint8_t type:4; /*!< type = GAD_TYPE_POLYGON */
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ uint8_t type:4, num_points:4;
+#endif
} h;
struct {
uint8_t lat[3];
@@ -100,6 +129,7 @@
} __attribute__ ((packed));
struct gad_raw_ell_point_alt_unc_ell {
+#if OSMO_IS_LITTLE_ENDIAN
struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_POINT_ALT_UNC_ELL */
uint8_t lat[3];
uint8_t lon[3];
@@ -113,9 +143,22 @@
spare3:1;
uint8_t confidence:7,
spare4:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ struct gad_raw_head h;
+ uint8_t lat[3];
+ uint8_t lon[3];
+ uint8_t alt[2];
+ uint8_t spare1:1, unc_semi_major:7;
+ uint8_t spare2:1, unc_semi_minor:7;
+ uint8_t major_ori;
+ uint8_t spare3:1, unc_alt:7;
+ uint8_t spare4:1, confidence:7;
+#endif
} __attribute__ ((packed));
struct gad_raw_ell_arc {
+#if OSMO_IS_LITTLE_ENDIAN
struct gad_raw_head h; /*!< type = GAD_TYPE_ELL_ARC */
uint8_t lat[3];
uint8_t lon[3];
@@ -126,9 +169,21 @@
uint8_t incl_angle;
uint8_t confidence:7,
spare2:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above
(libosmocore/contrib/struct_endianess.py) */
+ struct gad_raw_head h;
+ uint8_t lat[3];
+ uint8_t lon[3];
+ uint8_t inner_r[2];
+ uint8_t spare1:1, unc_r:7;
+ uint8_t ofs_angle;
+ uint8_t incl_angle;
+ uint8_t spare2:1, confidence:7;
+#endif
} __attribute__ ((packed));
struct gad_raw_ha_ell_point_unc_ell {
+#if OSMO_IS_LITTLE_ENDIAN
struct gad_raw_head h; /*!< type = GAD_TYPE_HA_ELL_POINT_UNC_ELLIPSE */
uint8_t lat[4];
uint8_t lon[4];
@@ -138,9 +193,21 @@
uint8_t major_ori;
uint8_t confidence:7,
spare1:1;
+#elif
Change in libosmocore[master]: Fix struct bitfields on big endian systems
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22679 ) Change subject: Fix struct bitfields on big endian systems .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia9cb1ef2ba2bfff9ef713c7d1cf388931dae1c46 Gerrit-Change-Number: 22679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Mon, 08 Feb 2021 17:23:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac .. gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac The notation for the RAI used in the log is not compliant to the spec. Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Related: OS#4894 --- M src/gb_proxy_ctrl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c index 794afd7..10d3727 100644 --- a/src/gb_proxy_ctrl.c +++ b/src/gb_proxy_ctrl.c @@ -94,7 +94,7 @@ struct gprs_ra_id raid; gsm48_parse_ra(, bvc->ra); - cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u,%u,%u,%u,%s\n", + cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n", nse_peer->nsei, bvc->bvci, raid.mcc, raid.mnc, raid.lac, raid.rac, -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gbproxy[master]: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc, mnc, lac, rac
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 ) Change subject: gb_proxy_ctrl: use mcc-mnc-lac-rac notation instead mcc,mnc,lac,rac .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/22704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I6c8c3f3c017918fe847bfbcc153a12cf5f408bdb Gerrit-Change-Number: 22704 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:23:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: stp: Introduce M3UA SSNM tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 ) Change subject: stp: Introduce M3UA SSNM tests .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22787 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: I5074dccde9940956439235e8d02e6a722b8da5f5 Gerrit-Change-Number: 22787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:22:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 )
Change subject: stp: Less magic numbers; centralize M3UA configuration
..
stp: Less magic numbers; centralize M3UA configuration
We shouldn't be having magic numbers for point codes etc. in each
test case.
Change-Id: Id8a6241657e1f02f15d6722934eb040fc98beab1
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 89 insertions(+), 47 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index 1c25bae..1bc5ad5 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -34,18 +34,58 @@
import from STP_Tests_Common all;
-modulepar {
- HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" };
- HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" };
- integer mp_stp_m3ua_port := 2905;
- integer mp_stp_m3ua_clnt_port := 2906;
- integer mp_local_m3ua_port := ;
- integer mp_recovery_timeout_msec := 2000;
-}
-
private const integer NR_M3UA := 3;/* number of M3UA clients in ATS */
private const integer NR_M3UA_SRV := 1;/* number of M3UA servres in
ATS */
+modulepar {
+ /* STP-side IP addresses */
+ HostList mp_stp_m3ua_ip := { "127.0.0.1", "::1" };
+ /* local IP addresses */
+ HostList mp_local_m3ua_ip := { "127.0.0.1", "::1" };
+ M3uaConfigs mp_m3ua_configs := {
+ /* as-sender: One ASP within AS */
+ {
+ remote_sctp_port := 2905,
+ local_sctp_port := ,
+ point_code := 23,
+ routing_ctx := 1023
+ },
+ /* as-receiver: Two ASP within AS */
+ {
+ remote_sctp_port := 2905,
+ local_sctp_port := 1,
+ point_code := 42,
+ routing_ctx := 1042
+ }, {
+ remote_sctp_port := 2905,
+ local_sctp_port := 10001,
+ point_code := 42,
+ routing_ctx := 1042
+ },
+ /* as-client: One ASP within AS */
+ {
+ remote_sctp_port := 2906,
+ local_sctp_port := 10002,
+ point_code := 55,
+ routing_ctx := 1055
+ }
+ };
+ integer mp_recovery_timeout_msec := 2000;
+ charstring mp_sccp_service_type := "mtp3_itu";
+}
+
+type record M3uaConfig {
+ /* STP-side SCTP port for M3UA */
+ integer remote_sctp_port,
+ /* local M3UA base port on TTCN3 side */
+ integer local_sctp_port,
+ /* point code routed via this M3U */
+ integer point_code,
+ /* associated routing context */
+ integer routing_ctx
+};
+type record length (NR_M3UA+NR_M3UA_SRV) of M3uaConfig M3uaConfigs;
+
private function M3UA_SRV(integer idx) return integer {
return NR_M3UA+idx;
}
@@ -127,6 +167,7 @@
var Option opt_add_local_addrs;
var OptionList opt_list := {};
var template SocketList opt_add_remote_addrs;
+ var M3uaConfig m3cfg := mp_m3ua_configs[i];
if (lengthof(mp_local_m3ua_ip) == 0 or lengthof(mp_stp_m3ua_ip) == 0) {
setverdict(fail, "Empty local or remote address trying to
connect SCTP socket: ",
@@ -142,15 +183,15 @@
if (lengthof(mp_stp_m3ua_ip) > 1) {
for (var integer j := 1; j < lengthof(mp_stp_m3ua_ip); j := j +
1) {
- var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j],
mp_stp_m3ua_port));
+ var Socket sk := valueof(ts_Socket(mp_stp_m3ua_ip[j],
m3cfg.remote_sctp_port));
opt_add_remote_addrs[j - 1] := sk;
}
} else {
opt_add_remote_addrs := omit;
}
- res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i],
mp_stp_m3ua_ip[0], mp_stp_m3ua_port,
- mp_local_m3ua_ip[0],
mp_local_m3ua_port+i, 0,
+ res := M3UA_CodecPort_CtrlFunct.f_IPL4_connect(M3UA[i],
mp_stp_m3ua_ip[0], m3cfg.remote_sctp_port,
+ mp_local_m3ua_ip[0],
m3cfg.local_sctp_port, 0,
{sctp:=valueof(ts_SCTP(3, 0, opt_add_remote_addrs))},
opt_list);
if (not ispresent(res.connId)) {
@@ -170,6 +211,7 @@
var Result res;
var Option opt_add_local_addrs;
var OptionList opt_list := {};
+ var M3uaConfig m3cfg := mp_m3ua_configs[i];
if (lengthof(mp_local_m3ua_ip) == 0 ) {
setverdict(fail, "Empty local address trying to bind SCTP
socket: ",
@@
Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 )
Change subject: stp: Time out after 5s if expected M3UA doesn't arrive
..
stp: Time out after 5s if expected M3UA doesn't arrive
No need to wait for the global timeout here.
Change-Id: I279aacf2215ccd63a6e52c6a71cda3b500a3795c
---
M stp/STP_Tests_M3UA.ttcn
1 file changed, 6 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/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn
index b76d9be..1c25bae 100644
--- a/stp/STP_Tests_M3UA.ttcn
+++ b/stp/STP_Tests_M3UA.ttcn
@@ -90,6 +90,8 @@
friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs
on RAW_M3UA_CT {
var M3UA_RecvFrom rx;
+ timer T := 5.0;
+ T.start;
alt {
[] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) {
setverdict(pass);
@@ -99,6 +101,10 @@
"while waiting for ", msg);
mtc.stop;
}
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for M3UA[", idx, "] ", msg);
+ mtc.stop;
+ }
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786
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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c
Gerrit-Change-Number: 22786
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc .. hide the "smscb-command" vty command; people should use osmo-cbc Many years prior to the implementation of osmo-cbc, we introduced a way how raw RSL SMSCB COMMANMD can be injected from the VTY. These days, people should use the CBSP interface with osmo-cbc or any other CBC. We should not advertise the VTY command hack as a standard feature anymore. Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Related: OS#4753 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 26941e2..9005aab 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -5796,8 +5796,9 @@ return CMD_SUCCESS; } - -DEFUN(smscb_cmd, smscb_cmd_cmd, +/* this command is now hidden, as it's a low-level debug hack, and people should + * instead use osmo-cbc these days */ +DEFUN_HIDDEN(smscb_cmd, smscb_cmd_cmd, "bts <0-255> smscb-command (normal|schedule|default) <1-4> HEXSTRING", "BTS related commands\n" BTS_NR_STR "SMS Cell Broadcast\n" @@ -5861,6 +5862,7 @@ return CMD_WARNING; } + /* SDCCH4 might not be correct here if the CBCH is on a SDCCH8? */ rsl_sms_cb_command(bts, RSL_CHAN_SDCCH4_ACCH, cb_cmd, false, buf, rc); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: hide the "smscb-command" vty command; people should use osmo-cbc
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/22754 ) Change subject: hide the "smscb-command" vty command; people should use osmo-cbc .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/22754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If5ddc3db989763a1f47d4cbc026e293e3134d8ef Gerrit-Change-Number: 22754 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:21:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame .. osmo_ortp: Don't print ERROR message for every missing RTP frame * it's inconsistent to print ERROR in a LOGL_INFO message * loosing RTP packets is not that unusual, especially when the channel is just starting up Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Closes: OS#4464 --- M src/trau/osmo_ortp.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 0cd4e9d..6e91f8d 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -202,8 +202,10 @@ if (recv_with_cb(rs)) return 1; - LOGP(DLMIB, LOGL_INFO, "osmo_rtp_socket_poll(%u): ERROR!\n", -rs->rx_user_ts); + /* this happens every time we miss an incoming RTP frame, which is quite common +* when a voice channel is first activated, or also in case of packet loss. +* See also https://osmocom.org/issues/4464 */ + LOGP(DLMIB, LOGL_DEBUG, "osmo_rtp_socket_poll(%u): No message received\n", rs->rx_user_ts); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}()
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-abis/+/21054 )
Change subject: migrate to osmo_fd_{read,write}_{enable,disable}()
..
Patch Set 4:
(1 comment)
https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c
File src/input/e1d.c:
https://gerrit.osmocom.org/c/libosmo-abis/+/21054/1/src/input/e1d.c@318
PS1, Line 318: osmo_fd_write_enable(& e1i_ts->driver.e1d.fd);
> space between & and var.
Done
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d
Gerrit-Change-Number: 21054
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Comment-Date: Mon, 08 Feb 2021 17:21:00 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in libosmo-abis[master]: migrate to osmo_fd_{read, write}_{enable, disable}()
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-abis/+/21054
to look at the new patch set (#4).
Change subject: migrate to osmo_fd_{read,write}_{enable,disable}()
..
migrate to osmo_fd_{read,write}_{enable,disable}()
Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d
Depends: libosmocore.git Change-Id Idb89ba7bc7c129a6304a76900d17f47daf54d17d
---
M src/input/dahdi.c
M src/input/e1d.c
M src/input/ipa.c
M src/input/ipaccess.c
M src/input/misdn.c
M src/input/rs232.c
M src/input/unixsocket.c
M src/trau/osmo_ortp.c
8 files changed, 21 insertions(+), 21 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/54/21054/4
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21054
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I005826dfe3a8ad0fd6e08df2c87b38ce916bda2d
Gerrit-Change-Number: 21054
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-MessageType: newpatchset
Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:19:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-abis[master]: osmo_ortp: Don't print ERROR message for every missing RTP frame
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/22755 ) Change subject: osmo_ortp: Don't print ERROR message for every missing RTP frame .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: https://gerrit.osmocom.org/c/libosmo-abis/+/22755/1/src/trau/osmo_ortp.c@209 PS1, Line 209: return 0; > IMHO it would make a lot more sense to have a global counter for this > instead, but this chnage as a […] the problem with a global counter is that it has very limited use. You normally constantly have lchans set-up and torn-down, every time that counter would legitimately increase. So if at all, it would be a per-lchan counter, and you would only want to look at its increments after the initial setup and before the final teardown. Even in that case - would we want to put that burden an whatever is processin that counter data externally? I'd say if at all, we'd probably best * start some kind of timer * only count (globally or per-lchan) when that timer has expired * make sure to stop counting early during channel teardown - i.e. "not that simple" -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/22755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ide0017987b4cea7fd24795941494f1da913ea673 Gerrit-Change-Number: 22755 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:19:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:16:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 ) Change subject: stp: Less magic numbers; centralize M3UA configuration .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: stp: Less magic numbers; centralize M3UA configuration
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 to look at the new patch set (#4). Change subject: stp: Less magic numbers; centralize M3UA configuration .. stp: Less magic numbers; centralize M3UA configuration We shouldn't be having magic numbers for point codes etc. in each test case. Change-Id: Id8a6241657e1f02f15d6722934eb040fc98beab1 --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 89 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/22784/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22784 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: Id8a6241657e1f02f15d6722934eb040fc98beab1 Gerrit-Change-Number: 22784 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 )
Change subject: stp: Ignore M3UA SSNM messages in tests
..
stp: Ignore M3UA SSNM messages in tests
The tests were written without considering the arrival of such messages;
however, it is well within the M3UA spec that such messages appear at
any time indicating remote point code availability etc.
In libosmo-sccp.git Id92be4691b0fd77598a6edb642c028bbd8c5b623 we start
generating those messages in osmo-stp.
Let's ignore them in the tests to avoid unexpected failures.
Later on, we likely will introduce / adapt tests to actually expect
those messages whenever appropriate.
Change-Id: I85ce8fd4f26db184833cf348293f0255bb5eaac3
Related: OS#2623
---
M library/M3UA_Templates.ttcn
M stp/STP_Tests_M3UA.ttcn
2 files changed, 221 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/M3UA_Templates.ttcn b/library/M3UA_Templates.ttcn
index 1063b50..5881b40 100644
--- a/library/M3UA_Templates.ttcn
+++ b/library/M3UA_Templates.ttcn
@@ -379,6 +379,218 @@
}
}
+/***
+ * SSNM Class
+ ***/
+
+template (value) M3UA_Point_Code ts_M3UA_PC(uint24_t pc, uint8_t mask := 0) :=
{
+ mask := int2oct(mask, 1),
+ affected_Point_Code := int2oct(pc, 3)
+}
+
+template (value) M3UA_Affected_Point_Codes ts_M3UA_AffPc(template (value)
M3UA_Point_Codes pcs) := {
+ tag := '0012'O,
+ lengthInd := 0,
+ pointCodes := pcs
+}
+template (present) M3UA_Affected_Point_Codes tr_M3UA_AffPc(template (present)
M3UA_Point_Codes pcs) := {
+ tag := '0012'O,
+ lengthInd := ?,
+ pointCodes := pcs
+}
+
+template (value) M3UA_User_Cause ts_M3UA_UserCause(template (value) OCT2 cause,
+ template (value) OCT2 user)
:= {
+ tag := '0204'O,
+ lengthInd := 0,
+ cause := cause,
+ user := user
+}
+template (present) M3UA_User_Cause tr_M3UA_UserCause(template (present) OCT2
cause,
+template (present) OCT2
user) := {
+ tag := '0204'O,
+ lengthInd := ?,
+ cause := cause,
+ user := user
+}
+
+template (value) PDU_M3UA ts_M3UA_DUNA(template (value) M3UA_Point_Codes
affected_pcs,
+ template (omit) OCT4 rctx := omit) := {
+ m3UA_DUNA := {
+ version := c_M3UA_VERSION,
+ reserved := '00'O,
+ messageClassAndType := '0201'O,
+ messageLength := 0,
+ messageParameters := {
+ network_Appearance := omit,
+ routing_Context := ts_M3UA_routing_ctx(rctx),
+ affected_Point_Codes := ts_M3UA_AffPc(affected_pcs),
+ info_String := omit
+ }
+ }
+}
+template (present) PDU_M3UA tr_M3UA_DUNA(template (present) M3UA_Point_Codes
affected_pcs := ?,
+template OCT4 rctx := *):= {
+ m3UA_DUNA := {
+ version := c_M3UA_VERSION,
+ reserved := '00'O,
+ messageClassAndType := '0201'O,
+ messageLength := ?,
+ messageParameters := {
+ network_Appearance := *,
+ routing_Context := tr_M3UA_routing_ctx(rctx),
+ affected_Point_Codes := tr_M3UA_AffPc(affected_pcs),
+ info_String := *
+ }
+ }
+}
+
+template (value) PDU_M3UA ts_M3UA_DAVA(template (value) M3UA_Point_Codes
affected_pcs,
+ template (omit) OCT4 rctx := omit) := {
+ m3UA_DAVA := {
+ version := c_M3UA_VERSION,
+ reserved := '00'O,
+ messageClassAndType := '0202'O,
+ messageLength := 0,
+ messageParameters := {
+ network_Appearance := omit,
+ routing_Context := ts_M3UA_routing_ctx(rctx),
+ affected_Point_Codes := ts_M3UA_AffPc(affected_pcs),
+ info_String := omit
+ }
+ }
+}
+template (present) PDU_M3UA tr_M3UA_DAVA(template (present) M3UA_Point_Codes
affected_pcs := ?,
+template OCT4 rctx := *):= {
+ m3UA_DAVA := {
+ version := c_M3UA_VERSION,
+ reserved := '00'O,
+ messageClassAndType := '0202'O,
+ messageLength := ?,
+ messageParameters := {
+ network_Appearance := *,
+ routing_Context := tr_M3UA_routing_ctx(rctx),
+ affected_Point_Codes :=
Change in osmo-ttcn3-hacks[master]: stp: Time out after 5s if expected M3UA doesn't arrive
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 ) Change subject: stp: Time out after 5s if expected M3UA doesn't arrive .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22786 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: I279aacf2215ccd63a6e52c6a71cda3b500a3795c Gerrit-Change-Number: 22786 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: stp: Ignore M3UA SSNM messages in tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 ) Change subject: stp: Ignore M3UA SSNM messages in tests .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22783 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: I85ce8fd4f26db184833cf348293f0255bb5eaac3 Gerrit-Change-Number: 22783 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:15:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: run on all build slaves again
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/22788 )
Change subject: repo-install-test: run on all build slaves again
..
repo-install-test: run on all build slaves again
It was not possible to reproduce the weird rpm errors on
admin2-deb9build, which had lead to limiting the build slaves to
build2-deb9build-ansible. Enable building on all again.
Closes: OS#4567
Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba
---
M jobs/repo-install-test.yml
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml
index 425357d..64b66cb 100644
--- a/jobs/repo-install-test.yml
+++ b/jobs/repo-install-test.yml
@@ -40,11 +40,6 @@
default: 'master'
axes:
- axis:
- type: slave
- name: label
- # Force using "build2-deb9build-ansible":
https://osmocom.org/issues/4563#note-10
- values: !!python/tuple [build2-deb9build-ansible]
- - axis:
type: user-defined
name: feed
values: '{obj:feeds}'
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba
Gerrit-Change-Number: 22788
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: repo-install-test: run on all build slaves again
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:14:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: repo-install-test: run on all build slaves again
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22788 ) Change subject: repo-install-test: run on all build slaves again .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I82ef1f0c581de8ee826adedd9ecde6b4adaa36ba Gerrit-Change-Number: 22788 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:14:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 )
Change subject: StatsD_Checker: Check f_IPL4_listen result
..
StatsD_Checker: Check f_IPL4_listen result
Change-Id: Ief4e30ae92b8567dd9618064220f9f50df2d0de0
---
M library/StatsD_Checker.ttcn
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/StatsD_Checker.ttcn b/library/StatsD_Checker.ttcn
index d287b74..540e479 100644
--- a/library/StatsD_Checker.ttcn
+++ b/library/StatsD_Checker.ttcn
@@ -25,6 +25,9 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
+import from Misc_Helpers all;
+import from Socket_API_Definitions all;
+
import from StatsD_Types all;
import from StatsD_CodecPort all;
import from StatsD_CodecPort_CtrlFunct all;
@@ -90,6 +93,7 @@
function main(charstring statsd_host, integer statsd_port) runs on
StatsD_Checker_CT {
var StatsD_ConnHdlr vc_conn;
var StatsDExpects expects;
+ var Result res;
while (not mp_enable_stats) {
log("StatsD checker disabled by modulepar");
@@ -97,7 +101,11 @@
}
map(self:STATS, system:STATS);
- StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host,
statsd_port, { udp := {} }, {});
+ res := StatsD_CodecPort_CtrlFunct.f_IPL4_listen(STATS, statsd_host,
statsd_port, { udp := {} }, {});
+ if (not ispresent(res.connId)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not bind StatsD socket, check
your configuration");
+ }
/* Connect to VTY and reset stats */
map(self:STATSVTY, system:STATSVTY);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741
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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0
Gerrit-Change-Number: 22741
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix tons of template restriction warnings
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22731 )
Change subject: Osmocom_Gb_Types: Fix tons of template restriction warnings
..
Osmocom_Gb_Types: Fix tons of template restriction warnings
Change-Id: I3da153ce5e83b231501e74b958fcac9f10c00849
---
M gbproxy/GBProxy_Tests.ttcn
M library/BSSGP_Emulation.ttcnpp
M library/Osmocom_Gb_Types.ttcn
M library/RAW_NS.ttcnpp
4 files changed, 275 insertions(+), 143 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index ad8874c..0f3b4cb 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -1105,7 +1105,7 @@
ts_BSSGP_DL_UD(g_pars.tlli, payload, omit,
ts_BSSGP_IMSI(g_pars.imsi));
/* we cannot use pdu_tx as there are some subtle differences in
the length field :/ */
var template (present) PDU_BSSGP pdu_rx :=
- tr_BSSGP_DL_UD(g_pars.tlli, payload,
tr_BSSGP_IMSI(g_pars.imsi));
+ tr_BSSGP_DL_UD(g_pars.tlli, payload,
ts_BSSGP_IMSI(g_pars.imsi));
log("DL-UNITDATA(payload_size=", i);
f_sgsn2pcu(pdu_tx, pdu_rx);
@@ -2691,11 +2691,11 @@
f_init();
f_global_init_ptp();
- var template (value) PDU_BSSGP pdu_tx := t_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
+ var template (value) PDU_BSSGP pdu_tx := ts_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
/* we cannot use pdu_tx as there are some subtle differences in the
length field :/ */
var template (present) PDU_BSSGP pdu_rx := tr_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
- var template (omit) PDU_BSSGP ack_tx :=
-
t_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value);
+ var template (value) PDU_BSSGP ack_tx :=
+
ts_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value);
/* Send a FC-BVC from BSS to gbproxy, expect an ACK in response */
G_PCU[0].send(pdu_tx);
@@ -3030,11 +3030,11 @@
cont_tx :=
ts_RAN_Information_Error_RIM_Container(ts_RIM_Application_Identity(RIM_APP_ID_NACC),
ts_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE),
- omit,
valueof(t_BVC_UNBLOCK(23)));
+ omit,
valueof(ts_BVC_UNBLOCK(23)));
cont_rx :=
tr_RAN_Information_Error_RIM_Container(tr_RIM_Application_Identity(RIM_APP_ID_NACC),
-
t_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE),
- omit,
enc_PDU_BSSGP(valueof(t_BVC_UNBLOCK(23;
+
ts_BSSGP_CAUSE(BSSGP_CAUSE_EQUIMENT_FAILURE),
+ omit,
enc_PDU_BSSGP(valueof(tr_BVC_UNBLOCK(23;
f_rim_pcu2sgsn(ts_PDU_BSSGP_RAN_INFORMATION_ERROR(dst :=
ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, ra_sgsn),
src :=
ts_RIM_Routing_Information(RIM_ADDR_GERAN_CELL_ID, ra_pcu),
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 4b93a26..1f32cc2 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -439,16 +439,16 @@
}
/* any BLOCK or UNBLOCK for the SIGNALING BVCI are illegal */
- [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(0, ?), 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK(0, ?), 0)) -> value udi {
setverdict(fail, "Rx BVC-BLOCK illegal for BVCI=0: ", udi);
}
- [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK(0), 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK(0), 0)) -> value udi {
setverdict(fail, "Rx BVC-UNBLOCK illegal for BVCI=0: ", udi);
}
- [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK_ACK(0), 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK_ACK(0), 0)) -> value udi {
setverdict(fail, "Rx BVC-BLOCK-ACK illegal for BVCI=0: ", udi);
}
- [] BSCP.receive(f_BnsUdInd(t_BVC_UNBLOCK_ACK(0), 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_BVC_UNBLOCK_ACK(0), 0)) -> value udi {
setverdict(fail, "Rx BVC-UNBLOCK-ACK illegal for BVCI=0: ",
udi);
}
@@ -495,21 +495,21 @@
}
/* any BLOCK or UNBLOCK for the SIGNALING BVCI are illegal */
- [] BSCP.receive(f_BnsUdInd(t_BVC_BLOCK(0, ?), 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_BVC_BLOCK(0, ?), 0)) -> value udi {
setverdict(fail, "Rx BVC-BLOCK illegal for BVCI=0: ", udi);
}
- []
Change in osmo-ttcn3-hacks[master]: StatsD_Checker: Check f_IPL4_listen result
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 ) Change subject: StatsD_Checker: Check f_IPL4_listen result .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22741 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: Ief4e30ae92b8567dd9618064220f9f50df2d0de0 Gerrit-Change-Number: 22741 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:13:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 )
Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void
function
..
Osmocom_Gb_Types: Fix warning: control reaches end of non-void function
Change-Id: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c
---
M library/Osmocom_Gb_Types.ttcn
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 4e1fb8c..82f2aca 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -5,6 +5,7 @@
import from General_Types all;
import from Osmocom_Types all;
+ import from Misc_Helpers all;
import from GSM_Types all;
import from BSSGP_Types all
import from NS_Types all
@@ -3690,10 +3691,8 @@
case
(PDU_BSSGP:{pDU_BSSGP_PAGING_CS:={?,?,?,{bVCI:=?},*,*,*,*,*}}) {
return pdu.pDU_BSSGP_PAGING_CS.paging_Field4.bVCI;
}
- case else {
- return omit;
- }
}
+ return omit;
}
/* extract the BVCI IE of given PDU + convert it to integer value */
@@ -3734,8 +3733,9 @@
} else if (substr(tllib, 0, 4) == '0001'B) {
return TLLI_RAND_G_RNTI;
} else {
- setverdict(fail, "Unknonw TLLI Type ", tllib);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Unknonw TLLI Type ",
tllib));
+ return TLLI_LOCAL;
}
}
@@ -3751,8 +3751,9 @@
case (TLLI_G_RNTI) { prefix := ''B }
case (TLLI_RAND_G_RNTI) { prefix := '0001'B }
case else {
- setverdict(fail, "Unknonw TLLI Type ", tlli_type);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Unknonw TLLI Type ",
tlli_type));
+ return ''O;
}
}
return bit2oct(prefix & substr(tmsi_bits, lengthof(prefix),
32-lengthof(prefix)));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738
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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c
Gerrit-Change-Number: 22738
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 )
Change subject: pcu: Fix warning: control reaches end of non-void function
..
pcu: Fix warning: control reaches end of non-void function
Change-Id: I2c8b343fba5fabda9f78af8711e2a837536518e9
---
M pcu/GPRS_TBF.ttcn
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pcu/GPRS_TBF.ttcn b/pcu/GPRS_TBF.ttcn
index f946f29..3794410 100644
--- a/pcu/GPRS_TBF.ttcn
+++ b/pcu/GPRS_TBF.ttcn
@@ -14,6 +14,7 @@
import from GSM_Types all;
import from Osmocom_Types all;
import from General_Types all;
+import from Misc_Helpers all;
import from RLCMAC_CSN1_Types all;
import from RLCMAC_Types all;
import from RLCMAC_Templates all;
@@ -409,8 +410,9 @@
}
function f_dl_tbf_is_in_window(integer bsn) return boolean {
- setverdict(fail, "pleaes implement me");
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "please implement me");
+ return false;
}
function f_dl_tbf_is_received(inout DlTbfState ds, integer bsn) return boolean
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736
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: I2c8b343fba5fabda9f78af8711e2a837536518e9
Gerrit-Change-Number: 22736
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 )
Change subject: GSM_Types: Fix warning: control reaches end of non-void function
..
GSM_Types: Fix warning: control reaches end of non-void function
Change-Id: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84
---
M library/GSM_Types.ttcn
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn
index 9710c26..bcd0afb 100644
--- a/library/GSM_Types.ttcn
+++ b/library/GSM_Types.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
+import from Misc_Helpers all;
type integer GsmArfcn (0..1023);
type integer UmtsArfcn (0..16383);
@@ -86,11 +87,10 @@
case (CS2) { return 32 }
case (CS3) { return 38 }
case (CS3) { return 52 }
- case else {
- setverdict(fail, "Invalid GPRS CS ", cs);
- mtc.stop;
- }
}
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ log2str("Invalid GPRS CS ", cs));
+ return 0;
}
const GprsTlli TLLI_UNUSED := ''O;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735
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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84
Gerrit-Change-Number: 22735
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenc...
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730 )
Change subject: Osmocom_Gb_Types: Fix warning: inadequate restriction on the
referenced function
..
Osmocom_Gb_Types: Fix warning: inadequate restriction on the referenced function
Fixes warning:
Osmocom_Gb_Types.ttcn:1377.13-32: warning: Inadequate restriction on the
referenced function `f_oct_or_wc(bmax, 2)', this may cause a dynamic test
case error at runtime
Change-Id: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c
---
M library/Osmocom_Gb_Types.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index cbaeb72..4e1fb8c 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -1374,7 +1374,7 @@
lengthIndicator := {
length1 := 2
},
- bmax := f_oct_or_wc(bmax, 2)
+ bmax := int2oct(bmax, 2)
},
bucket_Leak_Rate := {
iEI := '03'O,
@@ -1382,7 +1382,7 @@
lengthIndicator := {
length1 := 2
},
- r_Value := f_oct_or_wc(bucket_leak_rate, 2)
+ r_Value := int2oct(bucket_leak_rate, 2)
},
bucket_Full_Ratio := omit,
flow_Control_Granularity := omit
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22730
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: Icb8698c7f2ca697a3638d5a4e4e38f20e14fd34c
Gerrit-Change-Number: 22730
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729 )
Change subject: pcu: Fix inadequate restriction on the referenced template
parameter
..
pcu: Fix inadequate restriction on the referenced template parameter
warning: Inadequate restriction on the referenced template parameter `imsi'
Change-Id: Iecd19d8d397e427068e495577889e1247faa11e7
---
M pcu/GPRS_Components.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 3658fc8..830f8d3 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -1153,7 +1153,7 @@
}
/* Return true if a given Packet Paging Request contains the given IMSI, false
otherwise */
-function f_pkt_paging_match_imsi(in PacketPagingReq req, template hexstring
imsi,
+function f_pkt_paging_match_imsi(in PacketPagingReq req, template (present)
hexstring imsi,
boolean cs_domain := true, boolean ps_domain
:= true)
runs on MS_BTS_IFACE_CT return boolean {
if (not ispresent(req.repeated_pageinfo)) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22729
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: Iecd19d8d397e427068e495577889e1247faa11e7
Gerrit-Change-Number: 22729
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728 )
Change subject: pcu: Fix inadequate restriction on the referenced template
parameter
..
pcu: Fix inadequate restriction on the referenced template parameter
Fixes:
warning: Inadequate restriction on the referenced template parameter
`tfi', this may cause a dynamic test case error at runtime
Same for other parameters.
Change-Id: If2cadbc7087ac0f99537b9916ef0c23363c9242c
---
M library/RLCMAC_Templates.ttcn
1 file changed, 19 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/library/RLCMAC_Templates.ttcn b/library/RLCMAC_Templates.ttcn
index 981061c..6b5fb9f 100644
--- a/library/RLCMAC_Templates.ttcn
+++ b/library/RLCMAC_Templates.ttcn
@@ -422,9 +422,12 @@
}
/* Template for uplink Data block */
- template RlcmacUlBlock t_RLCMAC_UL_DATA(template CodingScheme cs,
template uint5_t tfi,
- template uint4_t cv, template
uint7_t bsn,
- template LlcBlocks blocks :=
{}, template boolean stall := false) := {
+ template (value) RlcmacUlBlock t_RLCMAC_UL_DATA(template (value)
CodingScheme cs,
+ template (value)
uint5_t tfi,
+ template (value)
uint4_t cv,
+ template (value)
uint7_t bsn,
+ template (value)
LlcBlocks blocks := {},
+ template (value)
boolean stall := false) := {
data := {
cs := cs,
mac_hdr := {
@@ -444,10 +447,13 @@
blocks := blocks
}
}
- template RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template CodingScheme cs,
template uint5_t tfi,
-template uint4_t cv,
template uint7_t bsn,
-template LlcBlocks blocks
:= {}, template boolean stall := false,
-template GprsTlli tlli) :=
{
+ template (value) RlcmacUlBlock t_RLCMAC_UL_DATA_TLLI(template (value)
CodingScheme cs,
+template (value)
uint5_t tfi,
+template (value)
uint4_t cv,
+template (value)
uint7_t bsn,
+template (value)
LlcBlocks blocks := {},
+template (value)
boolean stall := false,
+template (value)
GprsTlli tlli) := {
data := {
cs := cs,
mac_hdr := {
@@ -469,9 +475,12 @@
}
/* Template for uplink Data block */
- template RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs,
- template uint5_t tfi,
template uint4_t cv,
- template uint11_t bsn1,
template uint8_t bsn2_offset := 0, template EgprsLlcBlocks blocks := {}) := {
+ template (value) RlcmacUlBlock t_RLCMAC_UL_EGPRS_DATA(CodingScheme mcs,
+ template (value)
uint5_t tfi,
+ template (value)
uint4_t cv,
+ template (value)
uint11_t bsn1,
+ template (value)
uint8_t bsn2_offset := 0,
+ template (value)
EgprsLlcBlocks blocks := {}) := {
data_egprs := {
mcs := mcs,
mac_hdr := {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22728
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: If2cadbc7087ac0f99537b9916ef0c23363c9242c
Gerrit-Change-Number: 22728
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: pcu: Fix inadequate restriction on the referenced template parameter
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727 )
Change subject: pcu: Fix inadequate restriction on the referenced template
parameter
..
pcu: Fix inadequate restriction on the referenced template parameter
Fixes:
warning: Inadequate restriction on the referenced template parameter
`chreq_desc', this may cause a dynamic test case error at runtime
Change-Id: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b
---
M pcu/GPRS_Components.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index bf2e868..3658fc8 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -423,7 +423,7 @@
}
function f_dltbf_ts_RLCMAC_DL_ACK_NACK(DlTbf dl_tbf, boolean use_egprs :=
false,
- template ChannelReqDescription
chreq_desc := omit)
+ template (omit) ChannelReqDescription
chreq_desc := omit)
runs on MS_BTS_IFACE_CT return template RlcmacUlBlock {
if (use_egprs) {
return ts_RLCMAC_DL_ACK_NACK_EGPRS(dl_tbf.tfi,
dl_tbf.egprs_acknack_desc, false, chreq_desc);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22727
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: I10b170c13aedc8abaaaf3b67d563ade8c3586c5b
Gerrit-Change-Number: 22727
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: CTRL: Avoid using keyword 'now' as var
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725 )
Change subject: CTRL: Avoid using keyword 'now' as var
..
CTRL: Avoid using keyword 'now' as var
Fixes warning: Keyword 'now' is treated as an identifier. Activate
compiler option '-I' to use real-time testing features
Change-Id: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f
---
M library/Osmocom_CTRL_Functions.ttcn
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
diff --git a/library/Osmocom_CTRL_Functions.ttcn
b/library/Osmocom_CTRL_Functions.ttcn
index 294fe33..15cb26f 100644
--- a/library/Osmocom_CTRL_Functions.ttcn
+++ b/library/Osmocom_CTRL_Functions.ttcn
@@ -268,14 +268,14 @@
* Set the test verdict accordingly. */
function f_counter_name_vals_expect(IPA_CTRL_PT pt, charstring
instance_name, integer instance_nr,
CounterNameVals vals) {
- var CounterNameVals now := f_counter_name_vals_get(pt,
instance_name, instance_nr, vals);
+ var CounterNameVals last := f_counter_name_vals_get(pt,
instance_name, instance_nr, vals);
for (var integer i := 0; i < lengthof(vals); i := i + 1) {
- if (now[i].name != vals[i].name) {
+ if (last[i].name != vals[i].name) {
setverdict(fail, "Internal error");
}
- if (now[i].val != vals[i].val) {
+ if (last[i].val != vals[i].val) {
setverdict(fail, "Rate counter mismatch: ",
instance_name, " ", instance_nr,
- " ", vals[i].name, " is at ",
now[i].val, " but expected ", vals[i].val);
+ " ", vals[i].name, " is at ",
last[i].val, " but expected ", vals[i].val);
}
}
setverdict(pass);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22725
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: I2b350bc93b33f36f72d35cb48d01f6c37ac1630f
Gerrit-Change-Number: 22725
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix indentation whitespace
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723 )
Change subject: BSSGP_Emulation: Fix indentation whitespace
..
BSSGP_Emulation: Fix indentation whitespace
Change-Id: Iade336832e7045cd29bae52c7907c6a1c57813cd
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 04220ed..4b93a26 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -365,7 +365,7 @@
} else {
setverdict(fail, "Rx SIG BSSGP for unknown PTP
BVCI ", ptp_bvci, ": ", udi.bssgp);
BSCP.send(f_BnsUdReq(ts_BSSGP_STATUS(udi.bvci,
BSSGP_CAUSE_BVCI_UNKNOWN, udi.bssgp), 0, 0));
-}
+ }
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22723
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: Iade336832e7045cd29bae52c7907c6a1c57813cd
Gerrit-Change-Number: 22723
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 )
Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void
function
..
BSSGP_Emulation: Fix warning: control reaches end of non-void function
Change-Id: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 16 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 4af5f82..04220ed 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -25,6 +25,7 @@
import from BSSGP_Types all;
import from Osmocom_Gb_Types all;
import from IPL4asp_Types all;
+import from Misc_Helpers all;
#ifdef BSSGP_EM_L3
import from MobileL3_GMM_SM_Types all;
@@ -591,8 +592,8 @@
} else if (ischosen(l3_mo.msgs.sms)) {
return c_LLC_SAPI_LLSMS;
}
- setverdict(fail, "No LLC SAPI for ", l3_mo);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No LLC SAPI
for ", l3_mo));
+ return ''B;
}
private function f_llc_sapi_by_l3_mt(PDU_L3_SGSN_MS l3_mt) return BIT4 {
@@ -603,8 +604,8 @@
} else if (ischosen(l3_mt.msgs.sms)) {
return c_LLC_SAPI_LLSMS;
}
- setverdict(fail, "No LLC SAPI for ", l3_mt);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("No LLC SAPI
for ", l3_mt));
+ return ''B;
}
#endif
@@ -830,8 +831,7 @@
/* Default Create Callback function: Fail and terminate */
function DefaultCreateCallback(BssgpBvci bvci, BssgpCellId cell_id, OCT4 tlli,
BssgpDecoded dec) runs on BSSGP_BVC_CT {
- setverdict(fail, "Couldn't find Component for TLLI ", tlli);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't
find Component for TLLI ", tlli));
}
/*
@@ -874,9 +874,10 @@
for (i := 0; i < sizeof(ClientTable); i := i+1) {
if (isvalue(ClientTable[i].imsi) and ClientTable[i].imsi ==
imsi) {
if (ClientTable[i].comp_ref != vc_conn) {
- setverdict(fail, "Cannot unregister index=", i,
" IMSI ", imsi, " registred to ",
- ClientTable[i].comp_ref, " from ",
vc_conn);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__,
fail,
+ log2str("Cannot
unregister index=", i, " IMSI ",
+ imsi, "
registred to ", ClientTable[i].comp_ref,
+ " from ",
vc_conn));
}
log("Removing Client IMSI=", imsi, ", index=", i);
ClientTable[i] := {
@@ -919,8 +920,8 @@
return ClientTable[i].comp_ref;
}
}
- setverdict(fail, "Couldn't find Component for IMSI ", imsi);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't
find Component for IMSI ", imsi));
+ return ClientTable[0].comp_ref;
}
private function f_tbl_comp_by_tlli(OCT4 tlli) runs on BSSGP_BVC_CT return
BSSGP_Client_CT {
@@ -942,8 +943,8 @@
return i;
}
}
- setverdict(fail, "Couldn't find Client for Component ", comp_ref);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't
find Client for Component ", comp_ref));
+ return 1;
}
private function f_tbl_tlli_by_comp(BSSGP_Client_CT comp_ref) runs on
BSSGP_BVC_CT return OCT4 {
@@ -954,8 +955,8 @@
return ClientTable[i].tlli;
}
}
- setverdict(fail, "Couldn't find TLLI for Component ", comp_ref);
- mtc.stop;
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Couldn't
find TLLI for Component ", comp_ref));
+ return ''O;
}
/* PDU_BSSGP enhanced with LLC and possibly L3 decoded payloads */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722
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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12
Gerrit-Change-Number: 22722
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 ) Change subject: Osmocom_Gb_Types: Fix warning: control reaches end of non-void function .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22738 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: Ic2b8d0215c378ec2fd1a44775dc4e43616ca9f3c Gerrit-Change-Number: 22738 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:13:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Fix warning: control reaches end of non-void function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 ) Change subject: pcu: Fix warning: control reaches end of non-void function .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22736 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: I2c8b343fba5fabda9f78af8711e2a837536518e9 Gerrit-Change-Number: 22736 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GSM_Types: Fix warning: control reaches end of non-void function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 ) Change subject: GSM_Types: Fix warning: control reaches end of non-void function .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22735 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: I749fe3a2ca85ae96fa74a78f15180cfaa02ffe84 Gerrit-Change-Number: 22735 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BSSGP_Emulation: Fix warning: control reaches end of non-void function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 ) Change subject: BSSGP_Emulation: Fix warning: control reaches end of non-void function .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22722 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: I9a44afc81b5b6b35a32a12efcf2dd1cb15e73e12 Gerrit-Change-Number: 22722 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 08 Feb 2021 17:12:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 ) Change subject: sccp: Add minimalistic SCMG implementation .. Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1//COMMIT_MSG@10 PS1, Line 10: at SSN=1. In Osmcoom we so far ignored its existence. However, > Osmocom Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c File src/sccp_scmg.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22789/1/src/sccp_scmg.c@192 PS1, Line 192: /* PC is encoded in little endian ?!? */ > does this mean you tested against some implementation not following our > expectations? no, this means I'm extremely surprised to see that in the specs the byte order for the PC is little-endian, while normally everything is big-endian. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:11:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmo-sccp[master]: sccp: Add minimalistic SCMG implementation
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 to look at the new patch set (#3). Change subject: sccp: Add minimalistic SCMG implementation .. sccp: Add minimalistic SCMG implementation SCMG (SCCP Management) is a special sub-system that normally resides at SSN=1. In Osmocom we so far ignored its existence. However, in terms of interop with other implementation, we should implement at least some basic features. The only procedure implemented in this initial commit is the response to an incoming SST (Subsystem Test) message. If we don't respond to this message, a remote SCCP entity could assume the SSN is dead on our side, rendering communication impossible. Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 --- M include/osmocom/sigtran/Makefile.am A include/osmocom/sigtran/protocol/sccp_scmg.h M src/sccp_internal.h M src/sccp_scmg.c M src/sccp_user.c 5 files changed, 166 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/22789/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I04b162476f7652ef0540b5ea7299e9447efd1d09 Gerrit-Change-Number: 22789 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py@368 PS1, Line 368: def get_num_phy_errors(self, kpi): > It's used in one of the TC to check for erros, like also KPI. […] Why not add this as a KPI? This way we don't need yet another API for this kind of counters. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:08:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: srs_andre Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3: return 0 if iperf results can't be read back
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22037 ) Change subject: iperf3: return 0 if iperf results can't be read back .. Patch Set 9: I added +2 here, but thinking about it, does it really make sense to mask the exception by default and return 0? I'm not that sure. Id you really want to mute the exception, I'd do that in the caller of the method, not the method itself. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I5a8fe32f0a2bb676dbb80dad500bc6c63c176485 Gerrit-Change-Number: 22037 Gerrit-PatchSet: 9 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:03:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 )
Change subject: SUA: Verify routing context IE of incoming CL and CO messages
..
SUA: Verify routing context IE of incoming CL and CO messages
When receiving user-data (connectionless / connection-oriented),
we must make sure that there either
a) no routing context IE in the message, and only one AS within the ASP, or
b) a valid routing context IE for an AS within the ASP
This important input validation has been done in M3UA for a long time,
but somehow never been implemented on the SUA side so far.
Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645
---
M src/sua.c
1 file changed, 14 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/sua.c b/src/sua.c
index 4a98b9a..42d43e8 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -510,10 +510,17 @@
/* connectionless messages received from socket */
static int sua_rx_cl(struct osmo_ss7_asp *asp, struct xua_msg *xua)
{
+ struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX);
struct osmo_sccp_instance *inst = asp->inst->sccp;
+ struct osmo_ss7_as *as;
+ int rc;
OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CL);
+ rc = xua_find_as_for_asp(, asp, rctx_ie);
+ if (rc)
+ return rc;
+
switch (xua->hdr.msg_type) {
case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */
case SUA_CL_CLDT:
@@ -531,10 +538,17 @@
/* connection-oriented messages received from socket */
static int sua_rx_co(struct osmo_ss7_asp *asp, struct xua_msg *xua)
{
+ struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, SUA_IEI_ROUTE_CTX);
struct osmo_sccp_instance *inst = asp->inst->sccp;
+ struct osmo_ss7_as *as;
+ int rc;
OSMO_ASSERT(xua->hdr.msg_class == SUA_MSGC_CO);
+ rc = xua_find_as_for_asp(, asp, rctx_ie);
+ if (rc)
+ return rc;
+
switch (xua->hdr.msg_type) {
case 0: /* Reserved, permitted by ETSI TS 101 592 5.2.3.2 */
case SUA_CO_CORE:
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645
Gerrit-Change-Number: 22776
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 )
Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp()
..
m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp()
This way the function can be re-used by SUA.
Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5
---
M src/Makefile.am
M src/m3ua.c
M src/xua_internal.h
A src/xua_shared.c
4 files changed, 108 insertions(+), 56 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/Makefile.am b/src/Makefile.am
index 484886c..91084de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@
libosmo_sigtran_la_SOURCES = sccp_sap.c sua.c m3ua.c xua_msg.c sccp_helpers.c \
sccp2sua.c sccp_scrc.c sccp_sclc.c sccp_scoc.c \
-sccp_user.c sccp_types.c xua_rkm.c
xua_default_lm_fsm.c \
+sccp_user.c sccp_types.c xua_rkm.c xua_shared.c
xua_default_lm_fsm.c \
osmo_ss7.c osmo_ss7_hmrt.c xua_asp_fsm.c
xua_as_fsm.c \
osmo_ss7_vty.c sccp_vty.c ipa.c
libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
-export-symbols-regex '^osmo_'
diff --git a/src/m3ua.c b/src/m3ua.c
index 542777e..bfb0c23 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -532,60 +532,6 @@
return data_hdr;
}
-/* if given ASP only has one AS, return that AS */
-static struct osmo_ss7_as *find_single_as_for_asp(const struct osmo_ss7_asp
*asp)
-{
- struct osmo_ss7_as *as, *as_found = NULL;
-
- llist_for_each_entry(as, >inst->as_list, list) {
- if (!osmo_ss7_as_has_asp(as, asp))
- continue;
- /* check if we already had found another AS within this ASP ->
not unique */
- if (as_found)
- return NULL;
- as_found = as;
- }
-
- return as_found;
-}
-
-static int find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp
*asp,
- const struct xua_msg_part *rctx_ie)
-{
- *as = NULL;
-
- if (rctx_ie) {
- uint32_t rctx = xua_msg_part_get_u32(rctx_ie);
- /* Use routing context IE to look up the AS for which the
-* message was received. */
- *as = osmo_ss7_as_find_by_rctx(asp->inst, rctx);
- if (!*as) {
- LOGPASP(asp, DLM3UA, LOGL_ERROR, "%s(): invalid routing
context: %u\n",
- __func__, rctx);
- return M3UA_ERR_INVAL_ROUT_CTX;
- }
-
- /* Verify that this ASP is part of the AS. */
- if (!osmo_ss7_as_has_asp(*as, asp)) {
- LOGPASP(asp, DLM3UA, LOGL_ERROR,
- "%s(): This Application Server Process is not
part of the AS %s "
- "resolved by routing context %u\n", __func__,
(*as)->cfg.name, rctx);
- return M3UA_ERR_NO_CONFGD_AS_FOR_ASP;
- }
- } else {
- /* no explicit routing context; this only works if there is
only one AS in the ASP */
- *as = find_single_as_for_asp(asp);
- if (!*as) {
- LOGPASP(asp, DLM3UA, LOGL_ERROR,
- "%s(): ASP sent M3UA without Routing Context IE
but unable to uniquely "
- "identify the AS for this message\n", __func__);
- return M3UA_ERR_INVAL_ROUT_CTX;
- }
- }
-
- return 0;
-}
-
static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua)
{
struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua,
M3UA_IEI_ROUTE_CTX);
@@ -603,7 +549,7 @@
return M3UA_ERR_UNSUPP_MSG_TYPE;
}
- rc = find_as_for_asp(, asp, rctx_ie);
+ rc = xua_find_as_for_asp(, asp, rctx_ie);
if (rc)
return rc;
diff --git a/src/xua_internal.h b/src/xua_internal.h
index d836fae..65adfb6 100644
--- a/src/xua_internal.h
+++ b/src/xua_internal.h
@@ -69,6 +69,8 @@
int xua_as_transmit_msg(struct osmo_ss7_as *as, struct msgb *msg);
+int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp
*asp,
+ const struct xua_msg_part *rctx_ie);
int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua);
int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg);
diff --git a/src/xua_shared.c b/src/xua_shared.c
new file mode 100644
index 000..cdd6f7f
--- /dev/null
+++ b/src/xua_shared.c
@@ -0,0 +1,104 @@
+/* Shared code between M3UA and SUA implementation */
+
+/* (C) 2015-2021 by Harald Welte
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier:
Change in libosmo-sccp[master]: SUA: Verify routing context IE of incoming CL and CO messages
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 ) Change subject: SUA: Verify routing context IE of incoming CL and CO messages .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Icc232250513009137add3b45fecbb5d2a07c0645 Gerrit-Change-Number: 22776 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:03:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 ) Change subject: m3ua: Move find_as_for_asp() to shared xua_find_as_for_asp() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0dfc5a7a24dd068002e837dc47eb0778c503cac5 Gerrit-Change-Number: 22775 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 ) Change subject: xua: Implement SNM availability/unavailability messaging .. Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c File src/m3ua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/m3ua.c@825 PS3, Line 825: * \param[in] available are aff_pc now available (true) or unavailable (false */ > (false) Done https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c File src/xua_snm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/22777/3/src/xua_snm.c@91 PS3, Line 91: m3ua_tx_snm_available(asp, rctx, num_rctx, aff_pc, num_aff_pc, info_str, available); > so these new params don't exist in M3UA? no, as it is one level lower in the protocol stack. At M3UA level you can only inform about unavailability of a point code level. In SUA you are at SCCP level, and you can inform about unavailability of a SCCP sub-system level. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmo-sccp[master]: xua: Implement SNM availability/unavailability messaging
Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 to look at the new patch set (#4). Change subject: xua: Implement SNM availability/unavailability messaging .. xua: Implement SNM availability/unavailability messaging M3UA and SUA have one sub-protocol called [S]SNM, through which the SG informs the ASP about certain destinations (point codes) becoming available (DAVA) or unavailable (DUNA) in the SS7 network. This patch adds support for * generating DAVA/DUAN on a SGP when the AS FSM changes to/from AS-ACTIVE * receiving DAVA/DUNA on an ASP and informing other "SG role" AS/ASP * processing DAUD from ASP received by SG, generating relate DAVA/DUNA responses Related: OS#2623 Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 --- M src/Makefile.am M src/m3ua.c M src/sua.c M src/xua_as_fsm.c M src/xua_internal.h A src/xua_snm.c 6 files changed, 554 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/77/22777/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/22777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Id92be4691b0fd77598a6edb642c028bbd8c5b623 Gerrit-Change-Number: 22777 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 )
Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class
..
Patch Set 3: Code-Review+1
(2 comments)
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/enb.py
File src/osmo_gsm_tester/obj/enb.py:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/enb.py@360
PS3, Line 360: def get_stdout_kpis(self):
As I said, I'm not really liking more and more APIS appearing. I don't see the
benefit of having several APIs where one "get_kpis" containing all the kpis
(dict) is enough.
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py
File src/osmo_gsm_tester/obj/epc.py:
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/3/src/osmo_gsm_tester/obj/epc.py@124
PS3, Line 124: return {'total_errors': 0, 'total_warnings': 0}
Still missing to remove trailing whitespace.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32
Gerrit-Change-Number: 22601
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Mon, 08 Feb 2021 17:02:00 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srslte_common: add helper method to only get stdout KPIs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: srslte_common: add helper method to only get stdout KPIs .. Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py File src/osmo_gsm_tester/obj/srslte_common.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600/3/src/osmo_gsm_tester/obj/srslte_common.py@50 PS3, Line 50: def get_stdout_kpis(self): I'm in general not happy to see new public APIs like this popping up (is it public to be used by tests? it's not clear here. It makes it harder to later on support new implementations of object classes. In case of this being a public API, what's the benefit of having this public and not gathering all the KPIs from test through "get_kpis()"? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:58:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_mme: use/expose count paramter from MS config for MME
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 ) Change subject: amarisoft_mme: use/expose count paramter from MS config for MME .. Patch Set 3: Thanks. Can we move the field to something more descriptive? Like "subscriber_count" ? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I29885791f716c204d0b6f18ba134885bae853b6f Gerrit-Change-Number: 22599 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:55:37 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb: Set cipher and integrity via scenario file
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 ) Change subject: enb: Set cipher and integrity via scenario file .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21582 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I595206b7d49016fb6d0aec175c828d9537c53886 Gerrit-Change-Number: 21582 Gerrit-PatchSet: 9 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Mon, 08 Feb 2021 16:54:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb, ue, process: move stdout counter helper to process objects
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 ) Change subject: enb,ue,process: move stdout counter helper to process objects .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I434f072b8aa6f4dce9f90889c6b40832f6798ff8 Gerrit-Change-Number: 22042 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:52:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: Introduce Android UEs as new modems
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 ) Change subject: Introduce Android UEs as new modems .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21302 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I79a5d803e869a868d4dac5e0d4c2feb38038dc5c Gerrit-Change-Number: 21302 Gerrit-PatchSet: 7 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:47:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb, epc: implement stdout/log KPI getter in eNB/EPC base class
srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 ) Change subject: enb,epc: implement stdout/log KPI getter in eNB/EPC base class .. Patch Set 2: (3 comments) See below, thanks https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py File src/osmo_gsm_tester/obj/enb.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py@358 PS1, Line 358: > Remove this whitespace Ack https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py@364 PS1, Line 364: def get_log_kpis(self): > I'm not sure what's the point in splitting between log and kpi, is there some > rationale behind this? the idea is that we have some KPI that we always get from stdout (like when a UE connects) and some that we get from the logs, but only if the log level is set accordingly https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601/1/src/osmo_gsm_tester/obj/enb.py@368 PS1, Line 368: def get_num_phy_errors(self, kpi): > What about this function? looks not related to this patch? It's used in one of the TC to check for erros, like also KPI. We never ran the tests with Amarisoft eNB, so I didn't see it was an issue there. So now I've moved the method to enb.py -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I7c6c9abf73c2fc1d9104ea082bef6ffa0aeeac32 Gerrit-Change-Number: 22601 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 08 Feb 2021 16:32:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
