Attention is currently required from: laforge, pespin, keith.
dexter 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 12:
(5 comments)
File src/input/e1d.c:
https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/902eb91d_934437dd
PS11, Line 340: osmo_fsm
> the question to me is if we really want to call this on every "short read", or just in case of ret < […]
I think this makes sense (but I wonder what happens if we do not get a complete D_TSX_ALLOC_SIZE chunk. This means we would lose the incompletely read chunk?)
https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/1f8961ed_660dcb97
PS11, Line 391: osmo_fsm
> likewise here, a SOCK_STREAM socket might in theory do a successful write of any size, if the socket […]
Done
https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/41a13cb0_5a6b5772
PS11, Line 414: osmo_fsm
> same as above
Done
https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/86787c9b_06a19796
PS11, Line 451: osmo_fsm
> here I think the existing implementation is OK, as a HDLC socket is an E1_TS_MODE_HDLCFCS socket, wh […]
Yes, makes sense.
https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/29076305_5c9dff39
PS11, Line 476: osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line);
> I'm not sure about the exact semantics of SOCK_SEQPACKET here, but I would assume that a zero-length […]
Yes, I think so too. (I have now changed the if above)
--
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: 12
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-CC: pespin <pespin(a)sysmocom.de>
Gerrit-CC: tnt <tnt(a)246tNt.com>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Wed, 10 May 2023 11:03:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32678 )
Change subject: all models, FR/EFR UL: change SID check to _is_any_sid()
......................................................................
all models, FR/EFR UL: change SID check to _is_any_sid()
In all OsmoBTS models in FR and EFR speech modes, as the UL traffic
frame stream is passed from the PHY to l1sap and ultimately to RTP
output, all passed frames are checked for SID. The Boolean result
of this SID check is used in two ways:
* RFC 3551 instructs that the Marker bit in the RTP header SHOULD be
set in the first packet of a talkspurt after a period of silence
suppression. OsmoBTS implements this recommendation by setting
the Marker bit in the first RTP-transmitted non-SID UL packet
that was preceded by SID.
* In osmo-bts-trx only, this same SID check serves a second purpose:
handling of BFI conditions depends on whether or not the last received
good traffic frame was a SID. If a BFI condition is received after
a non-SID traffic frame, the ECU is invoked, and if this ECU fails
or when libosmocodec does not provide an ECU for the codec in use,
a special FR (EFR) BFI frame of 260 (244) zero bits is emitted.
Both the ECU call and the peculiar form of BFI are skipped when the
last received good traffic frame was a SID.
For both of the above purposes, in all BTS models, change the SID check
from osmo_{fr,efr}_check_sid() to osmo_{fr,efr}_is_any_sid(). The
effect of this change is that "what counts as a SID" for the just-listed
purposes changes from recognizing only perfectly uncorrupted SID frames
without any bit errors to recognizing all frames which the rules of
GSM 06.31 (FR) or 06.81 (EFR) classify as either valid or invalid SID.
Change-Id: I5c24b379deda8ae551f9924d10770da50e6acbbd
---
M src/osmo-bts-lc15/tch.c
M src/osmo-bts-oc2g/tch.c
M src/osmo-bts-sysmo/tch.c
M src/osmo-bts-trx/sched_lchan_tchf.c
4 files changed, 44 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/osmo-bts-lc15/tch.c b/src/osmo-bts-lc15/tch.c
index fdbf995..56c56ca 100644
--- a/src/osmo-bts-lc15/tch.c
+++ b/src/osmo-bts-lc15/tch.c
@@ -68,7 +68,7 @@
cur = msgb_put(msg, GSM_FR_BYTES);
memcpy(cur, l1_payload, GSM_FR_BYTES);
- lchan_set_marker(osmo_fr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_fr_is_any_sid(l1_payload), lchan);
return msg;
}
@@ -102,7 +102,7 @@
cur = msgb_put(msg, GSM_EFR_BYTES);
memcpy(cur, l1_payload, GSM_EFR_BYTES);
- lchan_set_marker(osmo_efr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_efr_is_any_sid(l1_payload), lchan);
return msg;
}
diff --git a/src/osmo-bts-oc2g/tch.c b/src/osmo-bts-oc2g/tch.c
index fce100f..491e736 100644
--- a/src/osmo-bts-oc2g/tch.c
+++ b/src/osmo-bts-oc2g/tch.c
@@ -68,7 +68,7 @@
cur = msgb_put(msg, GSM_FR_BYTES);
memcpy(cur, l1_payload, GSM_FR_BYTES);
- lchan_set_marker(osmo_fr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_fr_is_any_sid(l1_payload), lchan);
return msg;
}
@@ -102,7 +102,7 @@
cur = msgb_put(msg, GSM_EFR_BYTES);
memcpy(cur, l1_payload, GSM_EFR_BYTES);
- lchan_set_marker(osmo_efr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_efr_is_any_sid(l1_payload), lchan);
return msg;
}
diff --git a/src/osmo-bts-sysmo/tch.c b/src/osmo-bts-sysmo/tch.c
index 5039cc4..0109771 100644
--- a/src/osmo-bts-sysmo/tch.c
+++ b/src/osmo-bts-sysmo/tch.c
@@ -77,7 +77,7 @@
cur[0] |= 0xD0;
#endif /* USE_L1_RTP_MODE */
- lchan_set_marker(osmo_fr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_fr_is_any_sid(l1_payload), lchan);
return msg;
}
@@ -132,7 +132,7 @@
cur[0] |= 0xC0;
#endif /* USE_L1_RTP_MODE */
- lchan_set_marker(osmo_efr_check_sid(l1_payload, payload_len), lchan);
+ lchan_set_marker(osmo_efr_is_any_sid(l1_payload), lchan);
return msg;
}
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index da4a475..6d6fb0b 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -146,12 +146,12 @@
case GSM48_CMODE_SPEECH_V1: /* FR */
rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0, &n_errors, &n_bits_total);
if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */
- lchan_set_marker(osmo_fr_check_sid(tch_data, rc), lchan); /* DTXu */
+ lchan_set_marker(osmo_fr_is_any_sid(tch_data), lchan); /* DTXu */
break;
case GSM48_CMODE_SPEECH_EFR: /* EFR */
rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 1, &n_errors, &n_bits_total);
if (rc == GSM_EFR_BYTES) /* only for valid *speech* frames */
- lchan_set_marker(osmo_efr_check_sid(tch_data, rc), lchan); /* DTXu */
+ lchan_set_marker(osmo_efr_is_any_sid(tch_data), lchan); /* DTXu */
break;
case GSM48_CMODE_SPEECH_AMR: /* AMR */
/* the first FN 0,8,17 defines that CMI is included in frame,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32678
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I5c24b379deda8ae551f9924d10770da50e6acbbd
Gerrit-Change-Number: 32678
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: laforge, fixeria, daniel.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679 )
Change subject: hnbgw: put copyright into define
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> this is really weird, given that we have this "const char * foo_copyright" in pretty much all our pr […]
The difference is, we write it into vty_info.copyright in main():
https://gitea.osmocom.org/cellular-infrastructure/osmo-gbproxy/src/commit/5…
This also was the case in osmo-hnbgw before https://gerrit.osmocom.org/c/osmo-hnbgw/+/32620.
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I13b2569a369724e0298b064a0876b95d6dafd9d0
Gerrit-Change-Number: 32679
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 10 May 2023 10:48:51 +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.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32681 )
Change subject: obs: build_binpkg --docker: set metavar to DISTRO
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32681
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibf6f1a8fce7fd13795f1c25c75e14fb9eb8aa2b6
Gerrit-Change-Number: 32681
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 10 May 2023 10:46:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, fixeria, daniel.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679 )
Change subject: hnbgw: put copyright into define
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
this is really weird, given that we have this "const char * foo_copyright" in pretty much all our projects, don't we?
A quick grep shows the same approach in osmo-gbproxy (const char *), osmo-ggsn (static const char foo[]), osmo-hlr (static const char foo[]), osmo-hnodeb (static const char * const foo), osmo-mgw, osmo-msc, osmo-pcap, osmo-pcu, osmo-sgsn, osmo-trx, ...
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32679
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I13b2569a369724e0298b064a0876b95d6dafd9d0
Gerrit-Change-Number: 32679
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 10 May 2023 10:45:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/32681 )
Change subject: obs: build_binpkg --docker: set metavar to DISTRO
......................................................................
obs: build_binpkg --docker: set metavar to DISTRO
Make it obvious that the argument passed to --docker is the Linux
distribution that will be used.
$ ./build_binpkg.py -h
usage: build_binpkg.py [-h] [-d [DISTRO]] [-j JOBS] [-r] [-v] package
Change-Id: Ibf6f1a8fce7fd13795f1c25c75e14fb9eb8aa2b6
---
M scripts/obs/build_binpkg.py
1 file changed, 16 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/81/32681/1
diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py
index f647869..cda0193 100755
--- a/scripts/obs/build_binpkg.py
+++ b/scripts/obs/build_binpkg.py
@@ -31,7 +31,7 @@
" with build_srcpkg.py."
f" Output dir: {lib.config.path_temp}/binpkgs")
parser.add_argument("-d", "--docker", type=arg_type_docker_distro,
- const=distro_default, nargs="?",
+ const=distro_default, nargs="?", metavar="DISTRO",
help="build the package in docker for a specific"
f" distro (default: {distro_default}, other:"
f" almalinux:8, debian:10, ubuntu:22.04 etc.)")
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32681
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibf6f1a8fce7fd13795f1c25c75e14fb9eb8aa2b6
Gerrit-Change-Number: 32681
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange