[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 20:36:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: LAPDm: Enable flag to prevent sending two subsequent REJ frame
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35130?usp=email ) Change subject: LAPDm: Enable flag to prevent sending two subsequent REJ frame .. Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/35130/comment/53b38d38_04f87860 PS1, Line 9: required required add a flag to prevent writing two subsequent `required`? ;) https://gerrit.osmocom.org/c/osmocom-bb/+/35130/comment/a1d39d39_cfbb9c6a PS1, Line 47: the TTCN3 test case Is this relevant to osmocom-bb? Which TTCN-3 testcase exactly? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35130?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa1645fb1970fe513d71bc1b03f7c5eac62f35d7 Gerrit-Change-Number: 35130 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Comment-Date: Fri, 24 Nov 2023 20:36:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ
Attention is currently required from: daniel, dexter, lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email ) Change subject: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7dd1e0aa185530e1e2d0402742df833c61a787a7 Gerrit-Change-Number: 35125 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 20:28:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
Attention is currently required from: falconia, jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email ) Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH .. Patch Set 1: (5 comments) File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/28b4f113_24e5f2f4 PS1, Line 550: FIXME: someone who knows AMR needs to look at this problem : * and decide what is the correct BTS Tx behavior for frame : * gaps in TCH/AFS. See OS#6049. This block can now be removed? https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/a3bd575a_53d5a890 PS1, Line 571: goto send_burst Similarly to how it's done below for `gsm0503_tch_fr_encode()`, let's check the returned value. Old version of `gsm0503_tch_afs_encode()` preceding your libosmocore patch (I82ce2adf995a4b42d1f378c5819f88d773b9104a) would return -1 and leave the burst buffer unpopulated. In this case we should fall-back to generating dummy FACCH. File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/97317e92_2e7d5d18 PS1, Line 453: TCH/HS Mention TCH/AHS here? Or add a separate bullet point, like you did in `tx_tchf_fn()`? https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/0c4be259_75680d62 PS1, Line 462: FIXME: someone who knows AMR needs to look at this problem : * and decide what is the correct BTS Tx behavior for frame : * gaps in TCH/AHS. See OS#6049. Likewise, can be removed. https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/f91355a8_c1dcc480 PS1, Line 474: gsm0503_tch_ahs_encode Same here, we need to check returned value. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3 Gerrit-Change-Number: 35132 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia Gerrit-CC: fixeria Gerrit-Attention: jolly Gerrit-Attention: falconia Gerrit-Comment-Date: Fri, 24 Nov 2023 20:25:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email )
Change subject: scripts/obs: Add -M/--no-meta option to avoid depending on
osmocom-*
..
scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
This is useful for testing one-off dev packages
Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209
---
M scripts/obs/lib/__init__.py
M scripts/obs/lib/srcpkg.py
2 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 226015a..5292dc5 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -63,6 +63,9 @@
parser.add_argument("-p", "--conflict-pkgname", nargs="?",
help="name of the meta-package to depend on (default:"
" osmocom-$feed)")
+parser.add_argument("-M", "--no-meta", action="store_true",
+help="Don't depend on the meta package (helpful when"
+ " building one-off packages for development)")
parser.add_argument("-v", "--verbose", action="store_true",
help="always print shell commands and their output,"
" instead of only printing them on error")
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 05a705f..aef7732 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -185,7 +185,7 @@
print(f"{project}: building source package {version_epoch}")
write_tarball_version(project, version_epoch)
-if project in lib.config.projects_osmocom:
+if project in lib.config.projects_osmocom and not lib.args.no_meta:
metapkg = lib.args.conflict_pkgname or f"osmocom-{feed}"
lib.debian.control_add_depend(project, metapkg, conflict_version)
if has_rpm_spec:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209
Gerrit-Change-Number: 35126
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
Attention is currently required from: falconia, jolly.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35131?usp=email )
Change subject: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
..
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35131?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I82ce2adf995a4b42d1f378c5819f88d773b9104a
Gerrit-Change-Number: 35131
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia
Gerrit-Reviewer: fixeria
Gerrit-Attention: jolly
Gerrit-Attention: falconia
Gerrit-Comment-Date: Fri, 24 Nov 2023 20:14:44 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email ) Change subject: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-* .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209 Gerrit-Change-Number: 35126 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 20:01:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: app: do not catch exceptions in init_card
Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35101?usp=email ) Change subject: app: do not catch exceptions in init_card .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 20:00:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: osmo-trx-uhd: Make sure HOME environment variable is set
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email ) Change subject: osmo-trx-uhd: Make sure HOME environment variable is set .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10 Gerrit-Change-Number: 35127 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 19:53:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email )
Change subject: Transmit invalid AMR speech blocks instead of dummy FACCH
..
Transmit invalid AMR speech blocks instead of dummy FACCH
Every BTS needs to have some graceful handling for the scenario
where it is time to send out a speech frame on TCH DL, but there is
no frame to be sent. One possible solution is to transmit dummy
FACCH, but this option is unattractive for TCH/HS where FACCH
displaces two speech frames rather than one. A more elegant solution
is to emit a speech frame that is bad, causing the MS receiver to
declare a BFI condition to trigger substitution and muting procedure.
A bad frame is generated by gsm0503_tch_{afs,ahs}_encode() by setting
the playload length to 0.
Depends: libosmocore.git I82ce2adf995a4b42d1f378c5819f88d773b9104a
Related: OS#6049
Change-Id: I056f379715c91ad968f198e112d363a9009dc1c3
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 49 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/35132/1
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index 0138a2a..8f5a2db 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -538,6 +538,9 @@
/* - If the channel mode is TCH/FS or TCH/EFS, transmit a dummy
* speech block with inverted CRC3, designed to induce a BFI
* condition in the MS receiver.
+* - If the channel mode is AMR, transmit a dummy with speech
+* block with inverted CRC6, designed to induce a BFI
+* condition in the MS receiver.
* - If the channel mode is one of the CSD modes, transmit an
* idle frame as described in 3GPP TS 44.021, sections 8.1.6
* and 10.2.3 (all data, status and E-bits set to binary '1').
@@ -554,6 +557,18 @@
case GSM48_CMODE_DATA_3k6:
case GSM48_CMODE_DATA_14k5:
break; /* see below */
+ case GSM48_CMODE_SPEECH_AMR:
+ /* the first FN 4,13,21 defines that CMI is included in
frame,
+* the first FN 0,8,17 defines that CMR is included in
frame.
+*/
+ gsm0503_tch_afs_encode(BUFPOS(bursts_p, 0),
+ NULL, 0,
+
!sched_tchf_dl_amr_cmi_map[br->fn % 26],
+ chan_state->codec,
+ chan_state->codecs,
+ chan_state->dl_ft,
+ chan_state->dl_cmr);
+ goto send_burst;
case GSM48_CMODE_SPEECH_V1:
case GSM48_CMODE_SPEECH_EFR:
rc = gsm0503_tch_fr_encode(BUFPOS(bursts_p, 0), NULL,
0, 1);
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index e0d7aca..afd4eb8 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -451,7 +451,7 @@
LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No TCH or FACCH prim for
transmit.\n");
/* - If the channel mode is TCH/HS, transmit a dummy speech
block
-* with inverted CRC3, designed to induce a BFI condition in
+* with inverted CRC3 or CRC6, designed to induce a BFI
condition in
* the MS receiver.
* - If the channel mode is one of the CSD modes, transmit an
* idle frame as described in 3GPP TS 44.021, sections 8.1.6
@@ -467,6 +467,18 @@
case GSM48_CMODE_DATA_6k0:
case GSM48_CMODE_DATA_3k6:
break; /* see below */
+ case GSM48_CMODE_SPEECH_AMR:
+ /* the first FN 4,13,21 or 5,14,22 defines that CMI is
included
+* in frame, the first FN 0,8,17 or 1,9,18 defines that
CMR is
+* included in frame. */
+ gsm0503_tch_ahs_encode(BUFPOS(bursts_p, 0),
+ NULL, 0,
+
!sched_tchh_dl_amr_cmi_map[br->fn % 26],
+ chan_state->codec,
+ chan_state->codecs,
+ chan_state->dl_ft,
+ chan_state->dl_cmr);
+ goto send_burst;
case GSM48_CMODE_SPEECH_V1:
rc =
[M] Change in libosmocore[master]: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35131?usp=email )
Change subject: coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
..
coding: gsm0503_tch_{afs,ahs}_encode(): add ability to emit BFI
Similar to Change ID Iade3310e16b906efb6892d28f474a0d15204e861, add
BFI support to TCH AFS and TCH AHS encoder.
Every BTS needs to have some graceful handling for the scenario
where it is time to send out a speech frame on TCH DL, but there is
no frame to be sent. One possible solution is to transmit dummy
FACCH, but this option is unattractive for TCH/HS where FACCH
displaces two speech frames rather than one. A more elegant solution
is to emit a speech frame with inverted CRC6, causing the MS receiver
to declare a BFI condition to trigger substitution and muting procedure.
Setting all u(k) bits to 0 is one way to produce such an inverted-CRC
speech frame (normal TCH FR/HR CRC6 for an all-zeros frame would be
11). This patch adds the abiliy to gsm0503_tch_{afs,ahs}_encode()
functions, indicated by payload length of 0.
See §6.2 of 3GPP TS 26.191 for substitution and muting procedure.
Related: OS#6049
Change-Id: I82ce2adf995a4b42d1f378c5819f88d773b9104a
---
M src/coding/gsm0503_coding.c
1 file changed, 171 insertions(+), 58 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/31/35131/1
diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c
index 8effef5..365ae6e 100644
--- a/src/coding/gsm0503_coding.c
+++ b/src/coding/gsm0503_coding.c
@@ -2439,7 +2439,7 @@
/*! Perform channel encoding on a TCH/AFS channel according to TS 05.03
* \param[out] bursts caller-allocated output buffer for bursts bits
* \param[in] tch_data Codec input data in RTP payload format
- * \param[in] len Length of \a tch_data in bytes
+ * \param[in] len Length of \a tch_data in bytes or 0 to generate a bad frame
* \param[in] codec_mode_req Use CMR (1) or FT (0)
* \param[in] codec Array of codecs (active codec set)
* \param[in] codecs Number of entries in \a codec
@@ -2473,12 +2473,19 @@
switch (codec[ft]) {
case 7: /* TCH/AFS12.2 */
- if (len != 31)
- goto invalid_length;
+ if (!len) {
+ /* No data, induce BFI in the receiver by inverted CRC
bits.
+* The data bit are all 0, so the correct parity bits
would be 11. */
+ memset(d, 0, 244);
+ memset(p, 0, 6);
+ } else {
+ if (len != 31)
+ goto invalid_length;
- tch_amr_disassemble(d, tch_data, 244);
+ tch_amr_disassemble(d, tch_data, 244);
- osmo_crc8gen_set_bits(_amr_crc6, d, 81, p);
+ osmo_crc8gen_set_bits(_amr_crc6, d, 81, p);
+ }
tch_amr_merge(conv, d, p, 244, 81);
@@ -2486,12 +2493,18 @@
break;
case 6: /* TCH/AFS10.2 */
- if (len != 26)
- goto invalid_length;
+ if (!len) {
+ /* See comment above. */
+ memset(d, 0, 204);
+ memset(p, 0, 6);
+ } else {
+ if (len != 26)
+ goto invalid_length;
- tch_amr_disassemble(d, tch_data, 204);
+ tch_amr_disassemble(d, tch_data, 204);
- osmo_crc8gen_set_bits(_amr_crc6, d, 65, p);
+ osmo_crc8gen_set_bits(_amr_crc6, d, 65, p);
+ }
tch_amr_merge(conv, d, p, 204, 65);
@@ -2499,12 +2512,18 @@
break;
case 5: /* TCH/AFS7.95 */
- if (len != 20)
- goto invalid_length;
+ if (!len) {
+ /* See comment above. */
+ memset(d, 0, 159);
+ memset(p, 0, 6);
+ } else {
+ if (len != 20)
+ goto invalid_length;
- tch_amr_disassemble(d, tch_data, 159);
+ tch_amr_disassemble(d, tch_data, 159);
- osmo_crc8gen_set_bits(_amr_crc6, d, 75, p);
+ osmo_crc8gen_set_bits(_amr_crc6, d, 75, p);
+ }
tch_amr_merge(conv, d, p, 159, 75);
@@ -2512,12 +2531,18 @@
break;
case 4: /* TCH/AFS7.4 */
- if (len != 19)
- goto invalid_length;
+ if (!len) {
+ /* See comment above. */
+ memset(d, 0, 148);
+ memset(p, 0, 6);
+ } else {
+ if (len != 19)
+ goto
[M] Change in osmocom-bb[master]: LAPDm: Enable flag to prevent sending two subsequent REJ frame
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35130?usp=email ) Change subject: LAPDm: Enable flag to prevent sending two subsequent REJ frame .. LAPDm: Enable flag to prevent sending two subsequent REJ frame Setting the flag was not required required in earlier versions of libosmogsm, because this feature was enabled by default. The roundtrip delay for a LAPD link must be less than T200. Osmocom-bb runs LAPDm on the host machine via serial interface and USB interface that may cause a roundtrip delay that exceeds T200. Also osmo-bts may have that problem, due to latency between physical interface and osmo-bts software. What may happen: An I frame gets lost. The sending side transmits the next I frame. The receiving side detects the send-sequence error and responds with a REJ frame. Due to the round trip delay, the T200 expires on the sending side and causes the I frame to be retransmitted with the P bit set, it enters the timer recovery state. The receiving side detects the send-sequence error and responds with a REJ frame with the F bit set. The sending side will then receive two REJ frames. The first REJ frame will clear the timer recovery state. The second REJ frame (with F bit set) is received when not in timer recovery state, causing an MDL-ERROR-INDICATION. The layer 2 connection is broken. Early tests with osmocom-bb in a real network showed exactly this problem. The solution is to suppress every second REJ frame at the receiving side, until the sequence error condition is cleared. If the first REJ frame gets lost, the sending side would retransmit the I frame again after another expiry of T200. Then the receiving side would respond with a REJ frame again. The solution for the TTCN3 test case is to resend the I frame twice and then expect the REJ response. Relates: OS#5969 Depends: libosmocore.git I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Change-Id: Iaa1645fb1970fe513d71bc1b03f7c5eac62f35d7 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 53 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/30/35130/1 diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index cada8fc..e2ef56a 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -249,6 +249,7 @@ lapdm_channel_init3(>lapdm_channel, LAPDM_MODE_MS, t200_ms_dcch, t200_ms_acch, GSM_LCHAN_SDCCH, NULL); + lapdm_channel_set_flags(>lapdm_channel, LAPDM_ENT_F_DROP_2ND_REJ); lapdm_channel_set_l1(>lapdm_channel, l1ctl_ph_prim_cb, ms); gsm_sim_init(ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35130?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaa1645fb1970fe513d71bc1b03f7c5eac62f35d7 Gerrit-Change-Number: 35130 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-MessageType: newchange
[M] Change in osmocom-bb[master]: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810
Attention is currently required from: jolly, laforge. jolly has uploaded a new patch set (#3) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email ) The following approvals got outdated and were removed: Code-Review-1 by jolly, Verified+1 by Jenkins Builder Change subject: mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810 .. mobile: Fix PCS ARFCN handling: PCS can only be ARFCN 512..810 While it is correct to use the band indicator from SI1 rest octets, it may only be applied for ARFCN values in the range 512..810. The function gsm_refer_pcs() is used to determine, if the cell (which 'talks' about ARFCNs) refers to them PCS or DCS channels. It returns true, if it refers to PCS, but this only means that ARFCNs in the range 512..810 are PCS channels, not all ARFCNs. The new function gsm_arfcn_refer_pcs() is used to add the PCS flag to an ARFCN, if the given cell refers to PCS and the given ARFCN is in the PCS range 512..810. Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Related: OS#6078 --- M src/host/layer23/include/osmocom/bb/common/sysinfo.h M src/host/layer23/src/common/sysinfo.c M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm48_rr.c 4 files changed, 71 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/33532/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33532?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id99c8534bf853f4f24f99364790c1ac1df6cc007 Gerrit-Change-Number: 33532 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: Disable uring when building for embedded
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email ) Change subject: Disable uring when building for embedded .. Patch Set 1: (1 comment) Patchset: PS1: > In https://projects.osmocom. […] I'll submit this since it doesn't break anything. Still seems like --enable-embedded doesn't completely do what we expect it to. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 34879 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 24 Nov 2023 16:13:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in libosmocore[master]: Disable uring when building for embedded
daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email ) Change subject: Disable uring when building for embedded .. Disable uring when building for embedded Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Related: OS#6233 --- M configure.ac 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 2fc9895..29a9570 100644 --- a/configure.ac +++ b/configure.ac @@ -403,6 +403,7 @@ AM_CONDITIONAL(ENABLE_LIBSCTP, false) AM_CONDITIONAL(ENABLE_LIBUSB, false) AM_CONDITIONAL(ENABLE_PCSC, false) + AM_CONDITIONAL(ENABLE_URING, false) AM_CONDITIONAL(ENABLE_PSEUDOTALLOC, true) AM_CONDITIONAL(ENABLE_SERCOM_STUB, true) AM_CONDITIONAL(EMBEDDED, true) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34879?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 34879 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[master]: soft_uart: fix spelling in doxygen docs
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email ) Change subject: soft_uart: fix spelling in doxygen docs .. Patch Set 1: (1 comment) Patchset: PS1: > I liked our stop bots! As Neels guessed, it must be the traffic lights :P -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af Gerrit-Change-Number: 35122 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 13:38:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in libosmocore[master]: soft_uart: fix spelling in doxygen docs
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email )
Change subject: soft_uart: fix spelling in doxygen docs
..
soft_uart: fix spelling in doxygen docs
Change-Id: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af
---
M include/osmocom/core/soft_uart.h
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, approved
diff --git a/include/osmocom/core/soft_uart.h b/include/osmocom/core/soft_uart.h
index 2b108c4..097d2ee 100644
--- a/include/osmocom/core/soft_uart.h
+++ b/include/osmocom/core/soft_uart.h
@@ -51,7 +51,7 @@
struct osmo_soft_uart_cfg {
/*! number of data bits (typically 5, 6, 7 or 8) */
uint8_t num_data_bits;
- /*! number of stop bots (typically 1 or 2) */
+ /*! number of stop bits (typically 1 or 2) */
uint8_t num_stop_bits;
/*! parity mode (none, even, odd) */
enum osmo_soft_uart_parity_mode parity_mode;
@@ -59,7 +59,7 @@
* before calling the receive call-back */
unsigned int rx_buf_size;
/*! receive timeout; UART will flush receive buffer via the receive
call-back
-* after indicated number of milli-seconds even if it is not full yet */
+* after indicated number of milliseconds even if it is not full yet */
unsigned int rx_timeout_ms;
/*! opaque application-private data; passed to call-backs */
@@ -71,7 +71,7 @@
void (*rx_cb)(void *priv, struct msgb *rx_data, unsigned int flags);
/*! transmit call-back. The implementation is expected to provide at
most
-* tx_data->data_len characters (the actual amount is detetmined by the
+* tx_data->data_len characters (the actual amount is determined by the
* number of requested bits and the effective UART configuration). */
void (*tx_cb)(void *priv, struct msgb *tx_data);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af
Gerrit-Change-Number: 35122
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-MessageType: merged
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Attention is currently required from: dexter, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 13:28:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly, laforge, neels. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 15: Code-Review+1 (1 comment) File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/00bffb56_2d3c2929 PS15, Line 362: m I wanted to complain that these are usually named msg everywhere, but we already have msg. Rename it to msg_old? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 15 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 13:26:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Attention is currently required from: daniel, fixeria. Hello Jenkins Builder, daniel, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by daniel, Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. gprs_rlcmac_sched: fix condition for generating dummy blocks on idle When a PDCH is idle, then the gaps are filled with dummy blocks. OsmoPCU supports generating the dummy blocks locally, so that a continous stream of PDCH blocks is sent to L1. However, some BTS models (the OsmoTRX based models in particular) are able to generate the idle blocks locally. In this case the PCU should leave the genration of the dummy blocks to the BTS in order to save processing time and load on the PCUIF interface. In gprs_rlcmac_sched we already have a flag to skip idle frames in case we do not use the so called "direct phy access". A similar mechanism also exists in pcu_l1_if.cpp in function pcu_rx_rts_req_ptcch(). Unfortunately this check is not implemented correctly. The flag gets set when the ENABLE_DIRECT_PHY define constant is set. However, this does not say anything about whether the BTS model supports the generation of idle blocks or not. The define constant is intended to be used to disable direct phy related code in on platforms where no direct phy code is used or cannot be used. We must instead check the BTS model (bts->bts_model) in order to decide whether this particular BTS type requires the generation of dummy blocks or not. Related: OS#6191 Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 --- M src/bts.h M src/gprs_rlcmac_sched.cpp M src/pcu_l1_if.cpp 3 files changed, 63 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/96/35096/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Attention is currently required from: daniel, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. Patch Set 2: (1 comment) File src/bts.h: https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/3a6d1146_ed5d3e24 PS1, Line 282: idele > idle Done -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Attention: fixeria Gerrit-Attention: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 13:19:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-ci[master]: repo-install-test: update package filtering logic
Attention is currently required from: fixeria, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35128?usp=email ) Change subject: repo-install-test: update package filtering logic .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I'm starting to wonder if a "proper" programming/scripting language might be better in the long term for these sort of scripts. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35128?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6745b10804685119d68b089f129ec9b0cde8cdf5 Gerrit-Change-Number: 35128 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Attention: osmith Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 24 Nov 2023 13:14:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd()
Attention is currently required from: laforge. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email ) Change subject: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c66badfb4bdfdfe71f1716de960d353d3548b1 Gerrit-Change-Number: 35073 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: daniel Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 11:58:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors
Attention is currently required from: dexter. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35102?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: pySim-shell: refuse to execute a startup script on initialization errors .. pySim-shell: refuse to execute a startup script on initialization errors When there is an error on initialization (e.g. card not present), we should not continue to execute a startup script that was passed with the pySim-shell commandline. Instead we should print a message that the startup script was ignored due to errors. Related: OS#6271 Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b --- M pySim-shell.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/35102/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b Gerrit-Change-Number: 35102 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: app: do not catch exceptions in init_card
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: app: do not catch exceptions in init_card .. app: do not catch exceptions in init_card The function init_card catches all exceptions and then returns None objects for card or rs in case of an error. This does not fit in the style we pursue in pySim. This is in particular true for library functions. We want those functions to raise exceptions when something is wrong, so that we can catch the exception at top level. Let's fix this for init_card now. Related: OS#6271 Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d --- M pySim/app.py 1 file changed, 22 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/35101/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in pysim[master]: app: do not catch exceptions in init_card
Attention is currently required from: fixeria, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35101?usp=email ) Change subject: app: do not catch exceptions in init_card .. Patch Set 2: (1 comment) File pySim/app.py: https://gerrit.osmocom.org/c/pysim/+/35101/comment/917ddcc2_73635f76 PS1, Line 69: raise ValueError > The question is whether this worked before at all? Did anyone ever try using > pysim-shell with a com […] This is indeed a good catch. Yes it worked and we are sometimes even use pySim on cards that are no SIM/UICC (yet). Think of cards that are not yet provisioned and do not have any files yet (not even an MF). In those cases we would work without a profile until the card is provisioned enough so that the profile is recognized (after the next equip command) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 24 Nov 2023 11:47:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in libosmocore[master]: gsup: add message type for osmo-epdg CEAI interface
Attention is currently required from: lynxis lazus, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email ) Change subject: gsup: add message type for osmo-epdg CEAI interface .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3 Gerrit-Change-Number: 32033 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Fri, 24 Nov 2023 10:46:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: arehbein, dexter, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable .. Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 10:46:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email )
Change subject: bsc: Make socket queue max. length configurable
..
bsc: Make socket queue max. length configurable
Title refers to the maximum length of the osmo_wqueue used for
the PCU socket connection.
Related: OS#5774
Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/bsc_init.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/pcu_sock.c
4 files changed, 44 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 275e4f1..bd51a42 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1068,6 +1068,7 @@
/* PCU socket state */
char *pcu_sock_path;
+ unsigned int pcu_sock_wqueue_len_max;
struct pcu_sock_state *pcu_state;
};
diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c
index c381c0f..c6c3e79 100644
--- a/src/osmo-bsc/bsc_init.c
+++ b/src/osmo-bsc/bsc_init.c
@@ -204,6 +204,7 @@
net->cbc->client.remote_addr = (struct osmo_sockaddr_str){ .port =
CBSP_TCP_PORT, };
net->cbc->client.local_addr = (struct osmo_sockaddr_str){};
+ net->pcu_sock_wqueue_len_max = BSC_PCU_SOCK_WQUEUE_LEN_DEFAULT;
return net;
err_free_all:
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index bdc18b6..73c5cc2 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -416,6 +416,9 @@
if (gsmnet->pcu_sock_path)
vty_out(vty, " pcu-socket %s%s", gsmnet->pcu_sock_path,
VTY_NEWLINE);
+ if (gsmnet->pcu_sock_wqueue_len_max != BSC_PCU_SOCK_WQUEUE_LEN_DEFAULT)
+ vty_out(vty, " pcu-socket-wqueue-length %u%s",
gsmnet->pcu_sock_wqueue_len_max,
+ VTY_NEWLINE);
neighbor_ident_vty_write_network(vty, " ");
mgcp_client_pool_config_write(vty, " ");
@@ -2484,8 +2487,29 @@
return CMD_SUCCESS;
}
-DEFUN_ATTR(cfg_net_pcu_sock,
- cfg_net_pcu_sock_cmd,
+DEFUN_ATTR(cfg_bts_pcu_sock_wqueue_len, cfg_bts_pcu_sock_wqueue_len_cmd,
+ "pcu-socket-wqueue-length <1-2147483646>",
+ "Configure the PCU socket queue length\n"
+ "Queue length\n",
+ CMD_ATTR_IMMEDIATE)
+{
+ size_t dropped_msgs = 0;
+ struct gsm_network *net = gsmnet_from_vty(vty);
+ size_t old = net->pcu_sock_wqueue_len_max;
+ net->pcu_sock_wqueue_len_max = atoi(argv[0]);
+ if (net->pcu_state)
+ dropped_msgs = osmo_wqueue_set_maxlen(>pcu_state->upqueue,
net->pcu_sock_wqueue_len_max);
+ if (dropped_msgs) {
+ LOGP(DPCU, LOGL_INFO, "Have dropped %zu messages due to
shortened max. message queue size (from: %zu to %u)\n",
+dropped_msgs, old, net->pcu_sock_wqueue_len_max);
+ vty_out(vty, "Have dropped %zu messages due to shortened max.
message queue size (from: %zu to %u)%s",
+dropped_msgs, old, net->pcu_sock_wqueue_len_max,
VTY_NEWLINE);
+ }
+ return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(cfg_net_pcu_sock_path,
+ cfg_net_pcu_sock_path_cmd,
"pcu-socket PATH",
"PCU Socket Path for using OsmoPCU co-located with BSC\n"
"Path in the file system for the unix-domain PCU socket\n",
@@ -3595,7 +3619,8 @@
install_element(GSMNET_NODE, _net_meas_feed_wqueue_max_len_cmd);
install_element(GSMNET_NODE, _net_timer_cmd);
install_element(GSMNET_NODE, _net_allow_unusable_timeslots_cmd);
- install_element(GSMNET_NODE, _net_pcu_sock_cmd);
+ install_element(GSMNET_NODE, _net_pcu_sock_path_cmd);
+ install_element(GSMNET_NODE, _bts_pcu_sock_wqueue_len_cmd);
install_element(GSMNET_NODE, _net_no_pcu_sock_cmd);
/* Timer configuration commands (generic osmo_tdef API) */
diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c
index ba11993..7b1aeae 100644
--- a/src/osmo-bsc/pcu_sock.c
+++ b/src/osmo-bsc/pcu_sock.c
@@ -950,7 +950,7 @@
if (!state)
return -ENOMEM;
- osmo_wqueue_init(>upqueue, BSC_PCU_SOCK_WQUEUE_LEN_DEFAULT);
+ osmo_wqueue_init(>upqueue, net->pcu_sock_wqueue_len_max);
state->upqueue.read_cb = pcu_sock_read;
state->upqueue.write_cb = pcu_sock_write;
state->upqueue.bfd.fd = -1;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b
Gerrit-Change-Number: 33892
Gerrit-PatchSet: 10
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
Attention is currently required from: neels. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email ) Change subject: early-IA: use the correct TRX .. Patch Set 3: (1 comment) File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/35095/comment/606138c9_bf7c0e50 PS3, Line 1403: /* hopping is disabled. */ What if hopping is enabled? Should we return an rsl_tx_error_report() -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id9a930e5c67122812b229dc27ea2bfe246b67611 Gerrit-Change-Number: 35095 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel Gerrit-Attention: neels Gerrit-Comment-Date: Fri, 24 Nov 2023 10:43:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-ci[master]: repo-install-test: update package filtering logic
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35128?usp=email ) Change subject: repo-install-test: update package filtering logic .. repo-install-test: update package filtering logic Instead of filtering with several blacklist_* files that must contain the exact names of packages to be filtered, add a shell function that uses fnmatch for filtering. Combine all lists into one. This fixes the error we get with each limesuite release, without the need to increase the version in the txt files every time. Currently the repo-install-tests are failing for all debian versions because of this. Change-Id: I6745b10804685119d68b089f129ec9b0cde8cdf5 --- D scripts/repo-install-test/blacklist_centos8.txt D scripts/repo-install-test/blacklist_debian10.txt D scripts/repo-install-test/blacklist_debian11.txt D scripts/repo-install-test/blacklist_debian12.txt M scripts/repo-install-test/run-inside.sh 5 files changed, 68 insertions(+), 251 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/35128/1 diff --git a/scripts/repo-install-test/blacklist_centos8.txt b/scripts/repo-install-test/blacklist_centos8.txt deleted file mode 100644 index 3e5381d..000 --- a/scripts/repo-install-test/blacklist_centos8.txt +++ /dev/null @@ -1,15 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# The ulfius package in network:osmocom:* is linked to the opensuse version, -# which has dependencies that exist under another name in centos -# (libgnutls-devel, libjansson-devel). Linking to the opensuse version has the -# advantage that we don't need to worry about updating the package. However, -# the dependency problem means that we can't simply install the package in -# centos. In OBS we work around this in the project config. -ulfius-devel - -# Also linked to opensuse versions -nftables-devel -python3-nftables diff --git a/scripts/repo-install-test/blacklist_debian10.txt b/scripts/repo-install-test/blacklist_debian10.txt deleted file mode 100644 index 93dac75..000 --- a/scripts/repo-install-test/blacklist_debian10.txt +++ /dev/null @@ -1,67 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# OpenBSC -# This is legacy, we aren't really interested in testing openbsc.git -# derived packages. Packages are found in openbsc/debian/control. -openbsc-dev -osmo-bsc-mgcp -osmo-bsc-mgcp-dbg -osmocom-bs11-utils -osmocom-bs11-utils-dbg -osmocom-bsc-nat -osmocom-bsc-nat-dbg -osmocom-bsc-sccplite -osmocom-bsc-sccplite-dbg -osmocom-ipaccess-utils -osmocom-ipaccess-utils-dbg -osmocom-nitb -osmocom-nitb-dbg - -# Not relevant for the test -limesuite-images -limesuite-images23.10 - -# SoapySDR is not used anymore (see OS#3542) -soapysdr-module-lms7 -soapysdr0.6-module-lms7 -soapysdr0.6-module-lms7-dbgsym -soapysdr0.7-module-lms7 -soapysdr0.7-module-lms7-dbgsym - -# Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install -librtlsdr0-dbgsym -rtl-sdr-dbgsym - -# Depends on mongodb, which was droppend from debian 10 onwards -open5gs -open5gs-amf -open5gs-amf-dbgsym -open5gs-ausf -open5gs-ausf-dbgsym -open5gs-common -open5gs-common-dbgsym -open5gs-dbg -open5gs-hss -open5gs-hss-dbgsym -open5gs-mme -open5gs-mme-dbgsym -open5gs-nrf -open5gs-nrf-dbgsym -open5gs-pcf -open5gs-pcf-dbgsym -open5gs-pcrf -open5gs-pcrf-dbgsym -open5gs-sgwc -open5gs-sgwc-dbgsym -open5gs-sgwu -open5gs-sgwu-dbgsym -open5gs-smf -open5gs-smf-dbgsym -open5gs-udm -open5gs-udm-dbgsym -open5gs-udr -open5gs-udr-dbgsym -open5gs-upf -open5gs-upf-dbgsym diff --git a/scripts/repo-install-test/blacklist_debian11.txt b/scripts/repo-install-test/blacklist_debian11.txt deleted file mode 100644 index c962ffc..000 --- a/scripts/repo-install-test/blacklist_debian11.txt +++ /dev/null @@ -1,72 +0,0 @@ -# These packages will not get explicitly installed in this test. -# Package lines must have nothing but the package (no comment, -# no additional space etc). - -# OpenBSC -# This is legacy, we aren't really interested in testing openbsc.git -# derived packages. Packages are found in openbsc/debian/control. -openbsc-dev -osmo-bsc-mgcp -osmo-bsc-mgcp-dbg -osmocom-bs11-utils -osmocom-bs11-utils-dbg -osmocom-bsc-nat -osmocom-bsc-nat-dbg -osmocom-bsc-sccplite -osmocom-bsc-sccplite-dbg -osmocom-ipaccess-utils -osmocom-ipaccess-utils-dbg -osmocom-nitb -osmocom-nitb-dbg - -# Causing conflicts, not relevant for the test -liblimesuite20.10-1-dbgsym -liborcania1.2 -liborcania1.2-dbgsym -liborcania2.1 -liborcania2.1-dbgsym -libulfius2.5 -libulfius2.5-dbgsym -libulfius2.7 -libulfius2.7-dbgsym -libyder2.0-dbgsym -limesuite-dbgsym -limesuite-images -limesuite-images23.10 -soapysdr0.7-module-lms7-dbgsym - -# Depends on
[M] Change in osmo-ttcn3-hacks[master]: bsc: tests recovery from BORKEN after release failed
Attention is currently required from: neels. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email ) Change subject: bsc: tests recovery from BORKEN after release failed .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35098?usp=email 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: I9b4ddfc4a337808d9d5ec538c25fd390b1b2530f Gerrit-Change-Number: 35098 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Attention: neels Gerrit-Comment-Date: Fri, 24 Nov 2023 10:34:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: recover BORKEN lchans for missing ACK scenarios
Attention is currently required from: fixeria, laforge, neels, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email ) Change subject: recover BORKEN lchans for missing ACK scenarios .. Patch Set 13: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic4728b3efe843ea63e2a0b54b1ea8a925347484a Gerrit-Change-Number: 30252 Gerrit-PatchSet: 13 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 24 Nov 2023 10:29:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: soft_uart: fix spelling in doxygen docs
Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email ) Change subject: soft_uart: fix spelling in doxygen docs .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I liked our stop bots! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib719d1fe4ee6c058860e861c91ec2417d9dff0af Gerrit-Change-Number: 35122 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Attention: fixeria Gerrit-Comment-Date: Fri, 24 Nov 2023 10:19:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
Attention is currently required from: dexter. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email ) Change subject: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7a08d8cc670fa14f7206dbc22351f3668a17 Gerrit-Change-Number: 35096 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 10:17:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: jolly, neels.
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email )
Change subject: LAPD: Add support for RTS based polling and T200
..
Patch Set 9:
(2 comments)
File src/isdn/lapd_core.c:
https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/956b985c_79614f74
PS9, Line 1939: if ((dl->lapd_flags & LAPD_F_RTS) &&
!llist_empty(>tx_queue)) {
This looks a bit weird. You return here if !llist_empty() (and RTS), but in
lapd_ph_rts_ind() you call this function only if llist_empty().
I might be missing something, I'm not really familiar with this code.
https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/a2231539_1c716b12
PS9, Line 1945: next_frame:
Irrelevant for this patch, but this label really should be unindented.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995
Gerrit-Change-Number: 34985
Gerrit-PatchSet: 9
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-CC: daniel
Gerrit-Attention: jolly
Gerrit-Attention: neels
Gerrit-Comment-Date: Fri, 24 Nov 2023 10:09:32 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: laforge, neels. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 14: (1 comment) File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/aa2fb175_301e6344 PS14, Line 527: * This function must be ca > I guess the documentation misses the fact that it must only be called for > every FN if we are in F_RT […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: neels Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 09:51:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly, neels. Hello Jenkins Builder, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email to look at the new patch set (#15). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LAPDm: Add support for RTS based polling .. LAPDm: Add support for RTS based polling The lower layer must set the 'POLLING_ONLY' flag and provide frame number when polling a frame. If T200 is pending, it is started with a timeout frame number in advance to given frame number. The lower layer must call lapdm_t200_fn() after a frame has been received or if a frame has not been received. Also it must be called after a TCH frame has been received. LAPDm uses this to check the T200 timeout condition. A new function is used to set the frame number based timeout values. Related: OS#4074 Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 4 files changed, 178 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 15 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Attention: neels Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
Attention is currently required from: jolly. Hello Jenkins Builder, daniel, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email to look at the new patch set (#15). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add an extra queue for UI frames .. LAPDm: Add an extra queue for UI frames The extra queue is used to transmit the UI frame only when there is no frame in the regular TX queue. This allows to give LAPD frames prioity over UI frame. Related: OS#4074 Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c 3 files changed, 52 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/34987/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 15 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame
Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame .. LAPDm: Add a flag to enable suppression of subsequent REJ frame This behaviour was default in earlier versions of LAPDm/LAPD. Because it is only required for osmocom-bb, a flag is added to enable it there. Related: OS#5969 Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 --- M include/osmocom/gsm/lapdm.h M include/osmocom/isdn/lapd_core.h M src/gsm/lapdm.c M src/isdn/lapd_core.c 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 7 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
Attention is currently required from: jolly. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email ) Change subject: LAPDm: Add an extra queue for UI frames .. Patch Set 14: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Fri, 24 Nov 2023 09:48:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: osmo-trx-uhd: Make sure HOME environment variable is set
Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email ) Change subject: osmo-trx-uhd: Make sure HOME environment variable is set .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: %h is always /root, even if we set User=. But this is fine, we can change it again while implementing OS#4107. Reference: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10 Gerrit-Change-Number: 35127 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 09:48:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: osmo-trx-uhd: Make sure HOME environment variable is set
Attention is currently required from: laforge. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email ) Change subject: osmo-trx-uhd: Make sure HOME environment variable is set .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10 Gerrit-Change-Number: 35127 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-CC: Jenkins Builder Gerrit-Attention: laforge Gerrit-Comment-Date: Fri, 24 Nov 2023 09:45:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-trx[master]: osmo-trx-uhd: Make sure HOME environment variable is set
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email ) Change subject: osmo-trx-uhd: Make sure HOME environment variable is set .. osmo-trx-uhd: Make sure HOME environment variable is set It turns out that uhd versions >= 4.0.0.0 *require* that either the HOME or the XDG_CONFIG_HOME variables are set, and otherwise will terminate the program. Change-Id: I1816013c507da28719590f063da0a397da656a10 Closes: OS#6269 --- M contrib/systemd/osmo-trx-uhd.service 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/27/35127/1 diff --git a/contrib/systemd/osmo-trx-uhd.service b/contrib/systemd/osmo-trx-uhd.service index 34ba74a..6c5c2de 100644 --- a/contrib/systemd/osmo-trx-uhd.service +++ b/contrib/systemd/osmo-trx-uhd.service @@ -8,6 +8,7 @@ Restart=always StateDirectory=osmocom WorkingDirectory=%S/osmocom +Environment=HOME=%h ExecStart=/usr/bin/osmo-trx-uhd -C /etc/osmocom/osmo-trx-uhd.cfg RestartSec=2 # CPU scheduling policy: -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/35127?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1816013c507da28719590f063da0a397da656a10 Gerrit-Change-Number: 35127 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[master]: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ
Attention is currently required from: daniel, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email ) Change subject: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I7dd1e0aa185530e1e2d0402742df833c61a787a7 Gerrit-Change-Number: 35125 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Fri, 24 Nov 2023 09:06:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
Attention is currently required from: daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email ) Change subject: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-* .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209 Gerrit-Change-Number: 35126 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 09:03:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email )
Change subject: scripts/obs: Add -M/--no-meta option to avoid depending on
osmocom-*
..
scripts/obs: Add -M/--no-meta option to avoid depending on osmocom-*
This is useful for testing one-off dev packages
Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209
---
M scripts/obs/lib/__init__.py
M scripts/obs/lib/srcpkg.py
2 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/26/35126/1
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index 226015a..5292dc5 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -63,6 +63,9 @@
parser.add_argument("-p", "--conflict-pkgname", nargs="?",
help="name of the meta-package to depend on (default:"
" osmocom-$feed)")
+parser.add_argument("-M", "--no-meta", action="store_true",
+help="Don't depend on the meta package (helpful when"
+ " building one-off packages for development)")
parser.add_argument("-v", "--verbose", action="store_true",
help="always print shell commands and their output,"
" instead of only printing them on error")
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 05a705f..aef7732 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -185,7 +185,7 @@
print(f"{project}: building source package {version_epoch}")
write_tarball_version(project, version_epoch)
-if project in lib.config.projects_osmocom:
+if project in lib.config.projects_osmocom and not lib.args.no_meta:
metapkg = lib.args.conflict_pkgname or f"osmocom-{feed}"
lib.debian.control_add_depend(project, metapkg, conflict_version)
if has_rpm_spec:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35126?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id18c75de559c9ba29efd38d8510f2db3206c4209
Gerrit-Change-Number: 35126
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[master]: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ
daniel has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email )
Change subject: libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ
..
libgtp: Use gtp_cause_successful() instead of GTPCAUSE_ACC_REQ
In some cases the phone requests a PDP context type that isn't available
no the PGW/GGSN, e.g. phone requests a combined IPv4/v6 context, but
only IPv4 is supported.
In that case the GGSN can send a Create PDP Context Response with cause
"New PDP type due to network preference" or "New PDP type due to single
address bearer only". libgtp should continue handling these cause values
like the "Request Accepted" cause. Use the new gtp_cause_successful()
function for that.
Related: OS#6268
Change-Id: I7dd1e0aa185530e1e2d0402742df833c61a787a7
---
M gtp/gtp.c
1 file changed, 27 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/25/35125/1
diff --git a/gtp/gtp.c b/gtp/gtp.c
index 1ebc6dc..43e56b5 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -995,7 +995,7 @@
/* Now send off a reply to the peer */
gtp_create_pdp_resp(gsn, pdp->version, pdp, cause);
- if (cause != GTPCAUSE_ACC_REQ)
+ if (!gtp_cause_successful(cause))
gtp_freepdp(gsn, pdp);
return 0;
@@ -1011,7 +1011,7 @@
gtpie_tv1(, , GTP_MAX, GTPIE_CAUSE, cause);
- if (cause == GTPCAUSE_ACC_REQ) {
+ if (gtp_cause_successful(cause)) {
if (version == 0)
gtpie_tv0(, , GTP_MAX, GTPIE_QOS_PROFILE0,
@@ -1445,7 +1445,7 @@
}
/* Check all conditional information elements */
- if (GTPCAUSE_ACC_REQ == cause) {
+ if (gtp_cause_successful(cause)) {
if (version == 0) {
if (gtpie_gettv0(ie, GTPIE_QOS_PROFILE0, 0,
@@ -1667,7 +1667,7 @@
gtpie_tv1(, , GTP_MAX, GTPIE_CAUSE, cause);
- if (cause == GTPCAUSE_ACC_REQ) {
+ if (gtp_cause_successful(cause)) {
if (version == 0)
gtpie_tv0(, , GTP_MAX, GTPIE_QOS_PROFILE0,
@@ -1997,7 +1997,7 @@
/* Check all conditional information elements */
/* TODO: This does not handle GGSN-initiated update responses */
- if (cause == GTPCAUSE_ACC_REQ) {
+ if (gtp_cause_successful(cause)) {
if (version == 0) {
if (gtpie_gettv0(ie, GTPIE_QOS_PROFILE0, 0,
>qos_neg0,
@@ -2172,7 +2172,7 @@
gtp_resp(version, gsn, pdp, , length, peer, fd,
get_seq(pack), get_tid(pack));
- if (cause == GTPCAUSE_ACC_REQ) {
+ if (gtp_cause_successful(cause)) {
if ((teardown) || (version == 0)) { /* Remove all contexts
*/
gtp_freepdp_teardown(gsn, linked_pdp);
} else {
@@ -2198,7 +2198,6 @@
}
}
}
- /* if (cause == GTPCAUSE_ACC_REQ) */
return 0;
}
@@ -2350,7 +2349,7 @@
}
/* Check the cause value (again) */
- if ((GTPCAUSE_ACC_REQ != cause) && (GTPCAUSE_NON_EXIST != cause)) {
+ if (!gtp_cause_successful(cause) && (GTPCAUSE_NON_EXIST != cause)) {
rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_UNEXPECTED_CAUSE);
GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
"Unexpected cause value received: %d\n", cause);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35125?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I7dd1e0aa185530e1e2d0402742df833c61a787a7
Gerrit-Change-Number: 35125
Gerrit-PatchSet: 1
Gerrit-Owner: daniel
Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email ) Change subject: LAPDm: Add an extra queue for UI frames .. Patch Set 14: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Fri, 24 Nov 2023 08:40:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 14: (1 comment) File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/398ba832_aea74fb3 PS14, Line 527: * This function must be ca I guess the documentation misses the fact that it must only be called for every FN if we are in F_RTS mode. Also, it might make sense to move the check for F_RTS up here so it only leads to one error messge, instead of one for each atalink within the entity. the static lapdm_t200_fn_dl then could have an additional OSMO_ASSERT() as it's an internal function and the caller should have checked for the RTS flag before. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 14 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Attention: neels Gerrit-Comment-Date: Fri, 24 Nov 2023 08:40:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: jolly Gerrit-Attention: neels Gerrit-Comment-Date: Fri, 24 Nov 2023 08:36:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35102?usp=email ) Change subject: pySim-shell: refuse to execute a startup script on initialization errors .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b Gerrit-Change-Number: 35102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 08:35:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: app: do not catch exceptions in init_card
Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35101?usp=email ) Change subject: app: do not catch exceptions in init_card .. Patch Set 1: (1 comment) File pySim/app.py: https://gerrit.osmocom.org/c/pysim/+/35101/comment/ab66c182_1abec21c PS1, Line 69: raise ValueError > Not sure about this particular change. […] The question is whether this worked before at all? Did anyone ever try using pysim-shell with a completely different smart card that's neither a SIM nor an UICC (with or without USIM, ISIM apps)? And is it really useful to support this, if all you can do is the "apdu" command for raw APDUs? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Fri, 24 Nov 2023 08:35:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in docker-playground[master]: open5gs configs: update to current format
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email ) Change subject: open5gs configs: update to current format .. open5gs configs: update to current format Adjust open5gs configs to the new formats from: https://github.com/open5gs/open5gs/pull/2739 This fixes all open5gs programs from crashing on startup with various errors such as: 11/21 07:39:25.971: [core] FATAL: epoll_init: Assertion `context->epfd >= 0' failed. (../lib/core/ogs-epoll.c:77) Related: OS#6267 Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 --- M ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml M ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/open5gs-nrf-master.yaml M ttcn3-pgw-test/open5gs-smf-master.yaml M ttcn3-pgw-test/open5gs-upf-master.yaml 7 files changed, 158 insertions(+), 116 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml index afb5cf2..4b5891e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml @@ -3,6 +3,10 @@ logger: level: info +global: + max: +ue: 1024 + sbi: server: no_tls: true @@ -17,30 +21,43 @@ smf: sbi: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 port: + client: +nrf: + - uri: http://172.18.3.201: +scp: + - uri: http://127.0.1.10: pfcp: - - addr: 172.18.3.201 + server: +- address: 172.18.3.201 + client: +upf: + - address: 172.18.3.222 gtpc: - - addr: 172.18.3.201 -option: - so_bindtodevice: eth0 + server: +- address: 172.18.3.201 + option: +so_bindtodevice: eth0 gtpu: - - addr: 172.18.3.201 -port: 2152 -option: - so_bindtodevice: eth0 + server: +- address: 172.18.3.201 + port: 2152 + option: +so_bindtodevice: eth0 metrics: -addr: 172.18.3.201 -port: 9090 -subnet: - - addr: 176.16.16.1/20 + server: +- address: 172.18.3.201 + port: 9090 +session: + - subnet: 176.16.16.1/20 dnn: internet - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dns: - 172.18.3.222 @@ -52,21 +69,6 @@ enabled: auto freeDiameter: /data/freediameter.conf -scp: -sbi: - - addr: 127.0.1.10 -port: - -nrf: -sbi: - - addr: - - 172.18.3.201 -port: - -upf: -pfcp: - - addr: 172.18.3.222 - parameter: max: diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml index 73e1bac..81afc6e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml @@ -3,31 +3,37 @@ logger: level: info +global: + max: +ue: 1024 + upf: pfcp: - - addr: 172.18.3.222 + server: +- address: 172.18.3.222 gtpu: - - addr: 172.18.3.222 -port: 2152 -option: - so_bindtodevice: eth0 -subnet: - - addr: 176.16.16.1/20 + server: +- address: 172.18.3.222 + port: 2152 + option: +so_bindtodevice: eth0 +session: + - subnet: 176.16.16.1/20 dnn: internet dev: ogstun4 - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dev: ogstun46 smf: pfcp: - - addr: 172.18.3.201 + - address: 172.18.3.201 parameter: diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml index 8d1f42e..df92b6f 100644 --- a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml @@ -5,6 +5,10 @@ logger: level: trace +global: + max: +ue: 1024 + hss: freeDiameter: /data/freediameter.conf diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml index 35b718d..520a0b5 100644 ---
[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email ) Change subject: open5gs configs: duplicate cfgs for latest/master .. open5gs configs: duplicate cfgs for latest/master The config format just changed significantly in main/master. Duplicate the configs, so we can run latest with the old versions. Related: OS#6267 Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 --- M ttcn3-ggsn-test/jenkins-ogs.sh R ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml R ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/jenkins.sh R ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml C ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/jenkins.sh R ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml C ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/jenkins.sh R ttcn3-pgw-test/open5gs-nrf-latest.yaml C ttcn3-pgw-test/open5gs-nrf-master.yaml R ttcn3-pgw-test/open5gs-smf-latest.yaml C ttcn3-pgw-test/open5gs-smf-master.yaml R ttcn3-pgw-test/open5gs-upf-latest.yaml C ttcn3-pgw-test/open5gs-upf-master.yaml 18 files changed, 27 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh index 5875b75..07952bc 100755 --- a/ttcn3-ggsn-test/jenkins-ogs.sh +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -16,7 +16,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/ggsn/ cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/ cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ @@ -35,9 +35,9 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" + /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ @@ -49,7 +49,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 222) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1" + /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-smf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-smf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-upf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-upf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index 0eacaf9..eb60835 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -18,7 +18,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg" mkdir $VOL_BASE_DIR/hss -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/hss/ cp ogs/freediameter.conf $VOL_BASE_DIR/hss/ network_create @@ -64,7 +64,7 @@ $DOCKER_ARGS \
[L] Change in docker-playground[master]: open5gs configs: update to current format
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email ) Change subject: open5gs configs: update to current format .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 Gerrit-Change-Number: 35105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master
Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email ) Change subject: open5gs configs: duplicate cfgs for latest/master .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 Gerrit-Change-Number: 35104 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email )
Change subject: libgtp: Check for all successful create_pdp_conf causes
..
libgtp: Check for all successful create_pdp_conf causes
Related: OS#6268
Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
---
M TODO-RELEASE
M src/sgsn/sgsn_libgtp.c
2 files changed, 12 insertions(+), 1 deletion(-)
Approvals:
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 1c5d61f..bb4f900 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1 +1,2 @@
#component whatdescription / commit summary line
+libgtp > 1.10 use gtp_cause_successful()
diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c
index 0b6da62..9edd0c6 100644
--- a/src/sgsn/sgsn_libgtp.c
+++ b/src/sgsn/sgsn_libgtp.c
@@ -417,7 +417,7 @@
}
/* Check for cause value if it was really successful */
- if (cause != GTPCAUSE_ACC_REQ) {
+ if (!gtp_cause_successful(cause)) {
reject_cause = cause_map(gtp2sm_cause_map, cause,
GSM_CAUSE_ACT_REJ_GGSN);
goto reject;
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027
Gerrit-Change-Number: 35094
Gerrit-PatchSet: 3
Gerrit-Owner: daniel
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
Attention is currently required from: daniel, laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: osmith Gerrit-Attention: laforge Gerrit-Attention: daniel Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Fri, 24 Nov 2023 08:18:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
