March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... fix bts_cbch_send_one(): use proper RSL Channel Number Currently bts_cbch_send_one() blindly assumes that CBCH is on C0/TS0. According to 3GPP TS 45.002, table 3, it can also be on C0..n/TS0..3. Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Related: SYS#5905 --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/27619/1 diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index c66f743..891edb5 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -202,8 +202,10 @@ { struct bts_smscb_page *page; struct gsm_bts *bts = cstate->bts; + const struct gsm_lchan *cbch_lchan; struct rsl_ie_cb_cmd_type cb_cmd; bool is_extended = false; + uint8_t chan_nr; if (cstate == &bts->cbch_extended) is_extended = true; @@ -240,7 +242,16 @@ default: osmo_panic("SMSCB Page must have 1..4 blocks, not %d\n", page->num_blocks); } - rsl_sms_cb_command(bts, RSL_CHAN_SDCCH4_ACCH, cb_cmd, is_extended, + + /* Get RSL Channel Number for the CBCH logical channel */ + if ((cbch_lchan = gsm_bts_get_cbch(bts)) == NULL) + return; + if (cbch_lchan->ts->pchan_is == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + chan_nr = RSL_CHAN_SDCCH8_ACCH | cbch_lchan->ts->nr; + else + chan_nr = RSL_CHAN_SDCCH4_ACCH; /* always TS0 */ + + rsl_sms_cb_command(bts, chan_nr, cb_cmd, is_extended, page->data, sizeof(page->data)); bts_smscb_page_done(cstate, page); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27617 ) Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 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: Thu, 31 Mar 2022 12:07:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27617 ) Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/27617/1 diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index 1bdf5e7..c66f743 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -246,7 +246,7 @@ bts_smscb_page_done(cstate, page); } -static void bts_cbch_timer(void *data) +static void bts_cbch_timer_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *)data; @@ -259,7 +259,7 @@ /* There is one SMSCB message (page) per eight 51-multiframes, i.e. 1.882 seconds */ void bts_cbch_timer_schedule(struct gsm_bts *bts) { - osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer, bts); + osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer_cb, bts); osmo_timer_schedule(&bts->cbch_timer, 1, 882920); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: VTY: cosmetic: use VTY_IPV46_CMD in the command string

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27615 ) Change subject: VTY: cosmetic: use VTY_IPV46_CMD in the command string ...................................................................... VTY: cosmetic: use VTY_IPV46_CMD in the command string Change-Id: I3088aed936b936d36a550f766031328143481064 --- M src/cbc_vty.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 9a36aa4..24ca1a9 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -347,7 +347,7 @@ } DEFUN(cfg_cbsp_local_ip, cfg_cbsp_local_ip_cmd, - "local-ip (A.B.C.D|X:X::X:X)", + "local-ip " VTY_IPV46_CMD, "Local IP address for CBSP\n" "Local IPv4 address for CBSP\n" "Local IPv6 address for CBSP\n") { @@ -383,7 +383,7 @@ } DEFUN(cfg_ecbe_local_ip, cfg_ecbe_local_ip_cmd, - "local-ip (A.B.C.D|X:X::X:X)", + "local-ip " VTY_IPV46_CMD, "Local IP address for CBSP\n" "Local IPv4 address for ECBE REST Interface\n" "Local IPv6 address for ECBE REST Interface\n") @@ -469,7 +469,7 @@ DEFUN(cfg_peer_remote_ip, cfg_peer_remote_ip_cmd, - "remote-ip (A.B.C.D|X:X::X:X)", + "remote-ip " VTY_IPV46_CMD, "Configure remote IP of peer\n" "Remote IP address of peer\n") { -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3088aed936b936d36a550f766031328143481064 Gerrit-Change-Number: 27615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: VTY: fix incomplete 'remote-ip' command description

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27616 ) Change subject: VTY: fix incomplete 'remote-ip' command description ...................................................................... VTY: fix incomplete 'remote-ip' command description Change-Id: I2f98285bda4a482ac1af04f71eafa19daee5137f --- M src/cbc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 24ca1a9..f0c34d6 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -471,7 +471,7 @@ DEFUN(cfg_peer_remote_ip, cfg_peer_remote_ip_cmd, "remote-ip " VTY_IPV46_CMD, "Configure remote IP of peer\n" - "Remote IP address of peer\n") + "IPv4 address of peer\n" "IPv6 address of peer\n") { struct cbc_peer *peer = (struct cbc_peer *) vty->index; osmo_talloc_replace_string(peer, &peer->remote_host, argv[0]); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I2f98285bda4a482ac1af04f71eafa19daee5137f Gerrit-Change-Number: 27616 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: doc/examples: make osmo-cbc.cfg file more informative

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27614 ) Change subject: doc/examples: make osmo-cbc.cfg file more informative ...................................................................... doc/examples: make osmo-cbc.cfg file more informative This example is not any better than just using '-c /dev/null'. Add some default parameters taken from 'show running-config'. Change-Id: I6dca38a2220c32fad96237d7522a300f12b4469e --- M doc/examples/osmo-cbc/osmo-cbc.cfg 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/examples/osmo-cbc/osmo-cbc.cfg b/doc/examples/osmo-cbc/osmo-cbc.cfg index dae31e3..0b66996 100644 --- a/doc/examples/osmo-cbc/osmo-cbc.cfg +++ b/doc/examples/osmo-cbc/osmo-cbc.cfg @@ -1,3 +1,11 @@ log stderr logging level cbsp debug +cbc + unknown-peers reject + cbsp + local-ip 127.0.0.1 + local-port 48049 + ecbe + local-ip 127.0.0.1 + local-port 12345 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6dca38a2220c32fad96237d7522a300f12b4469e Gerrit-Change-Number: 27614 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: VTY: fix incomplete 'remote-ip' command description

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27616 ) Change subject: VTY: fix incomplete 'remote-ip' command description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I2f98285bda4a482ac1af04f71eafa19daee5137f Gerrit-Change-Number: 27616 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, 30 Mar 2022 20:57:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: VTY: cosmetic: use VTY_IPV46_CMD in the command string

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27615 ) Change subject: VTY: cosmetic: use VTY_IPV46_CMD in the command string ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3088aed936b936d36a550f766031328143481064 Gerrit-Change-Number: 27615 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, 30 Mar 2022 20:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-cbc[master]: doc/examples: make osmo-cbc.cfg file more informative

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/27614 ) Change subject: doc/examples: make osmo-cbc.cfg file more informative ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/27614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6dca38a2220c32fad96237d7522a300f12b4469e Gerrit-Change-Number: 27614 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, 30 Mar 2022 20:56:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-pcu[master]: Fix assert hit if connecting to SGSN fails

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27613 ) Change subject: Fix assert hit if connecting to SGSN fails ...................................................................... Fix assert hit if connecting to SGSN fails """ DLBSSGP ERROR gprs_bssgp_pcu.c:1278 Failed to connect! DL1IF ERROR pcu_l1_if.cpp:827 No NSVC available to connect to the SGSN! DRLCMAC INFO pdch.cpp:185 PDCH(bts=0,trx=0,ts=0) PDCH state: disabled => disabled Assert failed m_is_enabled == 1 pdch.cpp:186 """ Change-Id: I36dc64fa807091bf2b565417c1185c4cb399932b --- M src/pcu_l1_if.cpp 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index d5672e5..d0698d9 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -731,7 +731,8 @@ for (trx_nr = 0; trx_nr < ARRAY_SIZE(bts->trx); trx_nr++) { bts->trx[trx_nr].arfcn = info_ind->trx[trx_nr].arfcn; for (ts_nr = 0; ts_nr < ARRAY_SIZE(bts->trx[0].pdch); ts_nr++) - bts->trx[trx_nr].pdch[ts_nr].disable(); + if (bts->trx[trx_nr].pdch[ts_nr].is_enabled()) + bts->trx[trx_nr].pdch[ts_nr].disable(); } gprs_bssgp_destroy(bts); exit(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I36dc64fa807091bf2b565417c1185c4cb399932b Gerrit-Change-Number: 27613 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-MessageType: merged

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022