[M] Change in osmo-hnbgw[master]: allow (second) CS RAB Assignment Request without RTP info
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email )
Change subject: allow (second) CS RAB Assignment Request without RTP info
..
Patch Set 4:
(1 comment)
File src/osmo-hnbgw/mgw_fsm.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/6f2e7d39_73a803b2
PS3, Line 768: if (map->mgw_fi && is_rab_ass_without_tli(map, message)) {
> hmm i guess we don't need the 'map->mgw_fi' condition -- when a RAB
> Assignment has no RTP address, t […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c
Gerrit-Change-Number: 34974
Gerrit-PatchSet: 4
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Tue, 07 Nov 2023 03:38:42 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: allow (second) CS RAB Assignment Request without RTP info
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: allow (second) CS RAB Assignment Request without RTP info .. allow (second) CS RAB Assignment Request without RTP info In the field, we've encountered a so far unsupported scenario: after a RAB Assignment Request and Response have successfully set up an RTP stream, the CN sends *another* RAB Assignment Request to modify some SDU parameters, omitting the transportLayerInformation IE (not modifying the RTP address). Directly forward all RAB Assignment Requests that have no RTP information. This covers above use case, and also generally applies: no RTP info means nothing to tell the MGW about. Do not (yet?) support modifying the RTP address/port. Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c Related: SYS#6624 Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email )
Change subject: allow second CS RAB Assignment Request
..
Patch Set 3:
(1 comment)
File src/osmo-hnbgw/mgw_fsm.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/51bfab18_35e55f31
PS3, Line 768: if (map->mgw_fi && is_rab_ass_without_tli(map, message)) {
hmm i guess we don't need the 'map->mgw_fi' condition -- when a RAB Assignment
has no RTP address, then there is by definition nothing to do with it in
osmo-hnbgw, so we can just forward those without requiring that a working RAB
is already set up.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c
Gerrit-Change-Number: 34974
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Tue, 07 Nov 2023 03:31:00 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: allow second CS RAB Assignment Request .. allow second CS RAB Assignment Request In the field, we've encountered a so far unsupported scenario: after a RAB Assignment Request and Response have successfully set up an RTP stream, the CN sends *another* RAB Assignment Request to modify some SDU parameters, omitting the transportLayerInformation IE (not modifying the RTP address). Detect a secondary RAB Assignment Request, and just forward it as-is: the hNodeB is interested in the RAB configuration, osmo-hnbgw just needs the RTP info, which is not even present in this use case. Do not (yet?) support modifying the RTP address/port. Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c Related: SYS#6624 Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c --- M src/osmo-hnbgw/mgw_fsm.c 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: add HNBGW_Tests.TC_second_rab_assignment
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email ) Change subject: add HNBGW_Tests.TC_second_rab_assignment .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?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: Iadaba0e5e82ad6d163ad509904ede213e2462d5c Gerrit-Change-Number: 34973 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:23:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
Attention is currently required from: neels. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request .. Patch Set 2: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12307): https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/1bcedfcb_86f42812 PS2, Line 765: /* After a normal RAB Assignment, another RAB Assigment may follow, modifying some RAB parameters. This second 'Assigment' may be misspelled - perhaps 'Assignment'? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 07 Nov 2023 03:14:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email ) Change subject: allow second CS RAB Assignment Request .. Patch Set 1: (1 comment) File src/osmo-hnbgw/mgw_fsm.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12305): https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974/comment/8d4016f4_cf67729d PS1, Line 765: /* After a normal RAB Assignment, another RAB Assigment may follow, modifying some RAB parameters. This second 'Assigment' may be misspelled - perhaps 'Assignment'? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?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: I25bf19981cd75a87a7ceb3382dae1ec626ae475c Gerrit-Change-Number: 34974 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 07 Nov 2023 03:03:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-hnbgw[master]: allow second CS RAB Assignment Request
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/34974?usp=email )
Change subject: allow second CS RAB Assignment Request
..
allow second CS RAB Assignment Request
In the field, we've encountered a so far unsupported scenario: after a
RAB Assignment Request and Response have successfully set up an RTP
stream, the CN sends *another* RAB Assignment Request to modify some SDU
parameters, omitting the transportLayerInformation IE (not modifying the
RTP address).
Detect a secondary RAB Assignment Request, and just forward it as-is:
the hNodeB is interested in the RAB configuration, osmo-hnbgw just needs
the RTP info, which is not even present in this use case.
Do not (yet?) support modifying the RTP address/port.
Related: osmo-ttcn3-hacks Iadaba0e5e82ad6d163ad509904ede213e2462d5c
Related: SYS#6624
Change-Id: I25bf19981cd75a87a7ceb3382dae1ec626ae475c
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 79 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/74/34974/1
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index ddab0b5..3bbd8c6 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -683,6 +683,47 @@
return 0;
}
+static bool is_rab_ass_without_tli(struct hnbgw_context_map *map,
ranap_message *message)
+{
+ RANAP_RAB_AssignmentRequestIEs_t *ies;
+ RANAP_ProtocolIE_ContainerPair_t *protocol_ie_container_pair;
+ RANAP_ProtocolIE_FieldPair_t *protocol_ie_field_pair;
+ RANAP_RAB_SetupOrModifyItemFirst_t _rab_setup_or_modify_item_first = {
0 };
+ RANAP_RAB_SetupOrModifyItemFirst_t *rab_setup_or_modify_item_first =
&_rab_setup_or_modify_item_first;
+ int rc;
+ bool ret;
+
+ ies = >msg.raB_AssignmentRequestIEs;
+
+ if (!(ies->presenceMask &
RAB_ASSIGNMENTREQUESTIES_RANAP_RAB_SETUPORMODIFYLIST_PRESENT))
+ return false;
+
+ /* Detect the end of the list */
+ if (ies->raB_SetupOrModifyList.list.count < 1)
+ return false;
+
+ protocol_ie_container_pair = ies->raB_SetupOrModifyList.list.array[0];
+ protocol_ie_field_pair = protocol_ie_container_pair->list.array[0];
+
+ if (!protocol_ie_field_pair)
+ return false;
+
+ if (protocol_ie_field_pair->id !=
RANAP_ProtocolIE_ID_id_RAB_SetupOrModifyItem) {
+ RANAP_DEBUG
+ ("Decoding failed, the protocol IE field-pair is not of
type RANAP RAB setup-or-modify-item!\n");
+ return false;
+ }
+
+ rc =
ranap_decode_rab_setupormodifyitemfirst(rab_setup_or_modify_item_first,
+
_ie_field_pair->firstValue);
+ if (rc < 0)
+ return false;
+
+ ret = rab_setup_or_modify_item_first->transportLayerInformation == NULL;
+ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_RANAP_RAB_SetupOrModifyItemFirst,
rab_setup_or_modify_item_first);
+ return ret;
+}
+
/* Check if the message contains a RAB-ReleaseItem that matches the RAB-ID
that is managed by the given context map */
static bool is_our_rab_release(struct hnbgw_context_map *map, ranap_message
*message)
{
@@ -721,6 +762,14 @@
initialized = true;
}
+ /* After a normal RAB Assignment, another RAB Assigment may follow,
modifying some RAB parameters. This second
+* RAB Assignment may omit transportLayerInformation (remains
unchanged). Simply forward this to RUA, without
+* the need to adjust anything here. Allow this only when there already
is an mgw_fsm with proper address. */
+ if (map->mgw_fi && is_rab_ass_without_tli(map, message)) {
+ LOG_MAP(map, DCN, LOGL_INFO, "Rx secondary RAB Assignment
Request, forwarding as-is\n");
+ return map_rua_dispatch(map, MAP_RUA_EV_TX_DIRECT_TRANSFER,
ranap_msg);
+ }
+
/* The RTP stream negotiation usually begins with a
RAB-AssignmentRequest and ends with an IU-Release, however
* it may also be that the MSC decides to release the RAB with a
dedicated RAB-AssignmentRequest that contains
* a ReleaseList. In this case an FSM will already be present. */
@@ -791,6 +840,13 @@
return -1;
}
+ if (map->mgw_fi->state == MGW_ST_ESTABLISHED) {
+ /* This is a response to a second RAB Assignment Request, which
only modified some RAB config on top of
+* an earlier RAB Assignment. Just forward the response as-is,
we already have our MGW set up and need
+* no info from it. (i.e. we don't support modifying the RTP
address.) */
+ return map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST,
ranap_msg);
+ }
+
mgw_fsm_priv = map->mgw_fi->priv;
talloc_steal(mgw_fsm_priv, ranap_msg);
--
To view, visit
[M] Change in osmo-ttcn3-hacks[master]: HNBGW_Tests.TC_second_rab_assignment
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34973?usp=email )
Change subject: HNBGW_Tests.TC_second_rab_assignment
..
HNBGW_Tests.TC_second_rab_assignment
Related: SYS#6624
Change-Id: Iadaba0e5e82ad6d163ad509904ede213e2462d5c
---
M hnbgw/HNBGW_Tests.ttcn
M library/ranap/RANAP_Templates.ttcn
2 files changed, 172 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/73/34973/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 505beab..c80ef89 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -2596,6 +2596,130 @@
f_shutdown_helper();
}
+/* When a HNB that is connected does another HNB Register, make sure the SCCP
links for all its UEs are disconnected in
+ * reasonable time. */
+friend function f_tc_hnb_reregister_cleanup_sccp(charstring id, TestHdlrParams
pars) runs on ConnHdlr {
+ var MgcpCommand mgcp_cmd;
+ var RANAP_PDU tx;
+
+ f_init_handler(pars, t_guard := 30.0);
+
+ /* TODO: HNBAP UE REGISTER */
+ //HNBAP.send(ts_HNBAP_UERegister())
+
+ f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
+
+ tx := f_build_initial_ue(g_pars);
+ f_iuh2iu_connect(tx);
+
+ f_create_rab(pars.mgcp_pars);
+
+ f_verify_talloc_count(HNBGWVTY, {
+ "sccp_connection", "hnbgw_context_map" //,
"ue_context"
+ /* TODO: "ue_context" should also be 1, but these
tests fail to do HNBAP UE REGISTER */
+ }, expect_count := 1, attempts := 5);
+ f_sleep(1.0);
+
+ /* Trigger cleanup of HNB, by sending another HNBAP HNB Register
Request */
+ var integer cell_id := g_pars.hnb_idx;
+ HNBAP.send(ts_HNBAP_HNBRegisterRequest(char2oct("TTCN3 HNodeB"),
+ '00F110'O,
+ int2bit(1 + cell_id, 28),
+ int2oct(2, 2),
+ int2oct(3, 1),
+ int2oct(4, 2)));
+
+ /* At this point I would like to confirm that SCCP was released by
osmo-hnbgw:
+*SCCP.receive(RLSD)
+* But this seems completely impossible. SCCP_Emulation handles RLSD
internally without letting any other layers
+* know about it, and it seems impossible to check whether an SCCP
connection exists, either.
+*
+* Since that doesn't work, I am only checking whether the talloc
report has any sccp_connection instances left. */
+
+ timer T := 10.0;
+ T.start;
+ alt {
+ [] as_mgcp_dlcx(pars) {}
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for DLCX");
+ mtc.stop;
+ }
+ }
+ f_sleep(3.0);
+ f_verify_talloc_count(HNBGWVTY, {
+ "sccp_connection", "hnbgw_context_map" //,
"ue_context"
+ }, expect_count := 0);
+}
+
+testcase TC_hnb_reregister_cleanup_sccp() runs on test_CT {
+ var ConnHdlr vc_conn;
+ g_num_hnbs := 1;
+ f_init();
+
+ vc_conn :=
f_start_handler_with_pars(refers(f_tc_hnb_reregister_cleanup_sccp), t_pars(8));
+ vc_conn.done;
+
+ f_shutdown_helper();
+}
+
+/* In the field, we encountered a "normal" RAB Assignment that concludes
successfully, followed by another RAB
+ * Assignment that has different SDU subflow parameters, and does not contain
RTP information. At the time of writing,
+ * it seems that the second RAB Assignment causes a crash. Play through this
scenario. */
+friend function f_tc_second_rab_assignment(charstring id, TestHdlrParams pars)
runs on ConnHdlr {
+ var MgcpCommand mgcp_cmd;
+ var RANAP_PDU tx;
+ timer T := 5.0;
+
+ f_init_handler(pars);
+ f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
+
+ tx := f_build_initial_ue(g_pars);
+ f_iuh2iu_connect(tx);
+
+ f_create_rab(pars.mgcp_pars);
+
+ /* Now send a second RAB Assignment with different subflows and
omitting transportLayerAddress. (Assuming the
+* first RAB Assignment's transportLayerAddress remains in use
unchanged.) */
+ var template RAB_SetupOrModifyList rab_sml;
+ rab_sml := ts_RAB_SML2(t_RAB_id(23),
+ ts_RabParams,
+ user_plane_info := omit,
+ transport_layer_info := omit);
+ tx := valueof(ts_RANAP_RabAssReq(rab_sml));
+ BSSAP.send(tx);
+ T.start;
+
+ // TODO: expect response
+
+ f_sleep(5.0);
+
+ /* Send Iu Release */
+ tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention));
+ f_iu2iuh(tx);
+
+ T.start;
+ alt {
+ [] as_mgcp_dlcx(pars) {}
+ [] T.timeout {
+
[S] Change in libosmocore[master]: logging_gsmtap: Temporarily disable logging when sending the logs
Attention is currently required from: daniel, laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs .. Patch Set 1: -Code-Review (1 comment) File src/core/logging_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/34966/comment/e6fa2182_1f906d51 PS1, Line 119: target->loglevel = LOGL_FATAL + 1; Just learned something new from reviewing another patch... maybe we should use `UINT8_MAX` here instead to make this future proof (log levels are stored as `uint8_t` everywhere as far as I can tell)? At least here https://gerrit.osmocom.org/c/libosmocore/+/30633/comments/18697f9c_0e5e4419 there is talk about introducing a new define for max. log levels to avoid future code from breaking -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34966?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: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 34966 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 06 Nov 2023 23:34:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: logging: add log level cache
Attention is currently required from: Hoernchen, laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30633?usp=email ) Change subject: logging: add log level cache .. Patch Set 12: (2 comments) Patchset: PS9: > Ping, another month has passed? If it's about not introducing a new define... can we not use `UINT8_MAX`? With this it's also quite clear that we can't get any higher number (from what I can tell, internally log levels are always stored as `uint8_t`; `log_cache_update()` also takes `uint8_t` for its level argument) File src/core/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/30633/comment/85774041_2c819416 PS12, Line 153: logging I would suggest > if logging should happen for at least one log target -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30633?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: I35f8dd9127dd6e7feae392094fd6b3ce2d32558d Gerrit-Change-Number: 30633 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: arehbein Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Attention: Hoernchen Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 06 Nov 2023 23:28:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-remsim[master]: bankd: Use gsmtap_inst_fd2()
arehbein has submitted this change. (
https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email )
Change subject: bankd: Use gsmtap_inst_fd2()
..
bankd: Use gsmtap_inst_fd2()
- Use gsmtap_inst_fd2() because gsmtap_inst_fd() is deprecated
- Add TODO-RELEASE file
Related: OS#6213
Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61
---
A TODO-RELEASE
M src/bankd/gsmtap.c
2 files changed, 24 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
new file mode 100644
index 000..4a35f50
--- /dev/null
+++ b/TODO-RELEASE
@@ -0,0 +1,10 @@
+# When cleaning up this file: bump API version in corresponding Makefile.am
and rename corresponding debian/lib*.install
+# according to
https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
+# In short:
+# LIBVERSION=c:r:a
+# If the library source code has changed at all since the last update, then
increment revision: c:r + 1:a.
+# If any interfaces have been added, removed, or changed since the last
update: c + 1:0:0.
+# 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
+libosmocore > 1.9.0working (compiling) gsmtap_inst_fd2()
diff --git a/src/bankd/gsmtap.c b/src/bankd/gsmtap.c
index 8aced6a..7bdbe51 100644
--- a/src/bankd/gsmtap.c
+++ b/src/bankd/gsmtap.c
@@ -97,7 +97,7 @@
LOGP(DGSMTAP, LOGL_DEBUG, "sending APDU sub_type=%u, mdm_tpdu len=%u,
sim_tpdu len=%u, iov cnt=%u\n",
sub_type, mdm_tpdu_len, sim_tpdu_len, cnt);
- const int rc = writev(gsmtap_inst_fd(g_gti), iov, cnt);
+ const int rc = writev(gsmtap_inst_fd2(g_gti), iov, cnt);
if (rc < 0) {
char errtxt[128];
LOGP(DGSMTAP, LOGL_ERROR, "writev() failed with errno=%d:
%s\n", errno, strerror_r(errno,
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/34919?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I2a7736d6fba795b2c479b2a0bc371b90f838ed61
Gerrit-Change-Number: 34919
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in docker-playground[master]: redmine: run 'apt upgrade' in Dockerfile to get glibc fix from Debian
Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34970?usp=email ) Change subject: redmine: run 'apt upgrade' in Dockerfile to get glibc fix from Debian .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34970?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: Ice5c5e86cd519446fc59c09d64b20836f998d384 Gerrit-Change-Number: 34970 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 06 Nov 2023 22:16:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: SI10: Fix uninitialized last_i index
Attention is currently required from: jolly. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34969?usp=email ) Change subject: SI10: Fix uninitialized last_i index .. Patch Set 1: (1 comment) File src/osmo-bsc/system_information.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34969/comment/a243a674_15ac12c9 PS1, Line 1425: int i, last_i = -1; iirc, we put initialized variables on their own line -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34969?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: Ia10c5e68cb2940d9360d78f606af25bb207ee55f Gerrit-Change-Number: 34969 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: arehbein Gerrit-Attention: jolly Gerrit-Comment-Date: Mon, 06 Nov 2023 21:47:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in libosmocore[master]: tests: Test gsmtap logging if write queue fills up
Attention is currently required from: daniel. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34967?usp=email ) Change subject: tests: Test gsmtap logging if write queue fills up .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34967?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: Id5ae0c4c3820a9ed59eaf4003d2c57b6bdfe3468 Gerrit-Change-Number: 34967 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 06 Nov 2023 21:42:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: logging_gsmtap: Temporarily disable logging when sending the logs
Attention is currently required from: daniel, laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34966?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs .. Patch Set 1: Code-Review+1 (1 comment) File src/core/logging_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/34966/comment/ae326c51_44b7ca74 PS1, Line 117: the > language: "error [singular] ... […] small addition (while we're at it): The verb is missing, so maybe sth. like "... any error *occurring* when sending the log message doesn't..." or "... any errors *occurring* when sending the log message don't..." -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34966?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: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 34966 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 06 Nov 2023 19:01:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: devies: fix band manager dev type
Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34972?usp=email ) Change subject: devies: fix band manager dev type .. Patch Set 1: Verified+1 Code-Review+1 (1 comment) Patchset: PS1: I confirm that this patch fixes the problem. I no longer see this error with B210: ``` DDEV ERROR UHDDevice.cpp:65 No Tx Power measurements exist for device N2XX 1 SPS on band GSM900, using fallback.. ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98 Gerrit-Change-Number: 34972 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen Gerrit-Comment-Date: Mon, 06 Nov 2023 18:40:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: devies: fix band manager dev type
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-trx/+/34972?usp=email )
Change subject: devies: fix band manager dev type
..
devies: fix band manager dev type
The dev type was set too early, but the actual dev is only being
discovered during open, so update it.
Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98
---
M Transceiver52M/device/bladerf/bladerf.cpp
M Transceiver52M/device/common/bandmanager.h
M Transceiver52M/device/lms/LMSDevice.cpp
M Transceiver52M/device/uhd/UHDDevice.cpp
4 files changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/72/34972/1
diff --git a/Transceiver52M/device/bladerf/bladerf.cpp
b/Transceiver52M/device/bladerf/bladerf.cpp
index 3e830b1..2f3c86a 100644
--- a/Transceiver52M/device/bladerf/bladerf.cpp
+++ b/Transceiver52M/device/bladerf/bladerf.cpp
@@ -279,6 +279,7 @@
dev_type = blade_dev_type::BLADE2;
tx_window = TX_WINDOW_FIXED;
+ update_band_dev(dev_key(dev_type, tx_sps, rx_sps));
struct bladerf_devinfo info;
bladerf_get_devinfo(dev, );
diff --git a/Transceiver52M/device/common/bandmanager.h
b/Transceiver52M/device/common/bandmanager.h
index a198937..d07f21d 100644
--- a/Transceiver52M/device/common/bandmanager.h
+++ b/Transceiver52M/device/common/bandmanager.h
@@ -34,7 +34,7 @@
using powerkeyt = typename powermapt::key_type;
using powermappedt = typename powermapt::mapped_type;
using devkeyt = typename devmapt::key_type;
- const devkeyt _dev_type;
+ devkeyt m_dev_type;
const powermapt _power_map;
const devmapt _dev_map;
powerkeyt m_fallback;
@@ -102,6 +102,10 @@
band_ass_curr_sess = false;
}
+ void update_band_dev(devkeyt dev_type) {
+ m_dev_type = dev_type;
+ }
+
void get_dev_band_desc(powermappedt )
{
if (m_band == 0) {
diff --git a/Transceiver52M/device/lms/LMSDevice.cpp
b/Transceiver52M/device/lms/LMSDevice.cpp
index 451d2b9..7c220d2 100644
--- a/Transceiver52M/device/lms/LMSDevice.cpp
+++ b/Transceiver52M/device/lms/LMSDevice.cpp
@@ -245,6 +245,7 @@
m_dev_type = parse_dev_type(m_lms_dev);
dev_desc = dev_param_map.at(m_dev_type);
+ update_band_dev(m_dev_type);
if ((cfg->clock_ref != REF_EXTERNAL) && (cfg->clock_ref !=
REF_INTERNAL)) {
LOGC(DDEV, ERROR) << "Invalid reference type";
diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp
b/Transceiver52M/device/uhd/UHDDevice.cpp
index ec772aa..85e9e38 100644
--- a/Transceiver52M/device/uhd/UHDDevice.cpp
+++ b/Transceiver52M/device/uhd/UHDDevice.cpp
@@ -530,6 +530,8 @@
if (!parse_dev_type())
return -1;
+ update_band_dev(dev_key(dev_type, tx_sps, rx_sps));
+
if ((dev_type == E3XX) && !uhd_e3xx_version_chk()) {
LOGC(DDEV, ALERT) << "E3XX requires UHD 003.009.000 or greater";
return -1;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34972?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I1dda6023ca6f15bc063c3dfbc704db2410ff7c98
Gerrit-Change-Number: 34972
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: redmine: run 'apt upgrade' in Dockerfile to get glibc fix from Debian
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34970?usp=email ) Change subject: redmine: run 'apt upgrade' in Dockerfile to get glibc fix from Debian .. redmine: run 'apt upgrade' in Dockerfile to get glibc fix from Debian https://lwn.net/ml/oss-security/20231003175031.GA16924@localhost.localdomain/ Change-Id: Ice5c5e86cd519446fc59c09d64b20836f998d384 --- M redmine/Dockerfile 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/34970/1 diff --git a/redmine/Dockerfile b/redmine/Dockerfile index fc1ba89..d6125cb 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,6 +1,7 @@ FROM redmine:4.2-passenger RUNapt-get update && \ + apt-get -y upgrade && \ apt-get install -y --no-install-recommends \ graphviz \ imagemagick \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34970?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: Ice5c5e86cd519446fc59c09d64b20836f998d384 Gerrit-Change-Number: 34970 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: sigtran-tests: Add note on why this is still using buster
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34971?usp=email ) Change subject: sigtran-tests: Add note on why this is still using buster .. sigtran-tests: Add note on why this is still using buster Change-Id: I403401be7e469085f9a82944b3eaa6b8c8ea6319 --- M sigtran-tests/Dockerfile 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/71/34971/1 diff --git a/sigtran-tests/Dockerfile b/sigtran-tests/Dockerfile index 51cff39..1faf8c1 100644 --- a/sigtran-tests/Dockerfile +++ b/sigtran-tests/Dockerfile @@ -1,4 +1,7 @@ ARGUSER +# needs buster as the code *really* requires old guile-2.0 +# which is not available in more modern distributions, see +# https://github.com/nplab/m3ua-testtool/issues/2 for more info FROM $USER/debian-buster-build -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34971?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: I403401be7e469085f9a82944b3eaa6b8c8ea6319 Gerrit-Change-Number: 34971 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in osmo-bsc[master]: SI10: Fix uninitialized last_i index
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34969?usp=email )
Change subject: SI10: Fix uninitialized last_i index
..
SI10: Fix uninitialized last_i index
Not only l_bts must be declared outside the for-loop, but also last_i.
This is a fixup of I9dbbd066075f9ccb331616a2b59b46b1b44c8b4c.
Related: CID#330311
Change-Id: Ia10c5e68cb2940d9360d78f606af25bb207ee55f
---
M src/osmo-bsc/system_information.c
1 file changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/34969/1
diff --git a/src/osmo-bsc/system_information.c
b/src/osmo-bsc/system_information.c
index 141a720..cc2e788 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -1422,7 +1422,7 @@
{
struct bitvec *nbv;
struct gsm_bts *s_bts = conn->lchan->ts->trx->bts, *l_bts = NULL;
- int i;
+ int i, last_i = -1;
bool any_neighbor = false;
int rc;
@@ -1447,7 +1447,6 @@
struct gsm_subscriber_connection *c;
unsigned int save_cur_bit;
int16_t arfcn;
- int last_i;
arfcn = neigh_list_get_arfcn(s_bts, nbv, i);
/* End of list */
if (arfcn < 0)
@@ -1478,7 +1477,7 @@
save_cur_bit = bv.cur_bit;
/* Nth neighbor, so add rest octets with
differential cell info. */
LOGP(DRR, LOGL_INFO, "Append cell ID %d to SI
10.\n", n_bts->cell_identity);
- OSMO_ASSERT(l_bts);
+ OSMO_ASSERT(l_bts && last_i >= 0);
rc = si10_rest_octets_encode_other(s_bts, ,
l_bts, n_bts, last_i, i);
if (rc < 0) {
LOGP(DRR, LOGL_INFO, "Skip cell ID %d,
SI 10 would overflow.\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34969?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: Ia10c5e68cb2940d9360d78f606af25bb207ee55f
Gerrit-Change-Number: 34969
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[S] Change in osmo-bsc[master]: ctrl: Add cell barred
Attention is currently required from: matanp. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34968?usp=email ) Change subject: ctrl: Add cell barred .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34968?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: I6dc45fa1d76707be0d9f9d4391550be598ed0a6d Gerrit-Change-Number: 34968 Gerrit-PatchSet: 1 Gerrit-Owner: matanp Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: matanp Gerrit-Comment-Date: Mon, 06 Nov 2023 09:55:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
