pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38649?usp=email )
Change subject: lb: Avoid using osmo_ss7_instance private field
......................................................................
lb: Avoid using osmo_ss7_instance private field
We know the id because we just found/created it base don that id, so
simply use it instead of accessing the library object field.
Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67
---
M src/osmo-bsc/lb.c
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c
index 511a545..6743dba 100644
--- a/src/osmo-bsc/lb.c
+++ b/src/osmo-bsc/lb.c
@@ -450,13 +450,13 @@
OSMO_SCCP_SSN_SMLC_BSSAP_LE);
/* Set up SCCP user and one ASP+AS */
- snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", cs7_inst->cfg.id, osmo_ss7_asp_protocol_name(used_proto));
+ snprintf(inst_name, sizeof(inst_name), "Lb-%u-%s", bsc_gsmnet->smlc->cs7_instance, osmo_ss7_asp_protocol_name(used_proto));
LOGP(DLCS, LOGL_NOTICE, "Initializing SCCP connection for Lb/%s on cs7 instance %u\n",
- osmo_ss7_asp_protocol_name(used_proto), cs7_inst->cfg.id);
+ osmo_ss7_asp_protocol_name(used_proto), bsc_gsmnet->smlc->cs7_instance);
/* SS7 Protocol stack */
default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC);
- sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, cs7_inst->cfg.id, inst_name,
+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_bsc_ctx, bsc_gsmnet->smlc->cs7_instance, inst_name,
default_pc, used_proto,
0, DEFAULT_ASP_LOCAL_IP,
0, DEFAULT_ASP_REMOTE_IP);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38649?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib6d1f4898eb0a804ebda527fdd876d2ca4ec1e67
Gerrit-Change-Number: 38649
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: JPM, dexter, laforge.
fixeria has posted comments on this change by JPM. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email )
Change subject: Fixing 3-digit MNC PlmnAdapter encoding and decoding. Adding test_plmn_adapter.
......................................................................
Patch Set 1:
(3 comments)
Commit Message:
https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/78600974_5506… :
PS1, Line 8: Adding test_plmn_adapter.
Commit summary should be one line followed by an empty line. I would remove this one.
https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/f9f6255f_c988… :
PS1, Line 10: Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376
Add `Related: pysim.git Ib2b586cb570dbe74a617c45c0fca276b08bb075e`
File src/osmocom/construct.py:
https://gerrit.osmocom.org/c/python/pyosmocom/+/38687/comment/2844c233_cb5a… :
PS1, Line 265: """convert a bytes(3) type to BCD string like 262-02 or 262-002."""
Let's add spec. reference here? 3GPP TS 24.008 which section?
--
To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38687?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: python/pyosmocom
Gerrit-Branch: master
Gerrit-Change-Id: I3811b227d629bd4e051a480c9622967e31f8a376
Gerrit-Change-Number: 38687
Gerrit-PatchSet: 1
Gerrit-Owner: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: JPM <jean-pierre.marcotte.1(a)ens.etsmtl.ca>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 08 Nov 2024 11:50:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email
to look at the new patch set (#2).
Change subject: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
......................................................................
l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
lchan->abis_ip.rtp_socket is NULL before the BSC indicates the RTP
parameters using the CRCX/MDCX procedures. send_ul_rtp_packet()
does check lchan->abis_ip.rtp_socket against NULL before calling
osmo_rtp_send_frame_ext(), so should send_ul_rtp_packet_hrdata().
Take a chance to make send_ul_rtp_packet_hrdata() more consistent
with the send_ul_rtp_packet() by reordering code a bit.
Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a
Fixes: 59686cd27 ("CSD: implement half-rate modes correctly")
Related: OS#6618
---
M src/common/l1sap.c
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/38697/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a
Gerrit-Change-Number: 38697
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?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: bts: add TC_data_facch_*: test FACCH/[FH] on data channels
......................................................................
bts: add TC_data_facch_*: test FACCH/[FH] on data channels
So far we have been testing the actual traffic of TCH/[FH] in data
mode (CSD), but not FACCH/[FH]. Add separate testcases for that.
Half-rate variants of the new testcases crash osmo-bts-trx, so
comment them out in the control section until the problem is fixed.
Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148
Related: OS#6618
---
M bts/BTS_Tests.ttcn
M bts/expected-results.xml
2 files changed, 129 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/38696/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148
Gerrit-Change-Number: 38696
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email )
Change subject: l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
......................................................................
l1sap: make send_ul_rtp_packet_hrdata() NULL-safe
lchan->abis_ip.rtp_socket is NULL before the BSC indicates the RTP
parameters using the CRCX/MDCX procedures. send_ul_rtp_packet()
does check lchan->abis_ip.rtp_socket against NULL before calling
osmo_rtp_send_frame_ext(), so should send_ul_rtp_packet_hrdata().
Take a chance to make send_ul_rtp_packet_hrdata() more consistent
with the send_ul_rtp_packet() by reordering code a bit.
Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a
Related: OS#6618
---
M src/common/l1sap.c
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/38697/1
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 06ab051..dc83e77 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -2097,7 +2097,7 @@
if (lchan->abis_ip.osmux.use) {
lchan_osmux_send_frame(lchan, rtp_pl, rtp_pl_len,
fn_ms_adj(fn, lchan), lchan->rtp_tx_marker);
- } else if (lchan->abis_ip.rtp_socket) {
+ } else if (lchan->abis_ip.rtp_socket != NULL) {
osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket,
rtp_pl, rtp_pl_len, fn_ms_adj(fn, lchan), lchan->rtp_tx_marker);
rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL);
@@ -2116,14 +2116,15 @@
{
struct gsm_bts *bts = lchan->ts->trx->bts;
- rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL);
- if (lchan->rtp_tx_marker)
- rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER);
-
- osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket,
- rtp_pl, rtp_pl_len,
- GSM_RTP_DURATION,
- lchan->rtp_tx_marker);
+ if (lchan->abis_ip.rtp_socket != NULL) {
+ osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket,
+ rtp_pl, rtp_pl_len,
+ GSM_RTP_DURATION,
+ lchan->rtp_tx_marker);
+ rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL);
+ if (lchan->rtp_tx_marker)
+ rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER);
+ }
/* Only clear the marker bit once we have sent a RTP packet with it */
lchan->rtp_tx_marker = false;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38697?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I05d88a739dc54ca68e50d20b2d0d0b097ae8ca4a
Gerrit-Change-Number: 38697
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email
to look at the new patch set (#2).
Change subject: bts: add TC_data_facch_*: test FACCH/[FH] on data channels
......................................................................
bts: add TC_data_facch_*: test FACCH/[FH] on data channels
So far we have been testing the actual traffic of TCH/[FH] in data
mode (CSD), but not FACCH/[FH]. Add separate testcases for that.
Half-rate variants of the new testcases crash osmo-bts-trx, so
comment them out in the control section until the problem is fixed.
Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148
Related: OS#6618
---
M bts/BTS_Tests.ttcn
M bts/expected-results.xml
2 files changed, 126 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/38696/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38696?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2098ccd651fc2a81f62e70be64af386ab0ca6148
Gerrit-Change-Number: 38696
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38694?usp=email )
Change subject: bts: use proper ActType in f_TC_data_rtp_loopback()
......................................................................
bts: use proper ActType in f_TC_data_rtp_loopback()
For the sake of correctness, use c_RSL_IE_ActType_ASS (assignment)
when activating TCH/[FH] channels in TC_data_rtp_*. This is the
kind of ActType that would normally be used by the BSC.
Change-Id: Ide773c3fcfdab881756d5fe5b6c314b0c0335043
---
M bts/BTS_Tests.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/38694/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 64804f5..a98b7f3 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8647,7 +8647,7 @@
/* Tune to the dedicated channel */
f_l1_tune(L1CTL);
- f_est_dchan();
+ f_est_dchan(act_type := c_RSL_IE_ActType_ASS);
/* Send a pseudo-random data frame on the Uplink */
log("Sending Uplink TCH (len=", lengthof(udata), "): ", udata);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38694?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ide773c3fcfdab881756d5fe5b6c314b0c0335043
Gerrit-Change-Number: 38694
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>