dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/32386 )
Change subject: proto_clnt: close osmo-e1d control socket on connection loss
......................................................................
proto_clnt: close osmo-e1d control socket on connection loss
When osmo-e1d is terminated the socket file descriptor on the client
side will get permanent POLLHUP events. This means that the registered
callback gets called with flags OSMO_FD_READ but the received data will
be of length zero. We must detect this situations and close the file
descriptor on connection loss. Otherwise we would get called over and
over again in an endless loop, resulting in 100% CPU usage.
Related OS#5983
Change-Id: Ib849e0ec1a1cca77eb588076d1d2201594b5c568
---
M src/proto_clnt.c
1 file changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/86/32386/1
diff --git a/src/proto_clnt.c b/src/proto_clnt.c
index c703432..5b9a467 100644
--- a/src/proto_clnt.c
+++ b/src/proto_clnt.c
@@ -88,8 +88,12 @@
struct osmo_e1dp_msg_hdr *hdr;
msgb = osmo_e1dp_recv(ofd, NULL);
- if (!msgb)
+ if (!msgb) {
+ LOGP(DE1D, LOGL_ERROR, "Lost connection with osmo-e1d control socket.\n");
+ close(ofd->fd);
+ ofd->fd = 0;
goto err;
+ }
hdr = msgb_l1(msgb);
if ((hdr->type & E1DP_TYPE_MSK) != E1DP_EVT_TYPE)
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/32386
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: Ib849e0ec1a1cca77eb588076d1d2201594b5c568
Gerrit-Change-Number: 32386
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: neels, daniel, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32291 )
Change subject: sigtran: Update supported xUA Traffic modes
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
This patch has been waiting here for an entire week without any reviews?
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32291
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I22110440e23faa7facaa5bcd0d57b3a6ef24d4a7
Gerrit-Change-Number: 32291
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 20 Apr 2023 12:13:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32348 )
Change subject: ms: Fix MS without PTMSI not freed immediatelly
......................................................................
ms: Fix MS without PTMSI not freed immediatelly
This check (tlli != 0) was added in 2015 in
6d86628e5b6d81afae4ca1f24201ee90bfab1c2a, with the rationale below:
"""
To avoid dangling entries without a TLLI there (which cannnot be
retrieved anyway), the timer in the MS objects is not started after
all TBF have been detached, so that they get deleted immediately in
that case.
"""
The rationale makes sense, but through time the MS class was fixed to
return GSM_RESERVED_TMSI (0xFFFFFFFF) when no TMSI was available.
Hence, the check was wrong, and as a result, free() of MS containing
GSM_RESERVED_TMSI would be delayed over time by release timer.
Related: OS#6002
Change-Id: I7a694a30f8709c00af774846d7c4925cef253a71
---
M src/gprs_ms.c
M tests/app_info/AppInfoTest.err
2 files changed, 38 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 7ecaae4..52ea431 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -229,9 +229,20 @@
static void ms_release_timer_start(struct GprsMs *ms)
{
+ /* Immediate free():
+ * Skip delaying free() through release timer if delay is configured to be 0.
+ * This is useful for synced freed during unit tests.
+ */
if (ms->delay == 0)
return;
+ /* Immediate free():
+ * Skip delaying free() through release timer if TMSI is not
+ * known, since those cannot really be reused.
+ */
+ if (ms_tlli(ms) == GSM_RESERVED_TMSI)
+ return;
+
LOGPMS(ms, DRLCMAC, LOGL_DEBUG, "Schedule MS release in %u secs\n", ms->delay);
if (!ms->timer.data)
@@ -384,9 +395,7 @@
if (!ms->dl_tbf && !ms->ul_tbf) {
ms_set_reserved_slots(ms, NULL, 0, 0);
ms->first_common_ts = NULL;
-
- if (ms_tlli(ms) != 0)
- ms_release_timer_start(ms);
+ ms_release_timer_start(ms);
}
ms_update_status(ms);
diff --git a/tests/app_info/AppInfoTest.err b/tests/app_info/AppInfoTest.err
index 3624250..b555f72 100644
--- a/tests/app_info/AppInfoTest.err
+++ b/tests/app_info/AppInfoTest.err
@@ -61,9 +61,9 @@
PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 2 TBFs, USFs = 00, TFIs = 00000003.
PDCH(bts=0,trx=0,ts=7) Detaching TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000001.
MS(TA-220:MSCLS-10-11) Detaching TBF: TBF(DL:TFI-0-0-0:STATE-NEW:EGPRS)
+MS(TA-220:MSCLS-10-11) Destroying MS object
PDCH(bts=0,trx=0,ts=4) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
PDCH(bts=0,trx=0,ts=5) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
PDCH(bts=0,trx=0,ts=6) Detaching TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS), 1 TBFs, USFs = 00, TFIs = 00000002.
MS(TA-220:MSCLS-12-13) Detaching TBF: TBF(DL:TFI-0-0-1:STATE-NEW:EGPRS)
MS(TA-220:MSCLS-12-13) Destroying MS object
-MS(TA-220:MSCLS-10-11) Destroying MS object
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32348
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I7a694a30f8709c00af774846d7c4925cef253a71
Gerrit-Change-Number: 32348
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>
Gerrit-MessageType: merged
Attention is currently required from: laforge, dexter.
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32374 )
Change subject: e1d: reconnect to osmo-e1d after connection loss
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> I'm wondering why this is implemented in libosmo-abis, and not in libosmo-e1d? Isn't the same probl […]
I suppose because the issue being attended to here was observed and reported in libosmo-abis using applications.
Does it take much more work to move this to libosmo-e1d? If so then maybe we should attend to the issue here, if not I'll wait for a libosmo-e1d patch to review.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338
Gerrit-Change-Number: 32374
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: keith <keith(a)rhizomatica.org>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 20 Apr 2023 10:36:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368 )
Change subject: bsc: TC_assignment_csd: test non-transp data rates
......................................................................
Patch Set 3:
(1 comment)
File bsc/BSC_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368/comment/6be903a1_bde1…
PS2, Line 1891: f_tc_assignment_csd("NT_43k5", GSM0808_DATA_RATE_NON_TRANSP_43k5, false);
: f_tc_assignment_csd("NT_29k0", GSM0808_DATA_RATE_NON_TRANSP_29k0, false);
> likewise here, please don't test for multi-slot CSD whihc we neither support, nor have in scope to i […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368
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: I2dce9486f3528a79bdea09bdbc1f02833e6bedc0
Gerrit-Change-Number: 32368
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 20 Apr 2023 09:07:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365 )
Change subject: bsc: TC_assignment_csd: test more transp data rates
......................................................................
Patch Set 3:
(1 comment)
File bsc/BSC_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365/comment/1b5a4460_aef2…
PS2, Line 1875: f_tc_assignment_csd("T_32k0", GSM0808_DATA_RATE_TRANSP_32k0);
: f_tc_assignment_csd("T_28k8", GSM0808_DATA_RATE_TRANSP_28k8);
> please don't test rates we cannot support without the complexity of a mulit-slot HSCSD assignment, w […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32365
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: I9a5f0e630fefcafb1b26eabba73de7e76d9e7e5d
Gerrit-Change-Number: 32365
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(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: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 20 Apr 2023 09:07:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: laforge.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32369 )
Change subject: CSD: support non-transparent data rates
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/32369/comment/c0a6d703_32c43bf1
PS1, Line 459: GSM48_CMODE_DATA_43k5
> same as last commit: you cannot do more than 14k4 (NT) or 14k5 (T) in a single TCH/F.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32369
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib5f4bdf17a9833f65a0b623a033da838a2594d68
Gerrit-Change-Number: 32369
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Thu, 20 Apr 2023 09:06:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368
to look at the new patch set (#3).
Change subject: bsc: TC_assignment_csd: test non-transp data rates
......................................................................
bsc: TC_assignment_csd: test non-transp data rates
Related: OS#4393
Change-Id: I2dce9486f3528a79bdea09bdbc1f02833e6bedc0
---
M bsc/BSC_Tests.ttcn
1 file changed, 23 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/32368/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32368
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: I2dce9486f3528a79bdea09bdbc1f02833e6bedc0
Gerrit-Change-Number: 32368
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset