Attention is currently required from: pespin, msuraev.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323 )
Change subject: cnpool: allow separate cs7 for IuPS and IuCS
......................................................................
Patch Set 9:
(2 comments)
File include/osmocom/hnbgw/hnbgw.h:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323/comment/2e47297f_08df39f5
PS8, Line 87: DECLARE_HASHTABLE(hnbgw_context_map_by_conn_id, 6);
> maybe add a comment what's going to be added in here (struct hnbgw_cnlink?).
it would be pretty much exactly the name of the table:
/* hash table of struct hnbgw_context_map by SCCP conn ID */
but ok if it helps i can do it
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323/comment/8c1542b3_125575af
PS8, Line 133: if (!cnlink->hnbgw_sccp_user)
> can this really happen? Is it expected to happen? I find it confusing when seeing all these checks w […]
In places where it's established to be safe i can just use cnlink->hnbgw_sccp_usser->ss7->sccp directly.
This function's reason to exist is to avoid NULL dereferences.
I want to call this function in *any* godforsaken corner case from early init to late cleanup, and never run into a NULL deref. I want to get the osmo_sccp_instance, or NULL if there isn't any, for whichever weird reason there might be.
In the branch's final state, this function is called in two places:
cnlink_sccp_addr_to_str(): return a string for logging -- if it is early link startup logging there might be no SCCP instance, or anything leading up to the SCCP instance, assigned yet.
tx_reset_ack(): the SCCP link should be stable, but we're in the middle of a RESET operation, so it could be some state transition, and rarely happens. I decided to just do the extra check.
I thought I'd need it more often, but two places is already enough to not dup all these checks.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08
Gerrit-Change-Number: 32323
Gerrit-PatchSet: 9
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 23:49:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels, msuraev.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323
to look at the new patch set (#9).
Change subject: cnpool: allow separate cs7 for IuPS and IuCS
......................................................................
cnpool: allow separate cs7 for IuPS and IuCS
Prepare for CN pooling; allow using separate SS7 instances for IuCS and
IuPS.
New struct hnbgw_sccp_user describes a RANAP SCCP user, one per cs7.
Limit struct hnbgw_cnlink to describing a CN peer, using whichever SCCP
instance that is indicated by hnbgw_sccp_user.
Chart sccp.dot shows the changes made.
Related: SYS#6412
Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08
---
M doc/charts/sccp.dot
M include/osmocom/hnbgw/context_map.h
M include/osmocom/hnbgw/hnbgw.h
M include/osmocom/hnbgw/hnbgw_cn.h
M src/osmo-hnbgw/context_map.c
M src/osmo-hnbgw/context_map_sccp.c
M src/osmo-hnbgw/hnbgw.c
M src/osmo-hnbgw/hnbgw_cn.c
M src/osmo-hnbgw/hnbgw_rua.c
M src/osmo-hnbgw/hnbgw_vty.c
M src/osmo-hnbgw/osmo_hnbgw_main.c
M tests/config/defaults.vty
M tests/config/one_cs7.vty
M tests/config/one_cs7_with_addrs.vty
M tests/config/one_cs7_with_iucs_addr.vty
M tests/config/one_cs7_with_iups_addr.vty
A tests/config/two_cs7.cfg
A tests/config/two_cs7.vty
A tests/config/two_cs7_with_addrs.cfg
A tests/config/two_cs7_with_addrs.vty
20 files changed, 674 insertions(+), 298 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/23/32323/9
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32323
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Iea1824f1c586723d989c80a909bae16bd2866e08
Gerrit-Change-Number: 32323
Gerrit-PatchSet: 9
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: msuraev <msuraev(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32915 )
Change subject: immediately SCCP RLSD on HNB re-register
......................................................................
Patch Set 4:
(1 comment)
File src/osmo-hnbgw/context_map_sccp.c:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32915/comment/189e85c3_f0b12310
PS1, Line 362: tx_sccp_df1(fi, ranap_msg);
: tx_sccp_rlsd(fi);
> > ok. i'm still a bit unclear, is this about only tx_sccp_rlsd() or also the other one? […]
I ack your point in things being more complex in various corner cases, but I'm poking the SCCP-SCOC specifically to change from a connected state to a release, particularly to initiate the RLSD from here towards the remote CN, now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32915
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I4e78617ad39bb73fe92097c8a1a8069da6a7f6a1
Gerrit-Change-Number: 32915
Gerrit-PatchSet: 4
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 22:51:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989 )
Change subject: add doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg
......................................................................
Patch Set 2:
(2 comments)
File doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989/comment/f6b20c28_f446d772
PS2, Line 13: hnbap-allow-tmsi 1
> this line shows as not really interesting in this example? Why not using the default?
i think i just copied some other file.
in general it makes sense to always allow TMSI for HNBAP: we don't even care about HNBAP UE foo at all -- we ACK it but it has zero effect on RANAP where the business happens.
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989/comment/d4172bef_4ae61150
PS2, Line 19: log stderr
> usually we put log sections at the top.
is there a reason?
i figure it is actually the least important bit of config, so why not put it in the bottom...
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I42c3b434a7339cc3efb27b43c893cfb734de9ca4
Gerrit-Change-Number: 32989
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 22:46:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32991 )
Change subject: add startup config tests
......................................................................
Patch Set 5:
(1 comment)
File tests/Makefile.am:
https://gerrit.osmocom.org/c/osmo-hnbgw/+/32991/comment/48534468_69a41e9d
PS5, Line 69: $(srcdir)/config/run_tests.sh "$(top_builddir)/src/osmo-hnbgw/osmo-hnbgw" "$(srcdir)/config/" $U
> I fail to see why cannot you add the for loop directly here, I would expect the entire target is run […]
i guess yes, but multiline shell script in a makefile is always kind of ugly, no?
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32991
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ic8bb30e1dd73753c2ff255566382e241918414f7
Gerrit-Change-Number: 32991
Gerrit-PatchSet: 5
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 22:40:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33105 )
Change subject: tbf: Improve TBF name description in logs
......................................................................
tbf: Improve TBF name description in logs
Change format to print the state at the end, to resemble more the same
format used by FSMs.
Furthermore, by moving it at the end, print it only when "enclousure" is
requested, aka when not requested by FSM to update its internal name.
The consequence of this logc is that log lines printed from FSM don't
end up with the same state string printed twice in different places.
While at it, shorten the EGPRS/GPRS indicator to one character, which
should be understandable enough since it matches what's usually seen in
mobile phones to signal one or another.
Change-Id: I86b5f042fae77721b22fc026228677bd56768ba9
---
M src/tbf.cpp
M tests/alloc/AllocTest.err
M tests/app_info/AppInfoTest.err
M tests/ms/MsTest.err
M tests/tbf/TbfTest.err
M tests/types/TypesTest.err
M tests/ulc/PdchUlcTest.err
7 files changed, 446,018 insertions(+), 445,999 deletions(-)
Approvals:
dexter: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33105
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I86b5f042fae77721b22fc026228677bd56768ba9
Gerrit-Change-Number: 33105
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33124 )
Change subject: Switch from pycryptodome to pycryptodomex
......................................................................
Switch from pycryptodome to pycryptodomex
So for some weird historical reasons, the same python module is
available as pycryptodome (Crypto.* namespace) and pycryptodomex
(Cryptodome.* namespace). See the following information on the project
homepage: https://www.pycryptodome.org/src/installation
To make things extra-weird, Debian choose to package pycryptodomex as
python3-pycryptodome
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886291).
So in order to support both Debian-packaged and differently-installed
packages, let's switch to pycryotodomex on all platforms/installers.
Change-Id: I04daed01f51f9702595ef9f9e0d7fcdf1e4adb62
---
M README.md
M pySim/ota.py
M pySim/utils.py
M requirements.txt
M setup.py
5 files changed, 29 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/24/33124/1
diff --git a/README.md b/README.md
index 025b518..db13a52 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
- termcolor
- colorlog
- packaging
- - pycryptodome
+ - pycryptodomex
Example for Debian:
```sh
@@ -54,6 +54,7 @@
pcscd libpcsclite-dev \
python3 \
python3-setuptools \
+ python3-pycryptodome \
python3-pyscard \
python3-pip
pip3 install --user -r requirements.txt
diff --git a/pySim/ota.py b/pySim/ota.py
index 83303a6..5955a08 100644
--- a/pySim/ota.py
+++ b/pySim/ota.py
@@ -150,8 +150,8 @@
pass
-from Crypto.Cipher import DES, DES3, AES
-from Crypto.Hash import CMAC
+from Cryptodome.Cipher import DES, DES3, AES
+from Cryptodome.Hash import CMAC
class OtaAlgo(abc.ABC):
iv = property(lambda self: bytes([0] * self.blocksize))
diff --git a/pySim/utils.py b/pySim/utils.py
index 6b8ee37..537014f 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -616,9 +616,9 @@
"""
Run the milenage algorithm to calculate OPC from Ki and OP
"""
- from Crypto.Cipher import AES
+ from Cryptodome.Cipher import AES
# pylint: disable=no-name-in-module
- from Crypto.Util.strxor import strxor
+ from Cryptodome.Util.strxor import strxor
from pySim.utils import b2h
# We pass in hex string and now need to work on bytes
diff --git a/requirements.txt b/requirements.txt
index fb94472..b12cb4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@
pyyaml>=5.1
termcolor
colorlog
-pycryptodome
+pycryptodomex
packaging
diff --git a/setup.py b/setup.py
index d14ebc6..d4fb15f 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
"pyyaml >= 5.1",
"termcolor",
"colorlog",
- "pycryptodome",
+ "pycryptodomex",
"packaging",
],
scripts=[
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/33124
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I04daed01f51f9702595ef9f9e0d7fcdf1e4adb62
Gerrit-Change-Number: 33124
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33120 )
Change subject: Error trying to obtain FN from RFN if curr_fn not known
......................................................................
Error trying to obtain FN from RFN if curr_fn not known
This may happen if a RACH.ind is received before any DATA.ind has been
received.
With usual osmo-bts-trx or osmo-bts-sysmo, this shouldn't happen
nowadays, but it is still a problem with osmo-bts-virtual, where lower
layers don't submit NOPE.ind in the absence of data, and hence it won't
sent DATA.ind to osmo-pcu all the time.
This change helps in showcasing confusing scenarios where the RFN
generated in the Imm Ass was wrong.
Change-Id: I29b7ba828fe890f90e35686bbb04d4abfe56b955
---
M src/bts.cpp
1 file changed, 30 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/20/33120/1
diff --git a/src/bts.cpp b/src/bts.cpp
index 8d6f156..6cac93f 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -740,20 +740,27 @@
/* Determine the full frame number from a relative frame number */
uint32_t bts_rfn_to_fn(const struct gprs_rlcmac_bts *bts, uint32_t rfn)
{
- uint32_t m_cur_rfn;
+ uint32_t m_cur_fn, m_cur_rfn;
uint32_t fn_rounded;
/* Ensure that all following calculations are performed with the
* relative frame number */
OSMO_ASSERT(rfn < RFN_MODULUS);
+ m_cur_fn = bts_current_frame_number(bts);
+ if (m_cur_fn == FN_UNSET) {
+ LOGP(DRLCMAC, LOGL_ERROR, "Unable to calculate full FN from RFN %u: Current FN not known!\n",
+ rfn);
+ return rfn;
+ }
+
/* Compute an internal relative frame number from the full internal
frame number */
- m_cur_rfn = fn2rfn(bts->cur_fn);
+ m_cur_rfn = fn2rfn(m_cur_fn);
/* Compute a "rounded" version of the internal frame number, which
* exactly fits in the RFN_MODULUS raster */
- fn_rounded = GSM_TDMA_FN_SUB(bts->cur_fn, m_cur_rfn);
+ fn_rounded = GSM_TDMA_FN_SUB(m_cur_fn, m_cur_rfn);
/* If the delta between the internal and the external relative frame
* number exceeds a certain limit, we need to assume that the incoming
@@ -762,7 +769,7 @@
if (GSM_TDMA_FN_DIFF(rfn, m_cur_rfn) > RFN_THRESHOLD) {
LOGP(DRLCMAC, LOGL_DEBUG,
"Race condition between rfn (%u) and m_cur_fn (%u) detected: rfn belongs to the previous modulus %u cycle, wrapping...\n",
- rfn, bts->cur_fn, RFN_MODULUS);
+ rfn, m_cur_fn, RFN_MODULUS);
if (fn_rounded < RFN_MODULUS) {
LOGP(DRLCMAC, LOGL_DEBUG,
"Cornercase detected: wrapping crosses %u border\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33120
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I29b7ba828fe890f90e35686bbb04d4abfe56b955
Gerrit-Change-Number: 33120
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin, dexter.
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33119 )
Change subject: Use always RFN when handling RACH indications
......................................................................
Use always RFN when handling RACH indications
The previous code was really confusing, passing full FNs as RFNs under
certain external conditions, and then assuming the RFN input of
rfn_to_fn() function could actually be a FN.
As a result, we had a lot of code behaving slightly different depending
on whether the incomding FN from pcuif was filled in by a BSC or a BTS.
Avoid this b ehavior differentiation and always assume the most
restricted one, aka RFN.
Change-Id: Ib3b5702168195b595711cd0ff32c211b9aba429d
---
M src/bts.cpp
M src/pcu_l1_if.cpp
M src/pcu_utils.h
M tests/tbf/TbfTest.cpp
4 files changed, 44 insertions(+), 22 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/33119/1
diff --git a/src/bts.cpp b/src/bts.cpp
index d4bb35f..8d6f156 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -52,7 +52,6 @@
#include <errno.h>
#include <string.h>
-#define RFN_MODULUS 42432
#define RFN_THRESHOLD RFN_MODULUS / 2
extern void *tall_pcu_ctx;
@@ -744,25 +743,13 @@
uint32_t m_cur_rfn;
uint32_t fn_rounded;
- /* make sure RFN does not exceed the maximum possible value of a valid
- * GSM frame number. */
- OSMO_ASSERT(rfn < GSM_MAX_FN);
-
- /* Note: If a BTS is sending in a rach request it will be fully aware
- * of the frame number. If the PCU is used in a BSC-co-located setup.
- * The BSC will forward the incoming RACH request. The RACH request
- * only contains the relative frame number (Fn % 42432) in its request
- * reference. This PCU implementation has to fit both scenarios, so
- * we need to assume that Fn is a relative frame number. */
-
/* Ensure that all following calculations are performed with the
* relative frame number */
- if (rfn >= RFN_MODULUS)
- return rfn;
+ OSMO_ASSERT(rfn < RFN_MODULUS);
/* Compute an internal relative frame number from the full internal
frame number */
- m_cur_rfn = bts->cur_fn % RFN_MODULUS;
+ m_cur_rfn = fn2rfn(bts->cur_fn);
/* Compute a "rounded" version of the internal frame number, which
* exactly fits in the RFN_MODULUS raster */
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index aadc640..cda7af7 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -630,7 +630,7 @@
.ra = 0x00,
.trx_nr = trx_nr,
.ts_nr = ts_nr,
- .rfn = fn,
+ .rfn = fn2rfn(fn),
.qta = qta,
};
@@ -640,11 +640,22 @@
static int pcu_rx_rach_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_rach_ind *rach_ind)
{
int rc = 0;
- int current_fn = bts_current_frame_number(bts);
+ uint32_t current_fn = bts_current_frame_number(bts);
+ uint16_t rfn;
- LOGP(DL1IF, LOGL_INFO, "RACH request received: sapi=%d "
- "qta=%d, ra=0x%02x, fn=%u, cur_fn=%d, is_11bit=%d\n", rach_ind->sapi, rach_ind->qta,
- rach_ind->ra, rach_ind->fn, current_fn, rach_ind->is_11bit);
+ /* Note: If a BSC is sending a RACH req to us, it is actually forwarding it to
+ * us from BTS as a result of receiving an RFN (Fn % 42432) over RSL
+ * (see 3GPP TS 48.058, section 9.3.19).
+ * If a BTS is sending a RACH req to us, it may contain a full FN
+ * (current osmo-bts does that) instead of an RFN.
+ * For consistency, and taking into account the BSC case limitations,
+ * work always with RFNs here:
+ */
+ rfn = fn2rfn(rach_ind->fn);
+
+ LOGP(DL1IF, LOGL_INFO,
+ "RACH request received: sapi=%d qta=%d, ra=0x%02x, fn=%u (rfn=%u), cur_fn=%d, is_11bit=%d\n",
+ rach_ind->sapi, rach_ind->qta, rach_ind->ra, rach_ind->fn, rfn, current_fn, rach_ind->is_11bit);
if (OSMO_UNLIKELY(rach_ind->fn > GSM_TDMA_HYPERFRAME - 1)) {
LOGP(DL1IF, LOGL_ERROR, "RACH request contains fn=%u that exceeds valid limits (0-%u) -- ignored!\n",
@@ -658,7 +669,7 @@
.ra = rach_ind->ra,
.trx_nr = rach_ind->trx_nr,
.ts_nr = rach_ind->ts_nr,
- .rfn = rach_ind->fn,
+ .rfn = rfn,
.qta = rach_ind->qta,
};
diff --git a/src/pcu_utils.h b/src/pcu_utils.h
index 2dd86ac..0be37e9 100644
--- a/src/pcu_utils.h
+++ b/src/pcu_utils.h
@@ -77,6 +77,12 @@
return x & -x;
}
+#define RFN_MODULUS 42432
+static inline uint16_t fn2rfn(uint32_t fn)
+{
+ return fn % RFN_MODULUS;
+}
+
/* Used to store a C++ class in a llist used by C code */
struct llist_item {
struct llist_head list; /* item used by llist */
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index bbd6821..ae8b56f 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -80,7 +80,7 @@
.ra = ra,
.trx_nr = 0,
.ts_nr = 0,
- .rfn = Fn,
+ .rfn = fn2rfn(Fn),
.qta = qta,
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33119
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib3b5702168195b595711cd0ff32c211b9aba429d
Gerrit-Change-Number: 33119
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: Hoernchen, pespin.
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33118 )
Change subject: pcu_utils.h: Replace software based bitcount impl with gcc builtin
......................................................................
pcu_utils.h: Replace software based bitcount impl with gcc builtin
The cast for different types it's not really needed, simply use the
unsigned long long version to make sure we don't drop 1s, in any case
__builtin_popcountll() will be quicker than what we used to have.
Change-Id: I80ae72d34d53564fc3da1601ee48c8b2ffe79735
---
M src/pcu_utils.h
1 file changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/33118/1
diff --git a/src/pcu_utils.h b/src/pcu_utils.h
index 1c698ca..2dd86ac 100644
--- a/src/pcu_utils.h
+++ b/src/pcu_utils.h
@@ -67,17 +67,10 @@
return fn % GSM_MAX_FN;
}
-#ifdef __cplusplus
-template <typename T>
-inline unsigned int pcu_bitcount(T x)
+inline unsigned int pcu_bitcount(unsigned long long x)
{
- unsigned int count = 0;
- for (count = 0; x; count += 1)
- x &= x - 1;
-
- return count;
+ return __builtin_popcountll(x);
}
-#endif
static inline uint8_t pcu_lsb(uint8_t x)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33118
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I80ae72d34d53564fc3da1601ee48c8b2ffe79735
Gerrit-Change-Number: 33118
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, steviehs.
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/33117 )
Change subject: remsim_client: Fix custom ATR '-a' option
......................................................................
remsim_client: Fix custom ATR '-a' option
So far the option only parsed the hexstring into the atr buffer, but
failed to update the length (from the default value of 2). Also set
atr.len so sending custom ATRs works.
Change-Id: I5deb0a432c05ab0bab5081a2812f6718d4a2ac33
---
M src/client/remsim_client_main.c
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/17/33117/1
diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c
index f7f55e7..372cc92 100644
--- a/src/client/remsim_client_main.c
+++ b/src/client/remsim_client_main.c
@@ -117,6 +117,7 @@
fprintf(stderr, "ATR malformed\n");
exit(2);
}
+ cfg->atr.len = rc;
break;
case 'r':
cfg->atr_ignore_rspro = true;
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/33117
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I5deb0a432c05ab0bab5081a2812f6718d4a2ac33
Gerrit-Change-Number: 33117
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: steviehs <sskrodzki(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: steviehs <sskrodzki(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, pespin, dexter.
Hello Jenkins Builder, laforge, fixeria, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/33119
to look at the new patch set (#2).
Change subject: Use always RFN when handling RACH indications
......................................................................
Use always RFN when handling RACH indications
The previous code was really confusing, passing full FNs as RFNs under
certain external conditions, and then assuming the RFN input of
rfn_to_fn() function could actually be a FN.
As a result, we had a lot of code behaving slightly different depending
on whether the incomding FN from pcuif was filled in by a BSC or a BTS.
Avoid this b ehavior differentiation and always assume the most
restricted one, aka RFN.
Change-Id: Ib3b5702168195b595711cd0ff32c211b9aba429d
---
M src/bts.cpp
M src/bts.h
M src/pcu_l1_if.cpp
M src/pcu_utils.h
M tests/tbf/TbfTest.cpp
5 files changed, 45 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/33119/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33119
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib3b5702168195b595711cd0ff32c211b9aba429d
Gerrit-Change-Number: 33119
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-pcu/+/33121
to look at the new patch set (#2).
Change subject: Derive FN from RFN once and cache it in struct rach_ind_params
......................................................................
Derive FN from RFN once and cache it in struct rach_ind_params
Change-Id: Iaefb9650dfc5083360a4a24b9c17fdbf3115e51f
---
M src/bts.cpp
M src/bts.h
M src/pcu_l1_if.cpp
M tests/tbf/TbfTest.cpp
4 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/33121/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33121
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Iaefb9650dfc5083360a4a24b9c17fdbf3115e51f
Gerrit-Change-Number: 33121
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33121 )
Change subject: Derive FN from RFN once and cache it in struct rach_ind_params
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33121
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Iaefb9650dfc5083360a4a24b9c17fdbf3115e51f
Gerrit-Change-Number: 33121
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 18:40:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria, pespin, dexter.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 )
Change subject: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification
......................................................................
Patch Set 2:
(7 comments)
File library/RLCMAC_CSN1_Templates.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/ecff3a0c_dffa…
PS1, Line 166: utran_target_cell_presence := omit,
> the PRESENCE is used during decoding, not during encoding afaik. […]
Done
File library/RLCMAC_CSN1_Types.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/4252a098_0aec…
PS1, Line 946: fdd_arfcn_presence
> This definition is not entirely correct. Below is my understanding of TS 44.060: […]
I think you are right, there is no closing curly brace after the FDD-ARFCN field. Then everything looks different.
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/2793cb7b_28f8…
PS1, Line 969: utran_cell_list_index
> Actually, this field should also be part of the list. […]
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/2d721537_ae76…
PS1, Line 972: "LENGTHTO(reporting_quantity)"
> Note that `n_3g := 0` means that `reporting_quantity` contains 1 element. […]
Ack
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/17a48fab_4444…
PS1, Line 1001: utran_ba_used
> missing `optional`
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/797716ca_2855…
PS1, Line 1016: BIT1 ba_psi3_presence,
> Add a /* TODO: Rel-8 addition */ here
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/f942bc69_5bd1…
PS1, Line 1030: variant (utran_target_cell) "PRESENCE(arfcn_bsic_presence = '1'B, utran_target_cell_presence = '0'B)"
> I think it may make sense to have the ARFCN+BSIC CSN. […]
Essentially you mean something like in GSM_Types.ttcn:type union RslChanNrU. We would add a union and in that union we would pack a newly added record for geran_target_cell (arfcn,bsic) and utran_target_cell. Each of those records gets a tag field. geran_target_cell gets has a one bit tag, and utran_target_cell a two bit tag field.
And then in
variant "TAG(geran_target_cell, tag = '0'B; utran_target_cell, tag = '01)
Is this what you have in mind?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995
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: I4e1c63c06fb89111765df187a93db563e77c3fc4
Gerrit-Change-Number: 32995
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 18:03:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin, fixeria, dexter.
Hello Jenkins Builder, fixeria, pespin, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/33069
to look at the new patch set (#3).
Change subject: trx TCH DL: transmit invalid speech blocks instead of dummy FACCH
......................................................................
trx TCH DL: transmit invalid speech blocks instead of dummy FACCH
In speech TCH operation, there will always be times when a speech frame
needs to be transmitted on the downlink, but there is no frame available
to transmit (gap in the incoming RTP stream), or the logic of DTXd says
that no frame shall be transmitted at this FN, but we are not doing
physical DTXd. Previous osmo-bts-trx code sent dummy FACCH during such
conditions, but this approach is bad for TCH/HS where we would like to
transmit good speech frames or speech frame gaps one 20 ms frame at a
time, rather than take out pairs of frames for dummy FACCH/H. Other
BTS models (sysmoBTS PHY) send out invalid speech blocks with inverted
CRC3 under the conditions in question - do the same in osmo-bts-trx.
The present change modifies osmo-bts-trx TCH DL frame gap behavior
only for TCH/FS, TCH/HS and TCH/EFS; for all other channel modes,
including AMR speech, the previous behavior of sending dummy FACCH
is left unchanged.
Depends: Iade3310e16b906efb6892d28f474a0d15204e861 (libosmocore)
Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 62 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/69/33069/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe
Gerrit-Change-Number: 33069
Gerrit-PatchSet: 3
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: pespin, fixeria, dexter.
falconia has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 )
Change subject: trx TCH DL: transmit invalid speech blocks instead of dummy FACCH
......................................................................
Patch Set 2:
(2 comments)
File src/osmo-bts-trx/sched_lchan_tchf.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/1c694982_19da4cc7
PS1, Line 500: what is the correct BTS Tx behavior for frame
: * gaps in TCH/AFS
> What we could do though is to add a task in redmine and put the OS#xxxx number next to the fixme.
I just created OS#6049, and will reference it in the next revision of the present patch.
File src/osmo-bts-trx/sched_lchan_tchf.c:
https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/b4c069c0_fe111d41
PS2, Line 479: * speech frame with inverted CRC3, designed to induce a BFI
> Wouldn't it be more clear to call it "speech block"?
I'll change it in the next revision of this patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe
Gerrit-Change-Number: 33069
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:56:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33111 )
Change subject: cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointers
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33111
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I51ebe8174006380821eb978bbd78f600c10b02e7
Gerrit-Change-Number: 33111
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:29:47 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33110 )
Change subject: modem: do not send RTS.ind if we got PTCCH/D
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33110
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1
Gerrit-Change-Number: 33110
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:27:41 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33111 )
Change subject: cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointers
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33111
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I51ebe8174006380821eb978bbd78f600c10b02e7
Gerrit-Change-Number: 33111
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:19:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33114 )
Change subject: BTS_Tests: cosmetic: fix wrong altstep name in a comment
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33114
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: I4e63f309f2a7d22752f7991ebd7e672939d4e52b
Gerrit-Change-Number: 33114
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:15:09 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33103 )
Change subject: stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli
......................................................................
stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli
Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665
---
M src/stream.c
1 file changed, 13 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/stream.c b/src/stream.c
index b3721c5..6afb7ca 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -261,10 +261,10 @@
int sk_domain;
int sk_type;
uint16_t proto;
- int (*connect_cb)(struct osmo_stream_cli *srv);
- int (*disconnect_cb)(struct osmo_stream_cli *srv);
- int (*read_cb)(struct osmo_stream_cli *srv);
- int (*write_cb)(struct osmo_stream_cli *srv);
+ int (*connect_cb)(struct osmo_stream_cli *cli);
+ int (*disconnect_cb)(struct osmo_stream_cli *cli);
+ int (*read_cb)(struct osmo_stream_cli *cli);
+ int (*write_cb)(struct osmo_stream_cli *cli);
void *data;
int flags;
int reconnect_timeout;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665
Gerrit-Change-Number: 33103
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33104 )
Change subject: ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_destroy()
......................................................................
ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_destroy()
This fixes a potential heap-use-after-free error.
When there is still data to be written the osmo_stream_srv_cb() will
call osmo_stream_srv_write() which will try to dereference conn even
though it has already been freed.
Change-Id: I5ac1920b8d4ce3b0205f00d253e7ed878fb745e3
---
M examples/ipa-stream-server.c
1 file changed, 16 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c
index c311697..1ca1aaf 100644
--- a/examples/ipa-stream-server.c
+++ b/examples/ipa-stream-server.c
@@ -1,4 +1,5 @@
/* IPA stream srv example */
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -61,7 +62,7 @@
LOGP(DSTREAMTEST, LOGL_ERROR, "cannot receive message\n");
osmo_stream_srv_destroy(conn);
msgb_free(msg);
- return 0;
+ return -EBADF;
}
if (osmo_ipa_process_msg(msg) < 0) {
LOGP(DSTREAMTEST, LOGL_ERROR, "Bad IPA message\n");
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33104
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I5ac1920b8d4ce3b0205f00d253e7ed878fb745e3
Gerrit-Change-Number: 33104
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33104 )
Change subject: ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_destroy()
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33104
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I5ac1920b8d4ce3b0205f00d253e7ed878fb745e3
Gerrit-Change-Number: 33104
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 31 May 2023 16:14:42 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment