Attention is currently required from: msuraev.
Hello Jenkins Builder, laforge, pespin, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/31664
to look at the new patch set (#2).
Change subject: layer23: get rid of lapdm_channel_init() warning
......................................................................
layer23: get rid of lapdm_channel_init() warning
Change-Id: If3be53a9f20e0f9e7cfb9ccd04ed54a3dcde44b8
---
M src/host/layer23/include/osmocom/bb/common/ms.h
M src/host/layer23/src/common/ms.c
M src/host/layer23/src/mobile/app_mobile.c
3 files changed, 33 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/31664/2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31664
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: If3be53a9f20e0f9e7cfb9ccd04ed54a3dcde44b8
Gerrit-Change-Number: 31664
Gerrit-PatchSet: 2
Gerrit-Owner: msuraev <msuraev(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: msuraev <msuraev(a)sysmocom.de>
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31686 )
Change subject: pcu_sock: fix PCU socket accept behavior
......................................................................
pcu_sock: fix PCU socket accept behavior
When a new PCU connection is accepted while the old connection is still
present, then the new connection should replace the old one. At the
moment we disable the active connection and close the one, which
leaves us with no connection at all.
Change-Id: I6ebc40e13d7dd4707c9f81fa8732ccedbfc862ec
---
M src/osmo-bsc/pcu_sock.c
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/86/31686/1
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 7160210..0a2879b 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -927,7 +927,7 @@
LOG_BTS(bts, DPCU, LOGL_NOTICE, "PCU connects but we already have another active connection ?!?\n");
/* We already have one PCU connected, this is all we support */
osmo_fd_read_disable(&state->listen_bfd);
- close(fd);
+ close(conn_bfd->fd);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31686
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6ebc40e13d7dd4707c9f81fa8732ccedbfc862ec
Gerrit-Change-Number: 31686
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31687 )
Change subject: pcu_sock: only allow Ericsson RBS to connect to external PCU
......................................................................
pcu_sock: only allow Ericsson RBS to connect to external PCU
Lets make sure that only Ericsson RBS BTSs can connect to an external
PCU. Since we then can be sure that only BTSs with BSC co-located PCU
support have PCU connections we can use this to distinguish the two BTS
variants and we can get rid of all later checks.
Change-Id: I18d190d661b06015419078382915c4606be01b04
---
M src/osmo-bsc/pcu_sock.c
1 file changed, 23 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/87/31687/1
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index 52e19ba..eae9383 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -63,10 +63,6 @@
{
struct pcu_sock_state *state = bts->pcu_state;
- /* BSC co-located PCU is only supported for Ericsson RBS */
- if (!is_ericsson_bts(bts))
- return false;
-
if (!state)
return false;
if (state->conn_bfd.fd <= 0)
@@ -361,13 +357,8 @@
__attribute__((weak)) void pcu_info_update(struct gsm_bts *bts)
{
if (pcu_connected(bts)) {
- /* In cases where the CCU is connected via an E1 line, we transmit the connection parameters for the
- * PDCH before we announce the other BTS related parameters. At the moment Ericsson RBS is the only
- * E1 BTS we support and also the only BTS we support with a BSC co-located-pcu */
- if (is_ericsson_bts(bts)) {
- pcu_tx_e1_ccu_ind(bts);
- pcu_tx_info_ind(bts);
- }
+ pcu_tx_e1_ccu_ind(bts);
+ pcu_tx_info_ind(bts);
}
}
@@ -782,8 +773,7 @@
osmo_fd_read_enable(&state->listen_bfd);
/* Disable all PDCHs on all BTSs that are served by the PCU */
- if (is_ericsson_bts(bts))
- pdch_deact_bts(bts);
+ pdch_deact_bts(bts);
/* flush the queue */
while (!llist_empty(&state->upqueue)) {
@@ -956,8 +946,7 @@
LOG_BTS(bts, DPCU, LOGL_NOTICE, "PCU socket connected to external PCU\n");
/* Activate all PDCHs on all BTSs that are served by the PCU */
- if (is_ericsson_bts(bts))
- pdch_act_bts(bts);
+ pdch_act_bts(bts);
return 0;
}
@@ -969,6 +958,11 @@
struct osmo_fd *bfd;
int rc;
+ /* At the moment Ericsson RBS is the only BTS that supports a BSC co-located PCU, do not allow other BTS models
+ * to establish a connection to an external PCU. */
+ if (!is_ericsson_bts(bts))
+ return -EINVAL;
+
state = talloc_zero(NULL, struct pcu_sock_state);
if (!state)
return -ENOMEM;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31687
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I18d190d661b06015419078382915c4606be01b04
Gerrit-Change-Number: 31687
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels, fixeria.
Hello Jenkins Builder, neels, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31497
to look at the new patch set (#12).
Change subject: pcu_sock: activate/deactivate PDCH on pcu reconnect
......................................................................
pcu_sock: activate/deactivate PDCH on pcu reconnect
When the PCU is disconnected while the BSC keeps running the PDCH should
be closed. Also the PDCH should be reopened when the PCU is
reconnected.
Change-Id: I9ea0c53a5e68a51c781ef43bae71f947cdb95678
Related: OS#5198
---
M doc/timeslot.msc
M include/osmocom/bsc/pcu_if.h
M include/osmocom/bsc/timeslot_fsm.h
M src/osmo-bsc/pcu_sock.c
M src/osmo-bsc/timeslot_fsm.c
5 files changed, 116 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/31497/12
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31497
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I9ea0c53a5e68a51c781ef43bae71f947cdb95678
Gerrit-Change-Number: 31497
Gerrit-PatchSet: 12
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, laforge, pespin.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31618
to look at the new patch set (#6).
Change subject: pcu_sock: handle multiple BTSs with multiple BSC co-located PCUs
......................................................................
pcu_sock: handle multiple BTSs with multiple BSC co-located PCUs
The current implementation can only use one BTS with a BSC co-located
PCU even though the parts of the code (see bsc_vty.c) are programmed
with the idea in mind to use one PCU for each BTS. Lets finish this and
associate one BSC co-located PCU process per BTS.
Related: OS#5198
Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b
---
M include/osmocom/bsc/pcu_if.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 65 insertions(+), 44 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/31618/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b
Gerrit-Change-Number: 31618
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, dexter.
Hello Jenkins Builder, laforge, pespin, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31578
to look at the new patch set (#11).
Change subject: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
......................................................................
pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
When the IMMEDIATE ASSIGNMENT is sent from the PCU to the BSC using the
"direct TLLI" method, the TLLI (and the last three digits of the IMSI)
is prepended to the MAC block. Currently we are taking the fields apart
manually using offsets. The code for this is difficult to read and the
method is error prone. Let's define a struct that we can just overlay
to access the fields directly. Let's also transfer the full IMSI.
Change-Id: Id6acbd243adf26169e5e8319dd66bb68dd6a3c22
Related: OS#5198
---
M include/osmocom/bsc/pcuif_proto.h
M src/osmo-bsc/pcu_sock.c
2 files changed, 38 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/31578/11
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31578
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id6acbd243adf26169e5e8319dd66bb68dd6a3c22
Gerrit-Change-Number: 31578
Gerrit-PatchSet: 11
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-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: neels, laforge, pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31618 )
Change subject: pcu_sock: handle multiple BTSs with multiple BSC co-located PCUs
......................................................................
Patch Set 6:
(10 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/6d9ced58_61673261
PS5, Line 15: RBS) are configured.
> how about an osmo-bsc with one Ericsson RBS co-located, and then a bunch of other types of BTS with […]
It shouldn't disturb other (ip Access) BTSs. (see my comment above)
Patchset:
PS5:
> pau, can you point out the place? i don't see it...
The commit message was not updated. It now should support multiple Ericsson BTS along with other BTSs. It doesn't break other BTSs since the we filter for Ericsson BTSs before we send any update to the PCU. We also filter when we activate/deactivate the PDCH on PCU reconnects.
File src/osmo-bsc/pcu_sock.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/a4f2103a_4a9892a7
PS5, Line 367: pcu_tx_info_ind(bts);
> @neels: here pcu_tx_info_ind is inly called for ericsson bts now.
That is correct. We must not send any info indications to the PCU for BTSs that have a built in PCU. However in a follow up patch I will change this so that it only relies on pcu_connected() since BTSs with built in PCU must not be able to accept connections from a BSC co located PCU anyway.
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/53363abf_26e7aa92
PS5, Line 810: llist_for_each_entry(bts, &state->net->bts_list, list) {
> could there be several RBS with several separate co-located PCUs, each with their own pcu_sock? This […]
(see comment below)
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/99071479_17e1c76c
PS5, Line 960: rc
> (would prefer if the return val were named 'fd', because 'man accept' says […]
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/333db815_734e64e8
PS5, Line 960:
> (unusual whitespace after the type cast brace)
Done
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/fe33bcfd_64f5eb23
PS5, Line 966: if (conn_bfd->fd >= 0) {
> should this check happen before accept(), so we don't even accept a new connection when there alread […]
(see below)
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/802b5202_43cb366c
PS5, Line 969: osmo_fd_read_disable(&state->listen_bfd);
> so this disables the other active connection??
This is borrowed from osmo-bts. To me this looks like a bug. conn_bfd->fd should be closed instead so that the new connection replaces the old one. I have also fixed this in osmo-bts now.
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/2e7be381_9fd629a2
PS5, Line 986: llist_for_each_entry(bts, &state->net->bts_list, list) {
> same question as above, pcu to bts relation is 1:1 or 1:N? I guess you should pass the bts pointer t […]
Thanks. This makes sense. I also found that the VTY code already allows one socket path per BTS but the status struct had only a pointer to net. Yes, we can just use a backpointer to the BTS in the status struct and we will have one PCU connection per BTS (1:1) and that also means we can run as many Ericsson BTSs we want in parallel, each one with its individual PCU.
https://gerrit.osmocom.org/c/osmo-bsc/+/31618/comment/fd69d95f_1fdba550
PS5, Line 1032: bts->pcu_state = state;
> here it is pcu to bts relation 1:1?
Thats correct. (see comment above)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I0b42c2c130106f6ffca2dd08d079e1a7bda41f0b
Gerrit-Change-Number: 31618
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 06 Mar 2023 15:47:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels, laforge.
Hello Jenkins Builder, neels, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31597
to look at the new patch set (#7).
Change subject: pcuif_proto: increment version number
......................................................................
pcuif_proto: increment version number
The co-located PCU support for Ericsson RBS E1 CCU made it necessary to
add new features to the PCU socket interface, so let's increase the
version number.
Change-Id: I8315bd67c7f3eb0d7ee71b64cd4dff889a84fcf1
Depends: osmo-pcu.git I2a78651593323e8b9627c39918d949a33497b70f
Related: OS#5198
---
M include/osmocom/bsc/pcuif_proto.h
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/31597/7
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31597
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I8315bd67c7f3eb0d7ee71b64cd4dff889a84fcf1
Gerrit-Change-Number: 31597
Gerrit-PatchSet: 7
Gerrit-Owner: dexter <pmaier(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: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newpatchset