[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller
Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email ) The change is no longer submittable: Code-Review is unsatisfied now. Change subject: mgcp-client: MGCP response: pass fmtp to caller .. Patch Set 3: Code-Review-1 (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34905/comment/1f7b876b_6c1d206f PS3, Line 452: /* No entry was found. This is an error in the MGCP protocol, but let's just add another there should be a C test for this (originally indicated in https://gerrit.osmocom.org/c/osmo-mgw/+/34899/5..7/src/libosmo-mgcp-client/mgcp_client.c#b421 ) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 Gerrit-Change-Number: 34905 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 30 Nov 2023 03:01:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 6: (1 comment) File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/19b274fc_3b5f792a PS6, Line 848: fflush(stdout); separate patch -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 30 Nov 2023 02:55:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email ) Change subject: add fmtp string to ptmap: allow all possible fmtp .. Patch Set 6: Code-Review-1 (4 comments) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/f23a3aec_9a725e02 PS6, Line 1372: ! == https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/dd0fc1b9_19ab61ee PS6, Line 1376: octet-align=1 use OSMO_MGCP_AMR_OCTET_ALIGN_EQUALS(1) https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/35cc54c6_06ae9018 PS6, Line 1376: a=fmtp:%u there should be some def like #define FOO "a=fmtp:" https://gerrit.osmocom.org/c/osmo-mgw/+/34900/comment/af9539a1_fd1629a3 PS6, Line 1378: octet use OSMO_MGCP_AMR_OCTET_ALIGN_EQUALS(0) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b Gerrit-Change-Number: 34900 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-Comment-Date: Thu, 30 Nov 2023 02:54:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp_client_fsm: allocate struct mgcp_conn_peer dynamically
Attention is currently required from: dexter. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34404?usp=email ) Change subject: mgcp_client_fsm: allocate struct mgcp_conn_peer dynamically .. Patch Set 10: Code-Review+2 (1 comment) Patchset: PS10: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34404?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I523d0fcb020f7d46323c497a4be9ee00d5f242ba Gerrit-Change-Number: 34404 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Thu, 30 Nov 2023 02:42:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better
Attention is currently required from: dexter. neels has uploaded a new patch set (#9) to the change originally created by dexter. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better .. mgcp_client_fsm: explain member param in struct mgcp_conn_peer better The struct member param specifies additional codec parameters. Let's improve its explaination. Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Related: OS#6171 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/34350/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: mgcp-client: MGCP response: pass fmtp to caller
Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mgcp-client: MGCP response: pass fmtp to caller .. mgcp-client: MGCP response: pass fmtp to caller When receiving MGCP responses, so far libosmo-mgcp-client completely ignored a=fmtp: parameters (like 'octet-align'). Add fmtp parsing to pass the fmtp string to the caller as-is. Since the responses so far never included the octet_aligned flags, do not bother to parse fmtp to populate the legacy items. New callers should use the fmtp string. Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 57 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/34905/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34905?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: If8ca5c3880cad9e41b80e9d1c821439b0d7b7e23 Gerrit-Change-Number: 34905 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[L] Change in osmo-mgw[master]: add fmtp string to ptmap: allow all possible fmtp
Attention is currently required from: neels.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: add fmtp string to ptmap: allow all possible fmtp
..
add fmtp string to ptmap: allow all possible fmtp
Remove the limit of having only one AMR octet-aligned fmtp parameter per
MGCP message. Instead allow any arbitrary fmtp options, one per every
codec.
Deprecate all use of struct mgcp_codec_param. Instead, store and pass
plain fmtp strings.
We need to know fmtp details only for AMR, and only to probe whether it
is octet-aligned. So add a separate fmtp string parser that returns that
information flexibly, as in
if (osmo_mgcp_fmtp_get_int("octet-aligned", 0) == 1) ...
Provide legacy shims that still act correctly for any callers that may
pass the old struct mgcp_codec_param. (I'm not sure if we need to keep
this, but we can always drop it in another patch.)
Adjust one mgcp_test.c: instead of returning only the octet-aligned
parameter, now osmo-mgw keeps and returns all the fmtp parameters that
the user provided. So add the missing "mode-change-capability".
Related: OS#6171
Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b
---
M include/osmocom/mgcp/Makefile.am
A include/osmocom/mgcp/fmtp.h
M include/osmocom/mgcp/mgcp_codec.h
M include/osmocom/mgcp/mgcp_common.h
M include/osmocom/mgcp/mgcp_network.h
M include/osmocom/mgcp_client/mgcp_client.h
M include/osmocom/mgcp_client/mgcp_client_fsm.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp/Makefile.am
A src/libosmo-mgcp/fmtp.c
M src/libosmo-mgcp/mgcp_codec.c
M src/libosmo-mgcp/mgcp_network.c
M src/libosmo-mgcp/mgcp_protocol.c
M src/libosmo-mgcp/mgcp_sdp.c
M tests/mgcp/mgcp_test.c
15 files changed, 270 insertions(+), 105 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/00/34900/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34900?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: If58590bda8627519ff07e0b6f43aa47a274f052b
Gerrit-Change-Number: 34900
Gerrit-PatchSet: 6
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-CC: dexter
Gerrit-Attention: neels
Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: bsc: tests recovery from BORKEN after release failed
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email )
Change subject: bsc: tests recovery from BORKEN after release failed
..
bsc: tests recovery from BORKEN after release failed
Related: osmo-bsc Ic4728b3efe843ea63e2a0b54b1ea8a925347484a
Related: SYS#6655
Change-Id: I9b4ddfc4a337808d9d5ec538c25fd390b1b2530f
---
M bsc/BSC_Tests.ttcn
1 file changed, 139 insertions(+), 3 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 57b44e0..1fc42ba 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -8529,7 +8529,8 @@
}
friend function f_perform_clear(RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT
rsl_proc_pt := RSL_PROC,
-template PDU_ML3_NW_MS exp_rr_rel_tmpl :=
tr_RRM_RR_RELEASE)
+ template PDU_ML3_NW_MS exp_rr_rel_tmpl :=
tr_RRM_RR_RELEASE,
+ boolean send_rel_ack := true)
runs on MSC_ConnHdlr {
var default ack_dlcx := activate(as_mgcp_ack_all_dlcx());
var default ack_rel_req := activate(as_rsl_ack_all_rel_req());
@@ -8549,8 +8550,10 @@
}
[] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) {
f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack");
- rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
- f_rslem_unregister(0, g_chan_nr, PT := rsl_proc_pt);
+ if (send_rel_ack) {
+ rsl_pt.send(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr));
+ f_rslem_unregister(0, g_chan_nr, PT :=
rsl_proc_pt);
+ }
}
}
deactivate(ack_dlcx);
@@ -12439,6 +12442,125 @@
f_shutdown_helper(ho := true);
}
+private function f_vty_expect_borken(TELNETasp_PT pt, boolean expect_borken)
+{
+ var charstring lchan_summary;
+ lchan_summary := f_vty_transceive_ret(pt, "show lchan summary");
+ var boolean found_borken := (f_strstr(lchan_summary, "State BORKEN") >=
0);
+ if (found_borken != expect_borken) {
+ if (expect_borken) {
+ setverdict(fail, "Expected 'BORKEN' state in ",
lchan_summary);
+ } else {
+ setverdict(fail, "Expected no 'BORKEN' state in ",
lchan_summary);
+ }
+ mtc.stop;
+ }
+}
+
+private function f_tc_unbreak_lchan_after_missing_rel_ack(integer
test_variant) runs on MSC_ConnHdlr {
+
+ /* Establish a channel, so we can mess with the release of it. */
+ var template PDU_BSSAP exp_compl := f_gen_exp_compl();
+ var PDU_BSSAP ass_cmd := f_gen_ass_req();
+
+ ass_cmd.pdu.bssmap.assignmentRequest.channelType :=
valueof(ts_BSSMAP_IE_ChannelType);
+ ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
+
+ f_establish_fully(ass_cmd, exp_compl);
+
+ /* shorten X28, the time after which a BORKEN lchan recovers, from 30s
to something short */
+ f_vty_enter_cfg_network(BSCVTY);
+ f_vty_transceive(BSCVTY, "timer X28 3");
+ f_vty_transceive(BSCVTY, "end");
+
+ /* Allow us to include handling of Channel Activation in this
component, to test recovery from BORKEN */
+ f_rslem_set_auto_chan_act_ack(RSL_PROC, false);
+
+ /* give a moment before releasing */
+ f_sleep(2.0);
+
+ /* Perform a channel release, but omit the RF CHAN REL ACK. The aim is
to get the lchan to go BORKEN. */
+ f_perform_clear(send_rel_ack := false);
+
+ f_vty_expect_borken(BSCVTY, false);
+
+ /* After a timeout of X6, the lchan ends up in LCHAN_ST_BORKEN */
+ f_sleep(6.0);
+
+ f_vty_expect_borken(BSCVTY, true);
+
+ /* Now within two seconds, we expect OsmoBSC to attempt recovering from
the broken state.
+*
+* test_variant == 1:
+* It will first attempt a Channel Activation. If the BTS accepts that,
it means the state is back in sync.
+* Then OsmoBSC releases the lchan again and makes it available for use.
+*
+* test_variant == 2:
+* It will first attempt a Channel Activation and the BTS NACKs that.
+* It will then attempt a release, which we ACK, and the channel will
be available again.
+*/
+
+ /* Receive the Channel Activation */
+ var ASP_RSL_Unitdata rx_rsl_ud;
+ RSL.receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV), sid :=
?)) -> value rx_rsl_ud;
+
+ var RslChannelNr chan_nr;
+ var RSL_IE_Body ie;
+ if (f_rsl_find_ie(rx_rsl_ud.rsl, RSL_IE_CHAN_NR, ie) == true) {
+ chan_nr := ie.chan_nr;
+ } else {
+ setverdict(fail, "Unable
[S] Change in osmo-mgw[master]: client: replace two assertions with graceful error handling
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34997?usp=email ) Change subject: client: replace two assertions with graceful error handling .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34997?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia5d8a9aff565399a85a5b116d7029fedcab234e0 Gerrit-Change-Number: 34997 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 30 Nov 2023 02:31:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: client: replace two assertions with graceful error handling
neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34997?usp=email )
Change subject: client: replace two assertions with graceful error handling
..
client: replace two assertions with graceful error handling
A user reports crashes of osmo-bsc upon EV_MDCX. It turns out that there
is a lot of error reporting and a distinct possibility to get a NULL
return value because of external input. Terminate the FSM instead.
FSM termination is the proper way to report a bad error, it signals the
parent_term_evt to the FSM parent, which will then be able to act on the
failed MGCP operation.
Related: SYS#6632
Change-Id: Ia5d8a9aff565399a85a5b116d7029fedcab234e0
---
M src/libosmo-mgcp-client/mgcp_client_fsm.c
1 file changed, 28 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c
b/src/libosmo-mgcp-client/mgcp_client_fsm.c
index 660f0ad..432ad84 100644
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c
@@ -364,13 +364,21 @@
switch (event) {
case EV_MDCX:
msg = make_mdcx_msg(mgcp_ctx);
- OSMO_ASSERT(msg);
+ if (!msg) {
+ /* make_mdcx_msg() should already have logged the error
*/
+ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+ return;
+ }
rc = mgcp_client_tx(mgcp, msg, mgw_mdcx_resp_cb, fi);
new_state = ST_MDCX_RESP;
break;
case EV_DLCX:
msg = make_dlcx_msg(mgcp_ctx);
- OSMO_ASSERT(msg);
+ if (!msg) {
+ /* make_dlcx_msg() should already have logged the error
*/
+ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL);
+ return;
+ }
rc = mgcp_client_tx(mgcp, msg, mgw_dlcx_resp_cb, fi);
new_state = ST_DLCX_RESP;
break;
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34997?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Ia5d8a9aff565399a85a5b116d7029fedcab234e0
Gerrit-Change-Number: 34997
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-msc[master]: msc_vlr_test_call: drop misleading log
Attention is currently required from: neels. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/35137?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: msc_vlr_test_call: drop misleading log .. msc_vlr_test_call: drop misleading log It was true once, but not since "do CN CRCX first" Ie433db1ba0c46d4b97538a969233c155cefac21c Related: OS#6258 Change-Id: I94e430e4e5b5bf18dbb155258d82f599ada453e6 --- M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_call.err 2 files changed, 31 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/37/35137/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35137?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I94e430e4e5b5bf18dbb155258d82f599ada453e6 Gerrit-Change-Number: 35137 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[M] Change in osmo-msc[master]: implement re-assignment to match codecs
Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email ) Change subject: implement re-assignment to match codecs .. Patch Set 6: Code-Review-1 (1 comment) Patchset: PS6: ah no, still need to verify 3G and IUFP -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8760feaa8598047369ef8c3ab2673013bac8ac8a Gerrit-Change-Number: 35051 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 30 Nov 2023 02:18:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: implement re-assignment to match codecs
Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email ) Change subject: implement re-assignment to match codecs .. Patch Set 6: Code-Review+2 (1 comment) Patchset: PS6: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8760feaa8598047369ef8c3ab2673013bac8ac8a Gerrit-Change-Number: 35051 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 30 Nov 2023 02:17:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: implement re-assignment to match codecs
Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email ) Change subject: implement re-assignment to match codecs .. Patch Set 6: (2 comments) This change is ready for review. File src/libmsc/gsm_04_08_cc.c: https://gerrit.osmocom.org/c/osmo-msc/+/35051/comment/a3383a1b_5f76f052 PS4, Line 276: LOG_TRANS_CAT_SRC(trans, DMNCC, LOGL_ERROR, file, line, "%s %s: invalid SDP message (trying anyway)\n", > why 2 log calls here? one is ERROR the other is DEBUG File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/35051/comment/e67182d0_18e79211 PS4, Line 639: void msc_a_tx_assignment(struct msc_a *msc_a) > msc_a_tx_assignment_cmd Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35051?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8760feaa8598047369ef8c3ab2673013bac8ac8a Gerrit-Change-Number: 35051 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Thu, 30 Nov 2023 02:17:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: call_leg: silence some false errors
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email ) Change subject: call_leg: silence some false errors .. call_leg: silence some false errors "[ESTABLISHED] transition to state ESTABLISHED not permitted" i.e. don't complain when we already are in the established state. Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4 --- M src/libmsc/call_leg.c 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index b797322..5720417 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -158,7 +158,8 @@ } if (!established) break; - call_leg_state_chg(cl, CALL_LEG_ST_ESTABLISHED); + if (cl->fi->state != CALL_LEG_ST_ESTABLISHED) + call_leg_state_chg(cl, CALL_LEG_ST_ESTABLISHED); break; case CALL_LEG_EV_RTP_STREAM_ADDR_AVAILABLE: -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9b1fd63ed1ee7ed2877a4b2059386354598f4ea4 Gerrit-Change-Number: 35100 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: merged
[S] Change in osmo-bsc[master]: systemd,manual: set LimitNOFILE=65536
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/35173?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: systemd,manual: set LimitNOFILE=65536 .. systemd,manual: set LimitNOFILE=65536 A typical OS imposed limit is 1024 open FD, which is too low when there are hundreds of BTS. In systemd service file, set a super high limit of 65536. In osmo-bsc's user manual, add section 'Configure limits' describing this in detail. Related: OS#6256 Change-Id: I26c4058484b11ff1d035a919bf88824c3af14e71 --- M contrib/systemd/osmo-bsc.service M doc/manuals/chapters/running.adoc 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/35173/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35173?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I26c4058484b11ff1d035a919bf88824c3af14e71 Gerrit-Change-Number: 35173 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in osmo-bsc[master]: systemd,manual: set LimitNOFILE=65536
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/35173?usp=email )
Change subject: systemd,manual: set LimitNOFILE=65536
..
systemd,manual: set LimitNOFILE=65536
A typical OS imposed limit is 1024 open FD, which is too low when there
are hundreds of BTS.
In systemd service file, set a super high limit of 65536.
In osmo-bsc's user manual, add section 'Configure limits' describing
this in detail.
Related: OS#6256
Change-Id: I26c4058484b11ff1d035a919bf88824c3af14e71
---
M contrib/systemd/osmo-bsc.service
M doc/manuals/chapters/running.adoc
2 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/35173/1
diff --git a/contrib/systemd/osmo-bsc.service b/contrib/systemd/osmo-bsc.service
index a345c47..c8dc877 100644
--- a/contrib/systemd/osmo-bsc.service
+++ b/contrib/systemd/osmo-bsc.service
@@ -7,6 +7,7 @@
[Service]
Type=simple
Restart=always
+LimitNOFILE=65536
StateDirectory=osmocom
WorkingDirectory=%S/osmocom
ExecStart=/usr/bin/osmo-bsc -c /etc/osmocom/osmo-bsc.cfg -s
diff --git a/doc/manuals/chapters/running.adoc
b/doc/manuals/chapters/running.adoc
index 9ff546c..66d4990 100644
--- a/doc/manuals/chapters/running.adoc
+++ b/doc/manuals/chapters/running.adoc
@@ -69,6 +69,24 @@
has to configure a distinct point-code. See <>.
+=== Configure limits
+
+When connecting many multi-trx BTS to OsmoBSC, it may be necessary to adjust
+the operating system's limit on file descriptors for the osmo-bsc process. A
+typical default limit imposed by operating systems is 1024 open file
+descriptors; this would be exceeded by, for example, about 205 BTS with 4 TRX
+each. (Each BTS with 4 TRX requires 5 file descriptors for Abis; 205 * 5
+already exceeds 1024, other interfaces not even considered yet.)
+
+It should be ok to set an OS limit on open file descriptors as high as 65536
+for osmo-bsc, which practically rules out failure from running out of file
+descriptors in setups with less than 50,000 TRX.
+
+When using systemd, the file descriptor limit may be adjusted in the service
+file by the `LimitNOFILE` setting ("Number of Open FILE descriptors"). OsmoBSC
+ships a systemd service file a high LimitNOFILE setting.
+
+
=== Configure primary links
Connect to an MSC's _A_ interface
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35173?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I26c4058484b11ff1d035a919bf88824c3af14e71
Gerrit-Change-Number: 35173
Gerrit-PatchSet: 1
Gerrit-Owner: neels
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: soft_uart: check Rx/Tx state once in osmo_soft_uart_{rx,tx}_ubits()
Attention is currently required from: fixeria.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmocore/+/35171?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: soft_uart: check Rx/Tx state once in
osmo_soft_uart_{rx,tx}_ubits()
..
soft_uart: check Rx/Tx state once in osmo_soft_uart_{rx,tx}_ubits()
Check it once rather than doing this in a loop. Return -EAGAIN if
Rx or Tx is not enabled when calling osmo_soft_uart_{rx,tx}_ubits().
This [theoretically] improves performance by reducing the number of
conditional statements in loops. In the Tx path, this also prevents
calling the .tx_cb() when the transmitter is disabled, so that we
don't loose the application data.
Change-Id: I70f93b3655eb21c2323e451052c40cd305c016c8
Related: OS#4396
---
M src/core/soft_uart.c
M tests/soft_uart/soft_uart_test.c
2 files changed, 32 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/35171/2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35171?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I70f93b3655eb21c2323e451052c40cd305c016c8
Gerrit-Change-Number: 35171
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: fixeria
Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: soft_uart: add osmo_soft_uart_{get,set}_name()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35169?usp=email )
Change subject: soft_uart: add osmo_soft_uart_{get,set}_name()
..
soft_uart: add osmo_soft_uart_{get,set}_name()
Change-Id: Iabf29f42d876035481011fa8e8a51c0590fe63b8
Related: OS#4396
---
M include/osmocom/core/soft_uart.h
M src/core/libosmocore.map
M src/core/soft_uart.c
3 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/35169/1
diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h
index 097d2ee..7b7c394 100644
--- a/include/osmocom/core/soft_uart.h
+++ b/include/osmocom/core/soft_uart.h
@@ -87,6 +87,10 @@
const struct osmo_soft_uart_cfg
*cfg);
void osmo_soft_uart_free(struct osmo_soft_uart *suart);
int osmo_soft_uart_configure(struct osmo_soft_uart *suart, const struct
osmo_soft_uart_cfg *cfg);
+
+const char *osmo_soft_uart_get_name(const struct osmo_soft_uart *suart);
+void osmo_soft_uart_set_name(struct osmo_soft_uart *suart, const char *name);
+
int osmo_soft_uart_set_rx(struct osmo_soft_uart *suart, bool enable);
int osmo_soft_uart_set_tx(struct osmo_soft_uart *suart, bool enable);
diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map
index 3d6aa42..4ae5108 100644
--- a/src/core/libosmocore.map
+++ b/src/core/libosmocore.map
@@ -444,6 +444,8 @@
osmo_soft_uart_alloc;
osmo_soft_uart_free;
osmo_soft_uart_configure;
+osmo_soft_uart_get_name;
+osmo_soft_uart_set_name;
osmo_soft_uart_set_rx;
osmo_soft_uart_set_tx;
osmo_soft_uart_rx_ubits;
diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c
index 4fffaee..5b4 100644
--- a/src/core/soft_uart.c
+++ b/src/core/soft_uart.c
@@ -396,6 +396,22 @@
return 0;
}
+/*! Get a name for the given soft-UART instance.
+ * \param[in] suart soft-UART instance to get the name from.
+ * \returns name of the given soft-UART instance. */
+const char *osmo_soft_uart_get_name(const struct osmo_soft_uart *suart)
+{
+ return suart->name;
+}
+
+/*! Set a new name for the given soft-UART instance.
+ * \param[in] suart soft-UART instance to set the name for.
+ * \param[in] name the new name. */
+void osmo_soft_uart_set_name(struct osmo_soft_uart *suart, const char *name)
+{
+ osmo_talloc_replace_string(suart, (char **)&suart->name, name);
+}
+
/*! Enable/disable receiver of the given soft-UART.
* \param[in] suart soft-UART instance to be re-configured.
* \param[in] enable enable/disable state of the receiver.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35169?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iabf29f42d876035481011fa8e8a51c0590fe63b8
Gerrit-Change-Number: 35169
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[L] Change in libosmocore[master]: soft_uart: implement modem status lines and flow control
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35172?usp=email )
Change subject: soft_uart: implement modem status lines and flow control
..
soft_uart: implement modem status lines and flow control
Change-Id: I26b93ce76f2f6b6fbf017f2684312007db3c6d48
Related: OS#4396
---
M include/osmocom/core/soft_uart.h
M src/core/libosmocore.map
M src/core/soft_uart.c
M tests/soft_uart/soft_uart_test.c
M tests/soft_uart/soft_uart_test.ok
5 files changed, 341 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/35172/1
diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h
index 7b7c394..a2435a8 100644
--- a/include/osmocom/core/soft_uart.h
+++ b/include/osmocom/core/soft_uart.h
@@ -4,6 +4,7 @@
* Software UART implementation. */
/*
* (C) 2022 by Harald Welte
+ * (C) 2023 by sysmocom - s.f.m.c. GmbH
*
* All Rights Reserved
*
@@ -22,6 +23,8 @@
*/
#include
+#include
+
#include
#include
@@ -40,12 +43,31 @@
OSMO_SUART_F_BREAK = (1 << 2),
};
-#if 0
+/*! Modem status "line" flags.
+ * https://en.wikipedia.org/wiki/RS-232#Data_and_control_signals */
enum osmo_soft_uart_status {
- /* RTS, CTS, ... */
- _fixme,
+ OSMO_SUART_STATUS_F_DTR = (1 << 0), /*!< Data Terminal
Ready */
+ OSMO_SUART_STATUS_F_DCD = (1 << 1), /*!< Data Carrier
Detect */
+ OSMO_SUART_STATUS_F_DSR = (1 << 2), /*!< Data Set Ready */
+ OSMO_SUART_STATUS_F_RI = (1 << 3), /*!< Ring Indicator */
+ OSMO_SUART_STATUS_F_RTS_RTR = (1 << 4), /*!< Request To Send or
Ready To Receive */
+ OSMO_SUART_STATUS_F_CTS = (1 << 5), /*!< Clear To Send */
};
-#endif
+
+/*! Flow control mode.
+ * https://en.wikipedia.org/wiki/Flow_control_(data)#Hardware_flow_control */
+enum osmo_soft_uart_flow_ctrl_mode {
+ /*! No flow control */
+ OSMO_SUART_FLOW_CTRL_M_NONE,
+ /*! DTR/DSR flow control: Tx if DSR is active and drop DTR if cannot Rx
anymore. */
+ OSMO_SUART_FLOW_CTRL_M_DTR_DSR,
+ /*! RTS/CTS flow control: Tx if CTS is active and drop RTS if cannot Rx
anymore.
+* The technically correct name would be RTR/CTS, because the RTS
signal actually
+* indicates readiness to *receive* data (Ready To Receive), and not
really used
+* to request a transmission (Request To Send) nowadays.
Alternatively, the RTS
+* signal can be interpreted as "Request To Send to me". */
+ OSMO_SUART_FLOW_CTRL_M_RTS_CTS,
+};
/* configuration for a soft-uart */
struct osmo_soft_uart_cfg {
@@ -75,8 +97,11 @@
* number of requested bits and the effective UART configuration). */
void (*tx_cb)(void *priv, struct msgb *tx_data);
- /*! modem status line change call-back. gets bitmask of
osmo_soft_uart_status */
+ /*! modem status line change call-back. gets bitmask of
OSMO_SUART_STATUS_F_* */
void (*status_change_cb)(void *priv, unsigned int status);
+
+ /*! "hardware" flow control mode */
+ enum osmo_soft_uart_flow_ctrl_mode flow_ctrl_mode;
};
extern const struct osmo_soft_uart_cfg osmo_soft_uart_default_cfg;
@@ -97,5 +122,10 @@
int osmo_soft_uart_rx_ubits(struct osmo_soft_uart *suart, const ubit_t *ubits,
size_t n_ubits);
int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits,
size_t n_ubits);
+unsigned int osmo_soft_uart_get_status(const struct osmo_soft_uart *suart);
int osmo_soft_uart_set_status(struct osmo_soft_uart *suart, unsigned int
status);
+void osmo_soft_uart_set_status_line(struct osmo_soft_uart *suart,
+ enum osmo_soft_uart_status line,
+ bool active);
+
void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart);
diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map
index 4ae5108..fc81650 100644
--- a/src/core/libosmocore.map
+++ b/src/core/libosmocore.map
@@ -450,7 +450,9 @@
osmo_soft_uart_set_tx;
osmo_soft_uart_rx_ubits;
osmo_soft_uart_tx_ubits;
+osmo_soft_uart_get_status;
osmo_soft_uart_set_status;
+osmo_soft_uart_set_status_line;
osmo_soft_uart_flush_rx;
osmo_stat_item_dec;
osmo_stat_item_flush;
diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c
index 1d9984b..e3e3b0a 100644
--- a/src/core/soft_uart.c
+++ b/src/core/soft_uart.c
@@ -40,6 +40,8 @@
struct osmo_soft_uart {
struct osmo_soft_uart_cfg cfg;
const char *name;
+ /* modem status (bitmask of OSMO_SUART_STATUS_F_*) */
+ unsigned int status;
struct {
bool running;
uint8_t bit_count;
@@ -47,7 +49,6 @@
struct msgb *msg;
ubit_t parity_bit; /* 0 (even) / 1 (odd) */
unsigned int flags;
- unsigned int status;
s
[S] Change in libosmocore[master]: soft_uart: check Rx/Tx state once in osmo_soft_uart_{rx,tx}_ubits()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35171?usp=email )
Change subject: soft_uart: check Rx/Tx state once in
osmo_soft_uart_{rx,tx}_ubits()
..
soft_uart: check Rx/Tx state once in osmo_soft_uart_{rx,tx}_ubits()
Check it once rather than doing this in a loop. Return -EAGAIN if
Rx or Tx is not enabled when calling osmo_soft_uart_{rx,tx}_ubits().
This [theoretically] improves performance by reducing the number of
conditional statements in loops. In the Tx path, this also prevents
calling the .tx_cb() when the transmitter is disabled, so that we
don't loose the application data.
Change-Id: I70f93b3655eb21c2323e451052c40cd305c016c8
Related: OS#4396
---
M src/core/soft_uart.c
M tests/soft_uart/soft_uart_test.c
2 files changed, 31 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/71/35171/1
diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c
index 8d9142b..1d9984b 100644
--- a/src/core/soft_uart.c
+++ b/src/core/soft_uart.c
@@ -111,9 +111,6 @@
/* receive a single bit */
static inline void osmo_uart_rx_bit(struct osmo_soft_uart *suart, const ubit_t
bit)
{
- if (!suart->rx.running)
- return;
-
switch (suart->rx.flow_state) {
case SUART_FLOW_ST_IDLE:
if (bit == 0) { /* start bit condition */
@@ -199,6 +196,8 @@
* \returns 0 on success; negative on error. */
int osmo_soft_uart_rx_ubits(struct osmo_soft_uart *suart, const ubit_t *ubits,
size_t n_ubits)
{
+ if (!suart->rx.running)
+ return -EAGAIN;
for (size_t i = 0; i < n_ubits; i++)
osmo_uart_rx_bit(suart, ubits[i]);
return 0;
@@ -213,9 +212,6 @@
{
ubit_t tx_bit = 1;
- if (!suart->tx.running)
- return tx_bit;
-
switch (suart->tx.flow_state) {
case SUART_FLOW_ST_IDLE:
if (msg && msgb_length(msg) > 0) { /* if we have pending data */
@@ -290,6 +286,9 @@
if (OSMO_UNLIKELY(n_ubits == 0))
return -EINVAL;
+ if (!suart->tx.running)
+ return -EAGAIN;
+
/* calculate UART frame size for the effective config */
n_frame_bits = 1 + cfg->num_data_bits + cfg->num_stop_bits;
if (cfg->parity_mode != OSMO_SUART_PARITY_NONE)
diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c
index 522739a..f1b0b25 100644
--- a/tests/soft_uart/soft_uart_test.c
+++ b/tests/soft_uart/soft_uart_test.c
@@ -256,10 +256,18 @@
{
struct osmo_soft_uart_cfg cfg;
struct osmo_soft_uart *suart;
+ int rc;
suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg);
OSMO_ASSERT(suart != NULL);
+ /* expect -EAGAIN when the transmitter is not enabled */
+ rc = osmo_soft_uart_tx_ubits(suart, NULL, 42);
+ OSMO_ASSERT(rc == -EAGAIN);
+ /* expect -EAGAIN when the receicer is not enabled */
+ rc = osmo_soft_uart_rx_ubits(suart, NULL, 42);
+ OSMO_ASSERT(rc == -EAGAIN);
+
osmo_soft_uart_set_tx(suart, true);
osmo_soft_uart_set_rx(suart, true);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35171?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I70f93b3655eb21c2323e451052c40cd305c016c8
Gerrit-Change-Number: 35171
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35170?usp=email )
Change subject: soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits()
..
soft_uart: fix doxygen doc for osmo_soft_uart_tx_ubits()
Change-Id: I648db45bbde39c6b3d839c744a56d01a562e4129
Related: OS#4396
---
M src/core/soft_uart.c
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/70/35170/1
diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c
index 5b4..8d9142b 100644
--- a/src/core/soft_uart.c
+++ b/src/core/soft_uart.c
@@ -280,7 +280,7 @@
* \param[in] suart soft-UART instance to pull the bits from.
* \param[out] ubits pointer to a buffer where to store pulled bits.
* \param[in] n_ubits number of unpacked bits to be pulled.
- * \returns number of unpacked bits pulled; negative on error. */
+ * \returns 0 on success; negative on error. */
int osmo_soft_uart_tx_ubits(struct osmo_soft_uart *suart, ubit_t *ubits,
size_t n_ubits)
{
const struct osmo_soft_uart_cfg *cfg = &suart->cfg;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35170?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I648db45bbde39c6b3d839c744a56d01a562e4129
Gerrit-Change-Number: 35170
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
daniel has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: abandon
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: fixeria, jolly, laforge. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: > Running `make -C utils/ V=s` locally: […] I just tested it again and it links fine now. Not sure what happened before, I'm sure I saw it even after make distclean... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 22:05:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: daniel, jolly, laforge. fixeria has removed fixeria from this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Removed reviewer fixeria . -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-MessageType: deleteReviewer
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: daniel, fixeria, jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Patch Set 1: (1 comment) Patchset: PS1: > Those symbols are needed for libosmogsm. In `src/gsm/Makefile.am` we list > `libosmoisdn. […] Running `make -C utils/ V=s` locally: ``` depbase=`echo osmo-arfcn.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -DBUILDING_LIBOSMOCORE -Wall -Wall -pthread -std=gnu11 -DBUILDING_LIBOSMOCORE -Wall -MT osmo-arfcn.o -MD -MP -MF $depbase.Tpo -c -o osmo-arfcn.o osmo-arfcn.c &&\ mv -f $depbase.Tpo $depbase.Po /bin/sh ../libtool --tag=CC --mode=link gcc -Wall -pthread -std=gnu11 -DBUILDING_LIBOSMOCORE -Wall -o osmo-arfcn osmo-arfcn.o ../src/core/libosmocore.la ../src/gsm/libosmogsm.la libtool: link: gcc -Wall -std=gnu11 -DBUILDING_LIBOSMOCORE -Wall -o .libs/osmo-arfcn osmo-arfcn.o ../src/core/.libs/libosmocore.so ../src/gsm/.libs/libosmogsm.so /home/fixeria/projects/osmocom/libosmocore/src/isdn/.libs/libosmoisdn.so /home/fixeria/projects/osmocom/libosmocore/src/core/.libs/libosmocore.so -lsctp -luring -lmnl -ltalloc -lgnutls -pthread -Wl,-rpath -Wl,/usr/local/lib ``` In my case `libosmoisdn.la` is listed, as expected. I can even remove `libosmocore.la` from the `LDADD` and the build would still succeed, since it's also an implicit dependency of `libosmogsm.la`. ``` fixeria@LEGION:~$ libtool --version libtool (GNU libtool) 2.4.7.4-1ec8f-dirty fixeria@LEGION:~$ /bin/ld -v GNU ld (GNU Binutils) 2.41.0 fixeria@LEGION:~$ gcc -v gcc version 13.2.1 20230801 (GCC) ``` -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 21:12:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: daniel, fixeria, jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35163/comment/ec36a68b_72005910 PS1, Line 10: osmo-arfcn Weird. osmo-arfcn is not calling any of these functions. It should not depend on LAPDm at all, it's just a very simple "calculator". Perhaps it's the `-no-undefined` in `libosmogsm_la_LDFLAGS` somehow triggering the linker? I am unable to reproduce this when building libosmocore locally. Patchset: PS1: > I think this is wrong. […] Those symbols are needed for libosmogsm. In `src/gsm/Makefile.am` we list `libosmoisdn.la` as a dependency of `libgsmint.la`, which in turn is a dependency of `libosmogsm.la`. I would expect `libosmoisdn.la` to be an explicit dependency of `libosmogsm.la`, just like the `libosmocore.la`. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 20:55:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?usp=email ) Change subject: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?usp=email 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: Ibfc37118ed3a67e4ca3f417273bedba127be7639 Gerrit-Change-Number: 35167 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 20:45:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email ) Change subject: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email 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: Ia724e0363a8bab56f5d31e7f7f7a127af584f935 Gerrit-Change-Number: 35166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 20:45:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename record CrcxResponse->MgwResponse
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?usp=email ) Change subject: hnbgw: Rename record CrcxResponse->MgwResponse .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?usp=email 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: I1ffcb1100b0f92f7175ff08f9d4df49c0cf596b5 Gerrit-Change-Number: 35165 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 20:44:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename mgcp conns to reflect each side peer
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?usp=email ) Change subject: hnbgw: Rename mgcp conns to reflect each side peer .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?usp=email 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: Ie68d0397a56d48223fb4b1ffe1710f988518257f Gerrit-Change-Number: 35164 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 20:44:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: mgw_fsm: Modify RAB on HNB if IuUP local IP addr at MGW changes durin...
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35168?usp=email ) Change subject: mgw_fsm: Modify RAB on HNB if IuUP local IP addr at MGW changes during MDCX .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35168?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I936a50fed38a201c4a8da99b40f07082049e5157 Gerrit-Change-Number: 35168 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 20:43:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: daniel, fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: I think this is wrong. Either libosmogsm depends on libosmoisdn, and then the dependency should be handled at the library level. the user program shouldn't have to know downstream dependencies of the library they link to. Or the application itself depends on libosmoisdn, at which point it is correct to directly link to it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 20:42:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly, laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email ) Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload .. Patch Set 6: (1 comment) File src/common/rsl.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12721): https://gerrit.osmocom.org/c/osmo-bts/+/35082/comment/f624a0bf_62a63d35 PS6, Line 3841: /* Reject inital establishment without L3 info. */ 'inital' may be misspelled - perhaps 'initial'? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 18:45:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Code-Review+2 by fixeria, Code-Review-1 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: Use polling based LAPDm with frame numbers .. Use polling based LAPDm with frame numbers Osmo-bts uses the new polling based LAPDm implementation. The OML message NM_ATT_T200 is ignored, because T200 timeouts are set to the minimal response time. Longer timeouts would cause lower throughput in case of lost frames. Shorter timeouts would cause LAPDm to fail. Related: OS#4074 Depends: libosmocore.git I6ebe83f829d7751ea9de1d90eb478c7a628db64c Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd --- M include/osmo-bts/bts.h M include/osmo-bts/oml.h M src/common/bts.c M src/common/l1sap.c M src/common/lchan.c M src/common/oml.c 6 files changed, 108 insertions(+), 73 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/35007/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload .. LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload If the channel is activated for immediate assignment, the initial data link establishment on main signaling link with SAPI 0 must have L3 infomation included in the SABM message. If this is not the case, release the data link without notifying BSC. Related: OS#5971 Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c --- M include/osmo-bts/lchan.h M src/common/rsl.c 2 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein, daniel, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email ) Change subject: osmo_io: Remove union in struct osmo_io_ops .. Patch Set 4: (1 comment) Patchset: PS4: I'd actually keep the union, imho there's nothing wrong with it if used, plus: - Doesn't break ABI with previous libosmocore release - It saves some bytes on each osmo_io (there can be a big number of them in an app). I agree though that the comment you mentioned should be fixed by checking the correct io_mode is in used before checking the pointer, since it's shared with other io_modes through the union. TL;DR: Fix the code bugs, leave the union. If still others prefer merging this, I won't oppose, just saying. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 29 Nov 2023 18:31:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: daniel, laforge, lynxis lazus.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email )
Change subject: osmo_io: Factor out and use common send function from backend
..
Patch Set 2:
(3 comments)
File src/core/osmo_io.c:
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/65b7ef21_6f5bf225
PS1, Line 348: if (rc > 0 && rc < msgb_length(msg)) {
> Regarding your comment about rc == 0, maybe one missing failure case is rc ==
> 0 && rc < msgb_length […]
That should fall into the more generic "rc < msgb_length(msg)" condition, I
don't think the specific case you mention should be handled differently.
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/442aee50_3a53f950
PS1, Line 360:
> IMO rc == 0 in send means we have successfully "written" 0 bytes to the
> socket (which also means the […]
ack, makes sense, the special case for rc=0 is in the recv path (socket
closed). I doubt we'll ever see rc=0 here, I'd expect it to return -EAGAIN
instead.
send(len=0) would probably return an error, or maybe it returns 0 instead to
mention it is writable.
File src/core/osmo_io_uring.c:
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/be9f52f1_8e2dfc28
PS2, Line 196: iofd_handle_send_completion(iofd, rc, msghdr);
The goto can easily be dropped:
if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) {
msgb_free(msghdr->msg);
iofd_msghdr_free(msghdr);
} else {
iofd_handle_send_completion(iofd, rc, msghdr);
}
iofd->u.uring.write_msghdr = NULL;
/* submit the next to-be-transmitted message for this file descriptor */
if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
iofd_uring_submit_tx(iofd);
You can btw probably ass OSMO_UNLIKELY() to the if condition checking
IOFD_FLAG_CLOSED.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59
Gerrit-Change-Number: 35078
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Attention: laforge
Gerrit-Attention: daniel
Gerrit-Attention: lynxis lazus
Gerrit-Comment-Date: Wed, 29 Nov 2023 18:26:15 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: daniel
Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: mgw_fsm: Modify RAB on HNB if IuUP local IP addr at MGW changes durin...
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/35168?usp=email )
Change subject: mgw_fsm: Modify RAB on HNB if IuUP local IP addr at MGW changes
during MDCX
..
mgw_fsm: Modify RAB on HNB if IuUP local IP addr at MGW changes during MDCX
Allow IP address renegotation between HNB and MGW:
* Upon MGCP MDCX ACK received from the RAN-side conn, if the IP address/port
changes, then restart the RAB-Ass-Req+Resp procedure on Iuh.
* Upon RAB-Ass-Resp received from the HNB, if the IP address/port changes,
then go through another MDCX + MDCX ACK prcoedure on MGCP.
An MDCX counter is introduced to avoid infinite loops where the HNB and
the MGW keep changing their IP address triggered by the change on the
other side, eg. due to incorrect network/routing setup.
The counter is also used to track count in order to make sure that
always at least 1 MDCX is transmitted, in order to change conn_mode to
SEND_RECV.
Related: OS#6127
Change-Id: I936a50fed38a201c4a8da99b40f07082049e5157
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 110 insertions(+), 61 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/68/35168/1
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index e1e53fb..1e04f58 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -109,6 +109,11 @@
ranap_message *ranap_rab_ass_req_message;
ranap_message *ranap_rab_ass_resp_message;
struct msgb *ranap_rab_ass_resp_msgb;
+ /* IP address contained in ranap_rab_ass_resp_msgb/message: */
+ struct osmo_sockaddr hnb_rtp_addr;
+ /* Number of MDCX transmitted. Used to detect current mgw conn_mode and
+* detect modify infinite loops: */
+ unsigned int mdcx_tx_cnt;
/* MGW context */
struct mgcp_client *mgcpc;
@@ -205,8 +210,6 @@
struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
const struct mgcp_conn_peer *mgw_info;
struct osmo_sockaddr_str addr_str;
- struct osmo_sockaddr *addr = &mgw_fsm_priv->ci_hnb_crcx_ack_addr;
- RANAP_RAB_AssignmentRequestIEs_t *ies;
int rc;
switch (event) {
@@ -224,7 +227,7 @@
addr_str.af = AF_INET6;
addr_str.port = mgw_info->port;
osmo_strlcpy(addr_str.ip, mgw_info->addr, sizeof(addr_str.ip));
- rc = osmo_sockaddr_str_to_sockaddr(&addr_str, &addr->u.sas);
+ rc = osmo_sockaddr_str_to_sockaddr(&addr_str,
&mgw_fsm_priv->ci_hnb_crcx_ack_addr.u.sas);
if (rc < 0) {
LOGPFSML(fi, LOGL_ERROR,
"Failed to convert RTP IP-address (%s) and
Port (%u) to its binary representation\n",
@@ -233,16 +236,6 @@
return;
}
- ies =
&mgw_fsm_priv->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs;
- rc = ranap_rab_ass_req_ies_replace_inet_addr(ies, addr,
mgw_fsm_priv->rab_id);
- if (rc < 0) {
- LOGPFSML(fi, LOGL_ERROR,
-"Failed to replace RTP IP-address (%s) and
Port (%u) in RAB-AssignmentRequest\n",
-mgw_info->addr, mgw_info->port);
- osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
- return;
- }
-
mgw_fsm_state_chg(fi, MGW_ST_ASSIGN);
return;
default:
@@ -256,8 +249,16 @@
struct hnbgw_context_map *map = mgw_fsm_priv->map;
RANAP_RAB_AssignmentRequestIEs_t *ies;
struct msgb *msg;
+ int rc;
ies =
&mgw_fsm_priv->ranap_rab_ass_req_message->msg.raB_AssignmentRequestIEs;
+ rc = ranap_rab_ass_req_ies_replace_inet_addr(ies,
&mgw_fsm_priv->ci_hnb_crcx_ack_addr, mgw_fsm_priv->rab_id);
+ if (rc < 0) {
+ LOGPFSML(fi, LOGL_ERROR, "Failed to replace RTP IP-address and
Port in RAB-AssignmentRequest\n");
+ osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
+ return;
+ }
+
msg = ranap_rab_ass_req_encode(ies);
if (!msg) {
LOGPFSML(fi, LOGL_ERROR, "failed to re-encode
RAB-AssignmentRequest message\n");
@@ -273,9 +274,72 @@
static void mgw_fsm_assign(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
{
+ struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
+ struct hnbgw_context_map *map = mgw_fsm_priv->map;
+ RANAP_RAB_AssignmentResponseIEs_t *ies;
+ bool rab_failed_at_hnb;
+ struct osmo_sockaddr addr;
+ enum mgw_fsm_state next_st;
+ int rc;
+
switch (event) {
case MGW_EV_RAB_ASS_RESP:
- mgw_fsm_state_chg(fi, MGW_ST_MDCX_HNB);
+ LOGPFSML(fi, LOGL_DEBUG, "RAB-AssignmentResponse received,
completing HNB side call-leg on MGW...\n");
+ ies =
&
[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35167?usp=email )
Change subject: hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg
..
hnbgw: Introduce test TC_rab_assign_mgw_iuup_addr_chg
Change-Id: Ibfc37118ed3a67e4ca3f417273bedba127be7639
Related: SYS#6657
Related: OS#6127
---
M hnbgw/HNBGW_Tests.ttcn
M hnbgw/expected-results.xml
2 files changed, 50 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/67/35167/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index d4073d1..15fc85f 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -606,7 +606,6 @@
/* We cannot use vc_conn.start(f_init_handler(fn, id, pars)); as we
cannot have
* a stand-alone 'derefers()' call, see
https://www.eclipse.org/forums/index.php/t/1091364/ */
pars.hnb := g_hnb_cfg[pars.hnb_idx];
- pars.mgcp_pars := valueof(t_MgcpParams);
vc_conn.start(derefers(fn)(id, pars));
}
@@ -993,6 +992,7 @@
cn_idx := f_cn_idx(ps_domain, cn_nr),
imsi := f_gen_imsi(imsi_suffix),
ps_domain := ps_domain,
+ mgcp_pars := t_MgcpParams,
hnb := omit,/* filled in later */
expect_separate_sccp_cr := expect_separate_sccp_cr,
tx_sccp_cr_data_len := tx_sccp_cr_data_len,
@@ -1276,9 +1276,13 @@
/* Expect MDCX with IP/port from RAB Assignment Response */
[] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) ->
value mgcp_cmd {
var HostName mgw_rtp_ip;
+ var boolean exp_rua_rab_reass := false;
log("MDCX1", mgcp_cmd);
if (ispresent(pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) {
mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip_mdcx;
+ if (pars.mgw_conn_ran.mgw_rtp_ip !=
pars.mgw_conn_ran.mgw_rtp_ip_mdcx) {
+ exp_rua_rab_reass := true;
+ }
} else {
mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip;
}
@@ -1288,6 +1292,21 @@
{ int2str(pars.rtp_payload_type) }, {
valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)),
valueof(ts_SDP_ptime(20)) } ));
var template MgcpResponse mgcp_rsp :=
ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp);
MGCP.send(valueof(mgcp_rsp));
+
+ /* If IP address changed, we expect HNBGW to Modify the RAB
through RAB-Ass-Req: */
+ if (exp_rua_rab_reass) {
+ var template RAB_SetupOrModifyList rab_sml;
+ /* Expect RAB Assignment Request with IP/port from MDCX
ACK via Iuh */
+ rab_sml := ts_RAB_SML(t_RAB_id(23),
f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip_mdcx),
t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port));
+ tx := valueof(ts_RANAP_RabAssReq(rab_sml));
+
+ f_rua_expect(tx);
+ /* Send back RAB Assignment Response via Iuh */
+ rab_smdl := ts_RAB_SMdL(t_RAB_id(23),
f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port));
+ tx := valueof(ts_RANAP_RabAssResp(rab_smdl));
+ RUA.send(tx);
+ /* This shouldn't trigger any MGCP, since nothing
changed on the HNB IP side. Continue below. */
+ }
}
/* Handle CRCX for second leg of endpoint, answer with IP/port */
[] MGCP.receive(tr_CRCX(pars.mgcp_ep, tr_SDP(pars.cn_rtp_ip,
pars.cn_rtp_port))) -> value mgcp_cmd {
@@ -1487,6 +1506,23 @@
f_shutdown_helper();
}
+/* Test case where IuUP IP address announced by HNB and updated through MDCX
+ * makes MGW select a new local IuUP address. HNBGW is expected to update the
HNB
+ * through RAB-Modify-Req. */
+testcase TC_rab_assign_mgw_iuup_addr_chg() runs on test_CT {
+ var ConnHdlr vc_conn;
+ g_num_hnbs := 1;
+ f_init();
+ var template (value) TestHdlrParams pars := t_pars(3);
+ /* Emulate change of local IuUP IP address after rx MDCX: */
+ pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx := "127.3.2.1";
+
+ vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assignment), pars);
+ vc_conn.done;
+
+ f_shutdown_helper();
+}
+
/* Create an Iuh connection; send InitialUE; transceive data both directions */
friend function f_tc_ranap_bidir(charstring id, TestHdlrParams pars) runs on
ConnHdlr {
f_init_handler(pars);
@@ -2688,6 +2724,7 @@
execute(TC_rab_release());
execute(TC_rab_assign_fail());
execute(TC_rab_assign_mgcp_to());
+ execute(TC_rab_assign_mgw_iuup_addr_chg());
execute(TC_ranap_cs_mo_disconnect());
execute(TC_ranap_ps_mo_di
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename record CrcxResponse->MgwResponse
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?usp=email )
Change subject: hnbgw: Rename record CrcxResponse->MgwResponse
..
hnbgw: Rename record CrcxResponse->MgwResponse
The previous name is misleading, since they are also used during MDCX.
Change-Id: I1ffcb1100b0f92f7175ff08f9d4df49c0cf596b5
---
M hnbgw/HNBGW_Tests.ttcn
1 file changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/65/35165/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 67411ff..7f2d6c0 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -219,7 +219,7 @@
sccp_addr_peer := omit
}
-type record CrcxResponse {
+type record MgwResponse {
integer resp,
HostName mgw_rtp_ip,
PortNumber mgw_rtp_port,
@@ -230,8 +230,8 @@
integer got_dlcx_count,
MgcpCallId mgcp_call_id optional,
MgcpEndpoint mgcp_ep,
- CrcxResponse mgw_conn_ran,
- CrcxResponse mgw_conn_cn,
+ MgwResponse mgw_conn_ran,
+ MgwResponse mgw_conn_cn,
uint7_t rtp_payload_type,
charstring rtp_sdp_format,
HostName hnb_rtp_ip,
@@ -1131,7 +1131,7 @@
* Return true when an OK reply was sent, false otherwise.
* Count occurrence of Osmux, include Osmux parameters in the reply if
necessary. */
function f_handle_crcx(inout MgcpParameters pars, MgcpCommand mgcp_cmd) return
template MgcpResponse {
- var CrcxResponse conn := pars.mgw_conn_ran;
+ var MgwResponse conn := pars.mgw_conn_ran;
if (pars.got_crcx_count > 0) {
conn := pars.mgw_conn_cn;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35165?usp=email
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: I1ffcb1100b0f92f7175ff08f9d4df49c0cf596b5
Gerrit-Change-Number: 35165
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow announcing a different mgw-local IuUP address after MDCX
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email )
Change subject: hnbgw: Allow announcing a different mgw-local IuUP address
after MDCX
..
hnbgw: Allow announcing a different mgw-local IuUP address after MDCX
This will allow emulating an MGW deciding to change its local IuUP IP
address due to received remote address in MGCP MDCX, and announce the
changed address back in MGCP MDCX. A test validating this scenario
against osmo-hnbgw will be added in a follow-up patch.
Related: SYS#6657
Change-Id: Ia724e0363a8bab56f5d31e7f7f7a127af584f935
---
M hnbgw/HNBGW_Tests.ttcn
1 file changed, 27 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/66/35166/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 7f2d6c0..d4073d1 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -222,6 +222,8 @@
type record MgwResponse {
integer resp,
HostName mgw_rtp_ip,
+ /* if set, used after first received MDCX: */
+ HostName mgw_rtp_ip_mdcx optional,
PortNumber mgw_rtp_port,
MgcpConnectionId mgcp_connection_id
}
@@ -250,12 +252,14 @@
mgw_conn_ran := {
resp := 1,
mgw_rtp_ip := "127.1.2.1",
+ mgw_rtp_ip_mdcx := omit,
mgw_rtp_port := 1,
mgcp_connection_id := '1'H
},
mgw_conn_cn := {
resp := 1,
mgw_rtp_ip := "127.1.2.2",
+ mgw_rtp_ip_mdcx := omit,
mgw_rtp_port := 2,
mgcp_connection_id := '2'H
},
@@ -1271,9 +1275,16 @@
interleave {
/* Expect MDCX with IP/port from RAB Assignment Response */
[] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) ->
value mgcp_cmd {
+ var HostName mgw_rtp_ip;
log("MDCX1", mgcp_cmd);
+ if (ispresent(pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) {
+ mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip_mdcx;
+ } else {
+ mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip;
+ }
+
/* Verify SDP of MDCX */
- var SDP_Message sdp :=
valueof(ts_SDP(pars.mgw_conn_ran.mgw_rtp_ip, pars.mgw_conn_ran.mgw_rtp_ip,
hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port,
+ var SDP_Message sdp := valueof(ts_SDP(mgw_rtp_ip, mgw_rtp_ip,
hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port,
{ int2str(pars.rtp_payload_type) }, {
valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)),
valueof(ts_SDP_ptime(20)) } ));
var template MgcpResponse mgcp_rsp :=
ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp);
MGCP.send(valueof(mgcp_rsp));
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35166?usp=email
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: Ia724e0363a8bab56f5d31e7f7f7a127af584f935
Gerrit-Change-Number: 35166
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename mgcp conns to reflect each side peer
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?usp=email )
Change subject: hnbgw: Rename mgcp conns to reflect each side peer
..
hnbgw: Rename mgcp conns to reflect each side peer
Change-Id: Ie68d0397a56d48223fb4b1ffe1710f988518257f
---
M hnbgw/HNBGW_Tests.ttcn
1 file changed, 19 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/64/35164/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 5bcd40c..67411ff 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -230,8 +230,8 @@
integer got_dlcx_count,
MgcpCallId mgcp_call_id optional,
MgcpEndpoint mgcp_ep,
- CrcxResponse mgw_conn_1,
- CrcxResponse mgw_conn_2,
+ CrcxResponse mgw_conn_ran,
+ CrcxResponse mgw_conn_cn,
uint7_t rtp_payload_type,
charstring rtp_sdp_format,
HostName hnb_rtp_ip,
@@ -247,13 +247,13 @@
got_dlcx_count := 0,
mgcp_call_id := omit,
mgcp_ep := "rtpbridge/1@mgw",
- mgw_conn_1 := {
+ mgw_conn_ran := {
resp := 1,
mgw_rtp_ip := "127.1.2.1",
mgw_rtp_port := 1,
mgcp_connection_id := '1'H
},
- mgw_conn_2 := {
+ mgw_conn_cn := {
resp := 1,
mgw_rtp_ip := "127.1.2.2",
mgw_rtp_port := 2,
@@ -1131,9 +1131,9 @@
* Return true when an OK reply was sent, false otherwise.
* Count occurrence of Osmux, include Osmux parameters in the reply if
necessary. */
function f_handle_crcx(inout MgcpParameters pars, MgcpCommand mgcp_cmd) return
template MgcpResponse {
- var CrcxResponse conn := pars.mgw_conn_1;
+ var CrcxResponse conn := pars.mgw_conn_ran;
if (pars.got_crcx_count > 0) {
- conn := pars.mgw_conn_2;
+ conn := pars.mgw_conn_cn;
}
pars.got_crcx_count := pars.got_crcx_count + 1;
@@ -1252,7 +1252,7 @@
T.stop;
/* Expect RAB Assignment Request with IP/port from CRCX ACK via Iuh */
- rab_sml := ts_RAB_SML(t_RAB_id(23),
f_ts_RAB_TLA(pars.mgw_conn_1.mgw_rtp_ip),
t_RAB_binding_port(pars.mgw_conn_1.mgw_rtp_port));
+ rab_sml := ts_RAB_SML(t_RAB_id(23),
f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip),
t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port));
tx := valueof(ts_RANAP_RabAssReq(rab_sml));
f_rua_expect(tx);
@@ -1273,9 +1273,9 @@
[] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) ->
value mgcp_cmd {
log("MDCX1", mgcp_cmd);
/* Verify SDP of MDCX */
- var SDP_Message sdp :=
valueof(ts_SDP(pars.mgw_conn_1.mgw_rtp_ip, pars.mgw_conn_1.mgw_rtp_ip,
hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_1.mgw_rtp_port,
+ var SDP_Message sdp :=
valueof(ts_SDP(pars.mgw_conn_ran.mgw_rtp_ip, pars.mgw_conn_ran.mgw_rtp_ip,
hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port,
{ int2str(pars.rtp_payload_type) }, {
valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)),
valueof(ts_SDP_ptime(20)) } ));
- var template MgcpResponse mgcp_rsp :=
ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_1.mgcp_connection_id, sdp);
+ var template MgcpResponse mgcp_rsp :=
ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp);
MGCP.send(valueof(mgcp_rsp));
}
/* Handle CRCX for second leg of endpoint, answer with IP/port */
@@ -1288,7 +1288,7 @@
}
/* Expect RAB Assignment Response with IP/port from second CRCX ACK */
- rab_smdl := ts_RAB_SMdL(t_RAB_id(23),
f_ts_RAB_TLA(pars.mgw_conn_2.mgw_rtp_ip),
t_RAB_binding_port(pars.mgw_conn_2.mgw_rtp_port));
+ rab_smdl := ts_RAB_SMdL(t_RAB_id(23),
f_ts_RAB_TLA(pars.mgw_conn_cn.mgw_rtp_ip),
t_RAB_binding_port(pars.mgw_conn_cn.mgw_rtp_port));
tx := valueof(ts_RANAP_RabAssResp(rab_smdl));
f_bssap_expect(tx);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35164?usp=email
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: Ie68d0397a56d48223fb4b1ffe1710f988518257f
Gerrit-Change-Number: 35164
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein. Hello Jenkins Builder, arehbein, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email to look at the new patch set (#4). Change subject: osmo_io: Remove union in struct osmo_io_ops .. osmo_io: Remove union in struct osmo_io_ops This allows us to check that the correct callbacks are set. The checks are already in e.g. osmo_iofd_write_msgb(), but the union prevented us from distinguishing between write_cb() and sendto_cb() etc. Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Related: #OS6263 --- M TODO-RELEASE M include/osmocom/core/osmo_io.h M src/core/osmo_io.c 3 files changed, 49 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/35079/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 4 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: arehbein Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email ) Change subject: osmo_io: Remove union in struct osmo_io_ops .. Patch Set 3: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/35079/comment/b7664ff5_c2daa8a4 PS3, Line 546: if (iofd->io_ops.read_cb) The fact that this happened to work is even more reason to remove the union. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: arehbein Gerrit-Comment-Date: Wed, 29 Nov 2023 17:59:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein, daniel. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email ) Change subject: osmo_io: Remove union in struct osmo_io_ops .. Patch Set 3: (1 comment) File src/core/osmo_io.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12714): https://gerrit.osmocom.org/c/libosmocore/+/35079/comment/ebf6c5e6_a0b1fc97 PS3, Line 388: static bool iofd_read_callback_set(struct osmo_io_fd* iofd) "foo* bar" should be "foo *bar" -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 29 Nov 2023 17:59:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein, daniel. Hello Jenkins Builder, arehbein, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: Remove union in struct osmo_io_ops .. osmo_io: Remove union in struct osmo_io_ops This allows us to check that the correct callbacks are set. The checks are already in e.g. osmo_iofd_write_msgb(), but the union prevented us from distinguishing between write_cb() and sendto_cb() etc. Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Related: #OS6263 --- M TODO-RELEASE M include/osmocom/core/osmo_io.h M src/core/osmo_io.c 3 files changed, 49 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/79/35079/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: arehbein Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
Attention is currently required from: daniel, fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 17:31:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email )
Change subject: libgtp: Remove defines for reserved causes in gtp.h
..
libgtp: Remove defines for reserved causes in gtp.h
As discussed in Gerrit change I9c3bf64537ef2223e29f8082861fa32fde26bf68
remove defines that don't serve any purpose. These are defines for
reserved values and changing them later if a newer spec defined them
would break API.
Keep the comments to explain the missing values.
Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf
---
M TODO-RELEASE
M gtp/gtp.h
2 files changed, 26 insertions(+), 9 deletions(-)
Approvals:
daniel: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..d8cc3af 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+libgtp REMOVE remove GTP cause defines of reserved values
diff --git a/gtp/gtp.h b/gtp/gtp.h
index c066fa6..7465cf1 100644
--- a/gtp/gtp.h
+++ b/gtp/gtp.h
@@ -53,7 +53,7 @@
#define GTP_UPDATE_PDP_RSP 19/* Update PDP Context Response */
#define GTP_DELETE_PDP_REQ 20/* Delete PDP Context Request */
#define GTP_DELETE_PDP_RSP 21/* Delete PDP Context Response */
- /* 22-25 For future use.
*//* In version GTP 1 anonomous PDP context */
+/* 22-25 For future use. *//* In version GTP 1 anonomous PDP context */
#define GTP_ERROR26/* Error Indication */
#define GTP_PDU_NOT_REQ 27/* PDU Notification Request */
#define GTP_PDU_NOT_RSP 28/* PDU Notification Response */
@@ -99,21 +99,21 @@
#define GTPCAUSE_NO_ID_NEEDED 3 /* No identity needed */
#define GTPCAUSE_MS_REFUSES_X 4 /* MS refuses */
#define GTPCAUSE_MS_NOT_RESP_X 5 /* MS is not GPRS responding */
-#define GTPCAUSE_0066 /* For future use 6-48 */
-#define GTPCAUSE_049 49 /* Cause values reserved for
GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */
-#define GTPCAUSE_064 64 /* For future use 64-127 */
+/* 6-48 For future use */
+/* 49-63 Cause values reserved for GPRS charging protocol use (See GTP' in GSM
12.15) */
+/* 64-127 For future use */
#define GTPCAUSE_ACC_REQ 128 /* Request accepted */
#define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network
preference */
#define GTPCAUSE_NEW_PDP_ADDR_BEAR130 /* New PDP type due to single
address bearer only */
-#define GTPCAUSE_131 131 /* For future use 131-176 */
-#define GTPCAUSE_177 177 /* Cause values reserved for
GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */
+/* 131-176 For future use */
+/* 177-191 Cause values reserved for GPRS charging protocol use (See GTP' In
GSM 12.15) */
#define GTPCAUSE_NON_EXIST192 /* Non-existent */
#define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */
#define GTPCAUSE_IMSI_NOT_KNOWN 194 /* IMSI not known */
#define GTPCAUSE_MS_DETACHED 195 /* MS is GPRS detached */
#define GTPCAUSE_MS_NOT_RESP 196 /* MS is not GPRS responding */
#define GTPCAUSE_MS_REFUSES 197 /* MS refuses */
-#define GTPCAUSE_198 198 /* For future use */
+/* 198 For future use */
#define GTPCAUSE_NO_RESOURCES 199 /* No resources available */
#define GTPCAUSE_NOT_SUPPORTED200 /* Service not supported */
#define GTPCAUSE_MAN_IE_INCORRECT 201 /* Mandatory IE incorrect */
@@ -136,8 +136,8 @@
#define GTPCAUSE_SYN_ERR_FILTER 218 /* Syntactic errors in packet
filter(s) */
#define GTPCAUSE_MISSING_APN 219 /* Missing or unknown APN */
#define GTPCAUSE_UNKNOWN_PDP 220 /* Unknown PDP address or PDP
type */
-#define GTPCAUSE_221 221 /* For Future Use 221-240 */
-#define GTPCAUSE_241 241 /* Cause Values Reserved For
Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */
+/* 221-240 For future use */
+/* 241-255 Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In
Gsm 12.15) */
static inline bool gtp_cause_successful(uint8_t cause)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch:
[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 17:18:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Remove union in struct osmo_io_ops
Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email ) Change subject: osmo_io: Remove union in struct osmo_io_ops .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35079?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I138d57843edc29000530bb7896bcb239002ecbec Gerrit-Change-Number: 35079 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: arehbein Gerrit-Comment-Date: Wed, 29 Nov 2023 17:16:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: laforge, lynxis lazus, pespin.
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email )
Change subject: osmo_io: Factor out and use common send function from backend
..
Patch Set 2:
(5 comments)
File src/core/osmo_io.c:
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/c63c3397_1e3aa3a8
PS1, Line 343: void iofd_handle_send(struct osmo_io_fd *iofd, int rc, struct
iofd_msghdr *msghdr)
> this function (like unfortuntaely many functions in the code base) would
> benefit from a comment desc […]
Done
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/dde3791b_d6c6a0ea
PS1, Line 343: void iofd_handle_send(struct osmo_io_fd *iofd, int rc, struct
iofd_msghdr *msghdr)
> this function (like unfortuntaely many functions in the code base) would
> benefit from a comment desc […]
Done
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/8d2930d4_ca0fc16d
PS1, Line 348: if (rc > 0 && rc < msgb_length(msg)) {
Regarding your comment about rc == 0, maybe one missing failure case is rc == 0
&& rc < msgb_length(msg)?
Not sure though.
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/57942bf2_352fb2a8
PS1, Line 360:
> rc == 0 case seems to be missing here?
IMO rc == 0 in send means we have successfully "written" 0 bytes to the socket
(which also means the socket is writable).
This is (IMO correctly) handled in the success case below.
The failure cases should either be rc < msgb_length() or rc == -EAGAIN.
File src/core/osmo_io_uring.c:
https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/93398c92_a3e6f35c
PS1, Line 188: iofd_msghdr_free(msghdr);
> Yes, previous you didn't checked for -EAGAIN, now you're checking it and
> doing things based on it.
You marked this as resolved, but just to be clear: I think this behavior is
okay. It's debatable whether we'd ever encounter -EAGAIN for a send in
io_uring, but if we do I'd say reenqueueing is the correct behavior.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59
Gerrit-Change-Number: 35078
Gerrit-PatchSet: 2
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Attention: lynxis lazus
Gerrit-Comment-Date: Wed, 29 Nov 2023 17:04:12 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge
Comment-In-Reply-To: pespin
Comment-In-Reply-To: daniel
Comment-In-Reply-To: lynxis lazus
Gerrit-MessageType: comment
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: laforge, lynxis lazus, pespin. Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by lynxis lazus, Verified-1 by Jenkins Builder Change subject: osmo_io: Factor out and use common send function from backend .. osmo_io: Factor out and use common send function from backend This handles reenqueuing a message on EAGAIN and incomplete write Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59 --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_poll.c M src/core/osmo_io_uring.c 4 files changed, 57 insertions(+), 57 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/78/35078/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6da2653d32aedd0e7872be0cf90a841b56462e59 Gerrit-Change-Number: 35078 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: utils: Link with libosmoisdn to avoid undefined references
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email ) Change subject: utils: Link with libosmoisdn to avoid undefined references .. utils: Link with libosmoisdn to avoid undefined references make[3]: Entering directory '/home/daniel/scm/osmo/libosmocore/utils' CCLD osmo-arfcn /usr/bin/ld: ../src/gsm/.libs/libosmogsm.so: undefined reference to `lapd_dl_set_flags@LIBOSMOISDN_1.0' /usr/bin/ld: ../src/gsm/.libs/libosmogsm.so: undefined reference to `lapd_t200_timeout@LIBOSMOISDN_1.0' /usr/bin/ld: ../src/gsm/.libs/libosmogsm.so: undefined reference to `lapd_ph_rts_ind@LIBOSMOISDN_1.0' collect2: error: ld returned 1 exit status Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 --- M utils/Makefile.am 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/35163/1 diff --git a/utils/Makefile.am b/utils/Makefile.am index 3ec71ea..0e11601 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -3,7 +3,7 @@ noinst_PROGRAMS = AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) -LDADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS) +LDADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/isdn/libosmoisdn.la $(top_builddir)/src/gsm/libosmogsm.la $(PTHREAD_LIBS) if ENABLE_UTILITIES EXTRA_DIST = conv_gen.py conv_codes_gsm.py -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9e99231899b269a4ec0faf720aff4dc8d2b74323 Gerrit-Change-Number: 35163 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/47256c5d_e54ac3a3 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > Was this ever tested? Not myself, but I'd expect them to transmit nothing or whatever? maybe @lafo...@osmocom.org can say from the top of his head since he knows better that l1 part. It makes sense that it sends nothing, and hence why we have to force it to transmit a dummy rlcmac block on trx0. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 16:37:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/01b4c1fc_4c03fc14 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > @fixeria bear in mind the "skip_idle && trx != 0" was only applied inside the > #ifdef DIRECT_PHY [...] It's getting more and more complicated, but it seems I have a more complete picture in my mind. The `#ifdef DIRECT_PHY` block was removed in a recent patch (I7a08d8cc670fa14f7206dbc22351f3668a17), and now this patch removes the `trx != 0` constraint. > And that was done in order to make it send stuff on C0 because those osmo-bts > lowerlayers are not filling the block otherwise. Ack. The `trx != 0` constraint was specifically needed for those DSP based models. > I realize now though, that when proposing the cleanup in this patch, I > assumed those were 1 TRX only, but lc15 has several of them right? I am not familiar with the lc15 PHY, but AFAIR there also was a sysmoBTS model with two TRX. Also, I don't know how those DSP based models behave when getting an empty DATA.req for `trx!=0`. Was this ever tested? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 16:26:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. Patch Set 1: (1 comment) Patchset: PS1: > Let's address this is in a follow up patch. This patch makes jenkins-sns.sh, > equal to jenkins.sh. […] Suggestion: maybe we could agree on always having the latest PCUIF version configured in `osmo-ttcn3-hacks.git` (we already do in `PCU_Tests.default`) and overwrite it here in `docker-playground.git` only if needed (e.g. for latest or `202[0-9]q[0-9]` branches). This way patching the config file would be as easy as doing `echo "PCUIF_Types.mp_pcuif_version := 12" >> $1`. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 16:02:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/9ecedff9_d5b73762 PS2, Line 9: git.osmocom.org has been deprecated > Huh? I thought it's only the `git://` protocol has been deprecated and was > disabled yesterday. […] right, `git clone https://git.osmocom.org/libosmocore` still works... agreed that the commit message could be better, but the change still makes sense given that gerrit.osmocom.org is more recent. I should have written: git://git.osmocom.org is deprecated. Sorry, had merged it already just before your comment arrived. I guess it failed in jenkins because the workspaces weren't cleaned when git:// was changed to https:// in I5f51b260445624759e77a70c5065838b29ec8c01. I have cleaned them as I tested the patch here. File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/c86e1de5_403b2b51 PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure > It needs to be this url for octphy-2g-headers only (not on gerrit), > everything else should be retrie […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 15:55:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/8913f5a1_96c58070 PS2, Line 9: git.osmocom.org has been deprecated Huh? I thought it's only the `git://` protocol has been deprecated and was disabled yesterday. When doing `git clone https://git.osmocom.org/...`, you'll be redirected to Gitea anyway... The sync delay (which may be different in different projects) is a more reasonable argument against using `https://git.osmocom.org`, IMO. File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/98f9a961_9762712c PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure > It needs to be this url for octphy-2g-headers only (not on gerrit), > everything else should be retrie […] Likewise, cloning from `https://git.osmocom.org/octphy-2g-headers` works fine, git client gets redirected to `https://gitea.osmocom.org/cellular-infrastructure/octphy-2g-headers/`. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 15:50:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h
Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 29 Nov 2023 15:49:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h
Attention is currently required from: daniel, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email ) Change subject: libgtp: Remove defines for reserved causes in gtp.h .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf Gerrit-Change-Number: 35162 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 29 Nov 2023 15:49:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email )
Change subject: Update git URLs
..
Update git URLs
git.osmocom.org has been deprecated, use gerrit or gitea urls instead.
Related:
https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure
Related: OS#6251
Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6
---
M README.md
M contrib/jenkins-build-common.sh
M contrib/jenkins-build-manuals.sh
M contrib/jenkins-build-osmo-bts.sh
M doc/manuals/chapters/ansible.adoc
M doc/manuals/chapters/docker.adoc
M doc/manuals/osmo-gsm-tester-manual-docinfo.xml
M src/osmo_gsm_tester/obj/osmo_vty.py
M sysmocom/ttcn3/README.txt
9 files changed, 32 insertions(+), 16 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
osmith: Verified
diff --git a/README.md b/README.md
index 3394969..9bc1dcf 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,12 @@
Ansible scripts to set up hosts to be used as Osmo-GSM-Tester Main Units or/and
Slave Units on the above mentioned setup can be found at
-https://git.osmocom.org/osmo-ci/tree/ansible, which actually install sample
-system configuration files from _utils/_ directory in this same repository.
+https://gitea.osmocom.org/osmocom/osmo-ci/src/branch/master/ansible, which
+actually install sample system configuration files from _utils/_ directory in
+this same repository.
A sample Docker setup is also maintained publicly at
-https://git.osmocom.org/docker-playground/tree/osmo-gsm-tester.
+https://gitea.osmocom.org/osmocom/docker-playground/src/branch/master/osmo-gsm-tester.
For the complete documentation, please refer to Osmo-GSM-Tester User manual,
available in sources under _doc/manuals/_ under this same repository, and
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index b41fc05..59d0d11 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -42,7 +42,7 @@
exit 1
fi
-git_url="${git_url:-https://git.osmocom.org}";
+git_url="${git_url:-https://gerrit.osmocom.org}";
prefix="${prefix:-$base/inst-$name}"
# prefix_real is usually identical with prefix, except when installing to a
# different $DESTDIR than /, which is the case for example when building
diff --git a/contrib/jenkins-build-manuals.sh b/contrib/jenkins-build-manuals.sh
index 48f7780..cf2a4d8 100755
--- a/contrib/jenkins-build-manuals.sh
+++ b/contrib/jenkins-build-manuals.sh
@@ -15,7 +15,7 @@
if [ -d "$OSMO_GSM_MANUALS_DIR" ]; then
git -C "$OSMO_GSM_MANUALS_DIR" pull
else
- git clone "https://git.osmocom.org/osmo-gsm-manuals";
"$OSMO_GSM_MANUALS_DIR"
+ git clone "https://gerrit.osmocom.org/osmo-gsm-manuals";
"$OSMO_GSM_MANUALS_DIR"
fi
git -C "$OSMO_GSM_MANUALS_DIR" checkout -f HEAD
diff --git a/contrib/jenkins-build-osmo-bts.sh
b/contrib/jenkins-build-osmo-bts.sh
index 6e9416a..d0b9e02 100755
--- a/contrib/jenkins-build-osmo-bts.sh
+++ b/contrib/jenkins-build-osmo-bts.sh
@@ -4,7 +4,8 @@
name="osmo-bts"
. "$(dirname "$0")/jenkins-build-common.sh"
-have_repo octphy-2g-headers
+(git_url=https://gitea.osmocom.org/cellular-infrastructure
+ have_repo octphy-2g-headers)
build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen --disable-uring
build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi
diff --git a/doc/manuals/chapters/ansible.adoc
b/doc/manuals/chapters/ansible.adoc
index 4c80723..d8970aa 100644
--- a/doc/manuals/chapters/ansible.adoc
+++ b/doc/manuals/chapters/ansible.adoc
@@ -5,8 +5,8 @@
and tedious, nowadays the Osmocom RnD and Production {app-name} setups are
installed and maintained using Ansible scripts. The set of ansible scripts is
available in Osmocom's git repository
-link:https://git.osmocom.org/osmo-ci/[osmo-ci.git] under 'ansible'
subdirectory,
-with the rest of ansible scripts to set jenkins slaves, etc.
+link:https://gitea.osmocom.org/osmocom/osmo-ci/[osmo-ci.git] under 'ansible'
+subdirectory, with the rest of ansible scripts to set jenkins slaves, etc.
Since these set of scripts is mainly aimed at Osmocom's own setup, and debian
is
used there, so far only debian hosts are supported officially, though patches
to
diff --git a/doc/manuals/chapters/docker.adoc b/doc/manuals/chapters/docker.adoc
index bc8ad00..985edc3 100644
--- a/doc/manuals/chapters/docker.adoc
+++ b/doc/manuals/chapters/docker.adoc
@@ -3,8 +3,8 @@
A sample {app-name} setup based on docker containers and maintained by the
Osmocom community is available in Osmocom's git repository
-link:https://git.osmocom.org/docker-playground/[docker-playground.git], under
-'osmo-gsm-tester' subdirectory. In there, one can find:
+link:https://gitea.osmocom.org/osmocom/docker-playground/[docker-playground.git],
+under 'osmo-gsm-tester' subdirectory. In there, one can find:
- A 'Dockerfile' file can be found which buil
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: (1 comment) File gtp/gtp.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/6c8690c8_c0d44bed PS2, Line 106: #define GTPCAUSE_129 129/* For future use 129-176 */ > Agree, please submit a patch dropping all of them. See https://gerrit.osmocom.org/c/osmo-ggsn/+/35162 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 15:42:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: libgtp: Remove defines for reserved causes in gtp.h
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email )
Change subject: libgtp: Remove defines for reserved causes in gtp.h
..
libgtp: Remove defines for reserved causes in gtp.h
As discussed in Gerrit change I9c3bf64537ef2223e29f8082861fa32fde26bf68
remove defines that don't serve any purpose. These are defines for
reserved values and changing them later if a newer spec defined them
would break API.
Keep the comments to explain the missing values.
Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf
---
M TODO-RELEASE
M gtp/gtp.h
2 files changed, 26 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/35162/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..d8cc3af 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public
release: c:r:0.
#library whatdescription / commit summary line
+libgtp REMOVE remove GTP cause defines of reserved values
diff --git a/gtp/gtp.h b/gtp/gtp.h
index c066fa6..7465cf1 100644
--- a/gtp/gtp.h
+++ b/gtp/gtp.h
@@ -53,7 +53,7 @@
#define GTP_UPDATE_PDP_RSP 19/* Update PDP Context Response */
#define GTP_DELETE_PDP_REQ 20/* Delete PDP Context Request */
#define GTP_DELETE_PDP_RSP 21/* Delete PDP Context Response */
- /* 22-25 For future use.
*//* In version GTP 1 anonomous PDP context */
+/* 22-25 For future use. *//* In version GTP 1 anonomous PDP context */
#define GTP_ERROR26/* Error Indication */
#define GTP_PDU_NOT_REQ 27/* PDU Notification Request */
#define GTP_PDU_NOT_RSP 28/* PDU Notification Response */
@@ -99,21 +99,21 @@
#define GTPCAUSE_NO_ID_NEEDED 3 /* No identity needed */
#define GTPCAUSE_MS_REFUSES_X 4 /* MS refuses */
#define GTPCAUSE_MS_NOT_RESP_X 5 /* MS is not GPRS responding */
-#define GTPCAUSE_0066 /* For future use 6-48 */
-#define GTPCAUSE_049 49 /* Cause values reserved for
GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */
-#define GTPCAUSE_064 64 /* For future use 64-127 */
+/* 6-48 For future use */
+/* 49-63 Cause values reserved for GPRS charging protocol use (See GTP' in GSM
12.15) */
+/* 64-127 For future use */
#define GTPCAUSE_ACC_REQ 128 /* Request accepted */
#define GTPCAUSE_NEW_PDP_NET_PREF 129 /* New PDP type due to network
preference */
#define GTPCAUSE_NEW_PDP_ADDR_BEAR130 /* New PDP type due to single
address bearer only */
-#define GTPCAUSE_131 131 /* For future use 131-176 */
-#define GTPCAUSE_177 177 /* Cause values reserved for
GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */
+/* 131-176 For future use */
+/* 177-191 Cause values reserved for GPRS charging protocol use (See GTP' In
GSM 12.15) */
#define GTPCAUSE_NON_EXIST192 /* Non-existent */
#define GTPCAUSE_INVALID_MESSAGE 193 /* Invalid message format */
#define GTPCAUSE_IMSI_NOT_KNOWN 194 /* IMSI not known */
#define GTPCAUSE_MS_DETACHED 195 /* MS is GPRS detached */
#define GTPCAUSE_MS_NOT_RESP 196 /* MS is not GPRS responding */
#define GTPCAUSE_MS_REFUSES 197 /* MS refuses */
-#define GTPCAUSE_198 198 /* For future use */
+/* 198 For future use */
#define GTPCAUSE_NO_RESOURCES 199 /* No resources available */
#define GTPCAUSE_NOT_SUPPORTED200 /* Service not supported */
#define GTPCAUSE_MAN_IE_INCORRECT 201 /* Mandatory IE incorrect */
@@ -136,8 +136,8 @@
#define GTPCAUSE_SYN_ERR_FILTER 218 /* Syntactic errors in packet
filter(s) */
#define GTPCAUSE_MISSING_APN 219 /* Missing or unknown APN */
#define GTPCAUSE_UNKNOWN_PDP 220 /* Unknown PDP address or PDP
type */
-#define GTPCAUSE_221 221 /* For Future Use 221-240 */
-#define GTPCAUSE_241 241 /* Cause Values Reserved For
Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */
+/* 221-240 For future use */
+/* 241-255 Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In
Gsm 12.15) */
static inline bool gtp_cause_successful(uint8_t cause)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35162?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I8db0aa0ade59785443a407b51dea326144406dcf
Gerrit-Change-Number: 35162
Gerrit-Patc
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
dexter has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/35161?usp=email )
Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
..
pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
When sending raw APDUs, we access the scc (SimCardCommands) object via
the scc member in the lchan object. Unfortunately self.lchan will not be
populated when the rs (RuntimeState) object is missing. This is in
particular the case when no profile could be detected for the card,
which is a common situation when we boostrap an unprovisioned card.
So let's access the scc object through the card object. This is also
more logical since when we send raw APDUs we work below the level of
logical channels.
Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a
Related: OS#6278
---
M pySim-shell.py
1 file changed, 29 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/pySim-shell.py b/pySim-shell.py
index 4e08eb7..3d8bd86 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -237,10 +237,15 @@
@cmd2.with_argparser(apdu_cmd_parser)
def do_apdu(self, opts):
"""Send a raw APDU to the card, and print SW + Response.
-DANGEROUS: pySim-shell will not know any card state changes, and
-not continue to work as expected if you e.g. select a different
-file."""
-data, sw = self.lchan.scc._tp.send_apdu(opts.APDU)
+CAUTION: this command bypasses the logical channel handling of
pySim-shell and card state changes are not
+tracked. Dpending on the raw APDU sent, pySim-shell may not continue
to work as expected if you e.g. select
+a different file."""
+
+# When sending raw APDUs we access the scc object through _scc member
of the card object. It should also be
+# noted that the apdu command plays an exceptional role since it is
the only card accessing command that
+# can be executed without the presence of a runtime state (self.rs)
object. However, this also means that
+# self.lchan is also not present (see method equip).
+data, sw = self.card._scc._tp.send_apdu(opts.APDU)
if data:
self.poutput("SW: %s, RESP: %s" % (sw, data))
else:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a
Gerrit-Change-Number: 35161
Gerrit-PatchSet: 4
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 15:16:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: (1 comment) File gtp/gtp.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/0615ecd5_413c5d61 PS2, Line 106: #define GTPCAUSE_129 129/* For future use 129-176 */ > I'm not opposed, but then that would mean removing all eight of these > defines: […] Agree, please submit a patch dropping all of them. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 29 Nov 2023 14:59:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: gtp: Add net GTP cause values and a function to check for success
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email ) Change subject: gtp: Add net GTP cause values and a function to check for success .. Patch Set 2: (2 comments) File gtp/gtp.h: https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/f62b203f_67e652e1 PS2, Line 106: #define GTPCAUSE_129 129/* For future use 129-176 */ > You broke the API compat here. […] I'm not opposed, but then that would mean removing all eight of these defines: ```c #define GTPCAUSE_0066 /* For future use 6-48 */ #define GTPCAUSE_049 49 /* Cause values reserved for GPRS charging protocol use (See GTP' in GSM 12.15) 49-63 */ #define GTPCAUSE_064 64 /* For future use 64-127 */ #define GTPCAUSE_131 131 /* For future use 131-176 */ #define GTPCAUSE_177 177 /* Cause values reserved for GPRS charging protocol use (See GTP' In GSM 12.15) 177-191 */ #define GTPCAUSE_198 198 /* For future use */ #define GTPCAUSE_221 221 /* For Future Use 221-240 */ #define GTPCAUSE_241 241 /* Cause Values Reserved For Gprs Charging Protocol Use (See Gtp' In Gsm 12.15) 241-255 */ ``` Having one value defined for a range is pretty useless anyway. https://gerrit.osmocom.org/c/osmo-ggsn/+/35084/comment/b39e4a66_057fb93c PS2, Line 142: static inline bool gtp_cause_successful(uint8_t cause) > not sure this is really useful to have here, I'd would have left it for the > specific app. […] It's used directly in libgtp as well: https://gerrit.osmocom.org/c/osmo-ggsn/+/35125 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35084?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I9c3bf64537ef2223e29f8082861fa32fde26bf68 Gerrit-Change-Number: 35084 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 14:45:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email ) Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe Gerrit-Change-Number: 35153 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 14:37:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
Attention is currently required from: dexter, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email ) Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 14:36:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email ) Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 14:36:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email )
Change subject: Add a GSM RLP decoder and encoder
..
Add a GSM RLP decoder and encoder
This code implements a decoder and encoder for the RLP (Radio Link
Protocol) as used in the bearer channel of GSM CSD (Circuit Switched
Data).
Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917
---
M include/osmocom/gsm/Makefile.am
A include/osmocom/gsm/rlp.h
M src/gsm/Makefile.am
M src/gsm/libosmogsm.map
A src/gsm/rlp.c
M tests/Makefile.am
A tests/rlp/rlp_test.c
A tests/rlp/rlp_test.ok
M tests/testsuite.at
9 files changed, 608 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am
index f840a27..5678a51 100644
--- a/include/osmocom/gsm/Makefile.am
+++ b/include/osmocom/gsm/Makefile.am
@@ -48,6 +48,7 @@
l1sap.h \
oap.h \
oap_client.h \
+ rlp.h \
rsl.h \
rxlev_stat.h \
sysinfo.h \
diff --git a/include/osmocom/gsm/rlp.h b/include/osmocom/gsm/rlp.h
new file mode 100644
index 000..47b0a6c
--- /dev/null
+++ b/include/osmocom/gsm/rlp.h
@@ -0,0 +1,81 @@
+/*
+ * GSM RLP (Radio Link Protocol) as used in CSD (3GPP TS 44.022)
+ *
+ * Copyright (C) 2022-2023 Harald Welte
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+
+
+#pragma once
+#include
+#include
+#include
+
+/*! \defgroup rlp GSM RLP (Radio Link Protocol) as used in CSD (3GPP TS 24.022)
+ * @{
+ * \file rlp.h */
+
+/*! RLP frame type as per 3GPP TS 24.022 Section 5.2.1 */
+enum osmo_rlp_ftype {
+ OSMO_RLP_FT_U,
+ OSMO_RLP_FT_S,
+ OSMO_RLP_FT_IS,
+};
+extern const struct value_string osmo_rlp_ftype_vals[];
+
+/*! RLP U-Frame Type as per 3GPP TS 24.022 Section 5.2.1 */
+enum osmo_rlp_u_ftype {
+ OSMO_RLP_U_FT_SABM = 0x07,
+ OSMO_RLP_U_FT_UA= 0x0c,
+ OSMO_RLP_U_FT_DISC = 0x08,
+ OSMO_RLP_U_FT_DM= 0x03,
+ OSMO_RLP_U_FT_NULL = 0x0f,
+ OSMO_RLP_U_FT_UI= 0x00,
+ OSMO_RLP_U_FT_XID = 0x17,
+ OSMO_RLP_U_FT_TEST = 0x1c,
+ OSMO_RLP_U_FT_REMAP = 0x11,
+};
+extern const struct value_string osmo_rlp_ftype_u_vals[];
+
+/*! RLP S-Frame type as per 3GPP TS 24.022 Section 5.2.1 */
+enum osmo_rlp_s_ftype {
+ OSMO_RLP_S_FT_RR= 0,
+ OSMO_RLP_S_FT_REJ = 2,
+ OSMO_RLP_S_FT_RNR = 1,
+ OSMO_RLP_S_FT_SREJ = 3,
+};
+extern const struct value_string osmo_rlp_ftype_s_vals[];
+
+/*! Data structure representing one decoded RLP frame */
+struct osmo_rlp_frame_decoded {
+ uint8_t version;
+ enum osmo_rlp_ftype ftype;
+ enum osmo_rlp_u_ftype u_ftype;
+ enum osmo_rlp_s_ftype s_ftype;
+ bool c_r;
+ bool p_f;
+ uint8_t s_bits;
+ uint16_t n_s;
+ uint16_t n_r;
+ uint32_t fcs;
+ uint8_t info[536/8];
+ uint16_t info_len;
+};
+
+int osmo_rlp_decode(struct osmo_rlp_frame_decoded *out, uint8_t version, const
uint8_t *data, size_t data_len);
+int osmo_rlp_encode(uint8_t *out, size_t out_size, const struct
osmo_rlp_frame_decoded *in);
+uint32_t osmo_rlp_fcs_compute(const uint8_t *in, size_t in_len);
+
+/*! @} */
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index a01189c..67ecf9d 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -36,7 +36,7 @@
gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c
gsm0808_utils.c \
gsm23003.c gsm23236.c mncc.c bts_features.c
oap_client.c \
gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c \
- gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c
gsm44068.c
+ gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c
gsm44068.c rlp.c
libgsmint_la_LDFLAGS = -no-undefined
libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la
$(top_builddir)/src/isdn/libosmoisdn.la
diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map
index 6bb3b4b..db2dbcb 100644
--- a/src/gsm/libosmogsm.map
+++ b/src/gsm/libosmogsm.map
@@ -864,5 +864,12 @@
osmo_csd_3k6_encode_frame;
osmo_csd_ubit_dump;
+osmo_rlp_decode;
+osmo_rlp_encode;
+osmo_rlp_fcs_compute;
+o
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder .. Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 29 Nov 2023 14:35:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 14:35:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 14:34:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) Unfortunately we had to revert [1] because it worked for current master but not for latest. The mistake here was to change the PCUIF version number in PCU_Tests.cfg to PCUIF v12. This is indeed the correct version for current master, but latest still uses v11. Also the change we made in jenkins-sns only affected 2023q1 builds, it does not affect latest. This is the reason why the previous patch broke latest. This follow up patch now copies the approach we already successfully use with the normal ttcn3-pcu-test / ttcn3-pcu-test-latest. (see also jenkins.sh) [1] I0b37f01f4c7bb829053231339e39ab734f4c8cbc Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Related: OS#6275 --- M ttcn3-pcu-test/jenkins-sns.sh 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 50027d3..06f833e 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -13,6 +13,15 @@ if image_suffix_is_2023q1; then sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 fi + + # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is + # executed for current master. For latest the PCUIF module parameter must stay at v.11 + # since in osmo-pcu-latest PCUIF v.12 is not yet supported. After the next release, PCUIF + # v.12 will be supported in osmo-pcu-latest as well and this function, including the + # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed. + if image_suffix_is_master; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1 + fi } mkdir $VOL_BASE_DIR/pcu-tester -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 14:34:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 14:32:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. pySim-shell: Do not use self.lchan.scc when sending raw APDUs. When sending raw APDUs, we access the scc (SimCardCommands) object via the scc member in the lchan object. Unfortunately self.lchan will not be populated when the rs (RuntimeState) object is missing. This is in particular the case when no profile could be detected for the card, which is a common situation when we boostrap an unprovisioned card. So let's access the scc object through the card object. This is also more logical since when we send raw APDUs we work below the level of logical channels. Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Related: OS#6278 --- M pySim-shell.py 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35161/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. Patch Set 1: (1 comment) Patchset: PS1: > In general I'd prefer having v12 (newest version) configured everywhere and > sed it to 10 or 11 on th […] Let's address this is in a follow up patch. This patch makes jenkins-sns.sh, equal to jenkins.sh. I think this is an improvement. We then might consider to set the version to something like "XX" in the configs and put a comment next to it that the version number is set in the jenkins(-sns).sh scripts. And then we explicitly set the version number for each variant (master, latest, 2323q3 etc.) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 14:12:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. Patch Set 3: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/35161/comment/686947c7_1ee83c6b PS2, Line 244: When sending raw APDUs we access the scc object through _scc member of the card object. It should also be : # noted that the apdu command plays an exceptional role since it is the only card accessing command that : # can be executed without the presence of a runt > Sure, the note is more directed to the programmer so that we do not > excellently change it back. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 14:03:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. Patch Set 3: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/35161/comment/1c07e118_8e9ca643 PS2, Line 244: When sending raw APDUs we access the scc object through _scc member of the card object. It should also be : # noted that the apdu command plays an exceptional role since it is the only card accessing command that : # can be executed without the presence of a runt > I think the improtant bit for the user is not how we access the scc object. > […] Sure, the note is more directed to the programmer so that we do not excellently change it back. I have now updated the docstring as well. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 14:03:32 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. pySim-shell: Do not use self.lchan.scc when sending raw APDUs. When sending raw APDUs, we access the scc (SimCardCommands) object via the scc member in the lchan object. Unfortunately self.lchan will not be populated when the rs (RuntimeState) object is missing. This is in particular the case when no profile could be detected for the card, which is a common situation when we boostrap an unprovisioned card. So let's access the scc object through the card object. This is also more logical since when we send raw APDUs we work below the level of logical channels. Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Related: OS#6278 --- M pySim-shell.py 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35161/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: Add flag to enable RTS based polling
jolly has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email )
Change subject: Add flag to enable RTS based polling
..
Add flag to enable RTS based polling
RTS based polling in LAPDm code is disabled by default. Make libosmogsm
stay compatible with existing applications that do not use RTS based
polling.
This patch fixes the issue that LAPDM_ENT_F_POLLING_ONLY did enable RTS
based polling too, which breaks existing applications like older
versions of osmo-bts.
Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
---
M include/osmocom/gsm/lapdm.h
M src/gsm/lapdm.c
2 files changed, 23 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h
index 42ebbce..6812102 100644
--- a/include/osmocom/gsm/lapdm.h
+++ b/include/osmocom/gsm/lapdm.h
@@ -51,6 +51,7 @@
#define LAPDM_ENT_F_EMPTY_FRAME0x0001
#define LAPDM_ENT_F_POLLING_ONLY 0x0002
#define LAPDM_ENT_F_DROP_2ND_REJ 0x0004
+#define LAPDM_ENT_F_RTS0x0008
/*! a LAPDm Entity */
struct lapdm_entity {
diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index fb892d2..1fc986d 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -363,8 +363,8 @@
if (le->tx_pending || le->flags & LAPDM_ENT_F_POLLING_ONLY) {
struct msgb *old_msg;
- /* In 'Polling only' mode there can be only one message. */
- if (le->flags & LAPDM_ENT_F_POLLING_ONLY) {
+ /* In 'RTS' mode there can be only one message. */
+ if (le->flags & LAPDM_ENT_F_RTS) {
/* Overwrite existing message by removing it first. */
if ((old_msg = msgb_dequeue(&dl->dl.tx_queue))) {
msgb_free(old_msg);
@@ -424,8 +424,8 @@
{
struct msgb *msg;
- /* Call RTS function of LAPD, to poll next frame. */
- if (dl->entity->flags & LAPDM_ENT_F_POLLING_ONLY) {
+ /* Call RTS function of LAPD, to queue next frame. */
+ if (dl->entity->flags & LAPDM_ENT_F_RTS) {
struct lapd_msg_ctx lctx;
int rc;
@@ -1635,7 +1635,7 @@
le->flags = flags;
/* Set flags at LAPD. */
- if (le->flags & LAPDM_ENT_F_POLLING_ONLY)
+ if (le->flags & LAPDM_ENT_F_RTS)
dl_flags |= LAPD_F_RTS;
if (le->flags & LAPDM_ENT_F_DROP_2ND_REJ)
dl_flags |= LAPD_F_DROP_2ND_REJ;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a
Gerrit-Change-Number: 35160
Gerrit-PatchSet: 2
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 13:24:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Add flag to enable RTS based polling
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS based polling .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 13:23:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 13:23:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, osmith, pespin. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Removed Verified-1 by Jenkins Builder (102) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: deleteVote
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 1: Verified+1 (4 comments) File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/8cfb5cd3_a235d146 PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure > sounds like you want to change the default git_url in have_repo or > jenkins-build-common. […] It needs to be this url for octphy-2g-headers only (not on gerrit), everything else should be retrieved from gerrit.osmocom.org (as there is no sync delay). I only want to set git_url for this one call to have_repo, hence it is in a subshell. Something similar is done already in contrib/jenkins-build-osmo-bts-oc2g.sh, contrib/jenkins-build-osmo-pcu-oc2g.sh, contrib/jenkins-build-osmo-trx.sh. I can use the same exact syntax if you prefer. This was not necessary before, as octphy-2g-headers was reachable from git.osmocom.org too. File src/osmo_gsm_tester/obj/osmo_vty.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/bcf0f78a_7cd9b4e1 PS1, Line 83: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) > osmo-python-tests. […] Done https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/0b4ecfaa_f1abde60 PS1, Line 162: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) > osmo-python-tests. […] Done https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/638b1896_d1cbf381 PS1, Line 212: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) > osmo-python-tests. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 13:22:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by osmith Change subject: Update git URLs .. Update git URLs git.osmocom.org has been deprecated, use gerrit or gitea urls instead. Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Related: OS#6251 Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 --- M README.md M contrib/jenkins-build-common.sh M contrib/jenkins-build-manuals.sh M contrib/jenkins-build-osmo-bts.sh M doc/manuals/chapters/ansible.adoc M doc/manuals/chapters/docker.adoc M doc/manuals/osmo-gsm-tester-manual-docinfo.xml M src/osmo_gsm_tester/obj/osmo_vty.py M sysmocom/ttcn3/README.txt 9 files changed, 32 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/57/35157/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-hnbgw[master]: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side .. mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side In general, the HNBs end up binding its IuUP/RTP streams to the same IP address used for Iuh signalling. When receiving a RAB-Ass-Req from CN, osmo-hnbgw creates an endpoint in its co-located MGW and creates 2 MGCP conns on it, one facing the RAN side and one facing the CN side. At that point, the remote CN IuUP IP address is known (was include din the received RAB-Ass-Req), but the RAN one is not yet known. Hence, the CRCX on the RAN-side conn contained no remote IP address, which means MGW has to blindly guess a good local IP address if "ip probing" is enabled. As a result, when RAB-Ass-Resp comes back from the hNodeB containing the allocated remote IuUP IP address and MGW is updated through MGCP MDCX, it may happen that MGW rebinds to a better fitting local IP address and returns it in MDCX. This has several downfalls: 1- We don't yet support updating the hNodeB about the changed IP address (see mgw_fsm_mdcx_hnb). For that, we'd need to send a RAB-Modify-Req+Resp. 2- Even if we supported it, in the general case we'd be delaying call establishment because an extra roundtrip is needed to update RAB-Modify-Req+Resp. In general, the HNBs end up binding its IuUP/RTP streams to the same IP address used for the Iuh signalling. Hence, use this assumption to announce the Iuh IP address as a remote IuUP IP address when transmitting the MGCP CRCX at the RAN-side conn to the MGW. This way the MGW can potentially select a proper local IuUP IP address from the start, so no RAB-Modify-Req is required later on. The logic to transmit RAB-Modify-Req is left unimplemented in this commit and is left as a later improvement. Related: SYS#6657 Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 56 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/53/35153/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe Gerrit-Change-Number: 35153 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-hnbgw[master]: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email ) Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe Gerrit-Change-Number: 35153 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 29 Nov 2023 13:20:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Add flag to enable RTS based polling
Attention is currently required from: fixeria, laforge, pespin. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS based polling .. Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35160/comment/8119a14b_b2570519 PS1, Line 7: Add flag to enable RTS bases polling > based polling Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 13:20:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Add flag to enable RTS based polling
Attention is currently required from: fixeria, jolly, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+2 by pespin The change is no longer submittable: Code-Review is unsatisfied now. Change subject: Add flag to enable RTS based polling .. Add flag to enable RTS based polling RTS based polling in LAPDm code is disabled by default. Make libosmogsm stay compatible with existing applications that do not use RTS based polling. This patch fixes the issue that LAPDM_ENT_F_POLLING_ONLY did enable RTS based polling too, which breaks existing applications like older versions of osmo-bts. Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a --- M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c 2 files changed, 23 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/35160/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-mgw[master]: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
Attention is currently required from: dexter, laforge, neels. Hello Jenkins Builder, dexter, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0 .. mgcp-cli: Transmit remote IP addr in CRCX if known and port=0 A client may know the IP address during CRCX but not yet the port, or it may simply want to hint an initial IP address so that the MGW can better guess when allocating a local IP address. Related: SYS#6657 Change-Id: I30165dbac5e484011d0acf46af36f105954a501d --- M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_fsm.c 2 files changed, 89 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/35152/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. .. Patch Set 2: (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/35161/comment/c9711334_3094391a PS2, Line 244: When sending raw APDUs we access the scc object through _scc member of the card object. It should also be : # noted that the apdu command plays an exceptional role since it is the only card accessing command that : # can be executed without the presence of a runt I think the improtant bit for the user is not how we access the scc object. The important bit is that the 'apdu' command bypasses the currentyl selected logical channel. It might be a good idea to ad this to the docstr of the do_apdu method, so it ends up in the user manual. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 13:08:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Add flag to enable RTS bases polling
Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS bases polling .. Patch Set 1: Code-Review+2 (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/35160/comment/4477921d_430ccfb6 PS1, Line 7: Add flag to enable RTS bases polling based polling Patchset: PS1: feel free to fix typo and +2 and merge yourself. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 12:48:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) .. Patch Set 1: (1 comment) Patchset: PS1: In general I'd prefer having v12 (newest version) configured everywhere and sed it to 10 or 11 on the specific cases, otherwise we start to have a bit of a mess here with so many versions. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 29 Nov 2023 12:43:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email ) Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload .. Patch Set 5: (1 comment) File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/35082/comment/ca1ed743_4f4a20fd PS5, Line 3848: /* Keep track of the estabishment state. */ establishment -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 5 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 12:41:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-gsm-tester[master]: Update git URLs
Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs .. Patch Set 1: (4 comments) File contrib/jenkins-build-osmo-bts.sh: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/fd7b7e40_2f9c0871 PS1, Line 7: (git_url=https://gitea.osmocom.org/cellular-infrastructure sounds like you want to change the default git_url in have_repo or jenkins-build-common.sh instead? File src/osmo_gsm_tester/obj/osmo_vty.py: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/2352a9ff_8d023abb PS1, Line 83: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) osmo-python-tests.git/ https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/b896694e_735c4ae5 PS1, Line 162: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) osmo-python-tests.git/ https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157/comment/74a0fbc2_6548d4df PS1, Line 212: # (copied from osmo-python-tests/osmopy/osmo_interact/vty.py) osmo-python-tests.git/ -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email 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: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 29 Nov 2023 12:37:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
