[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?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: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 07:20:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 29 Nov 2023 07:13:28 + 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: jolly. falconia 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 3: (4 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/a16f6572_4bd42192 PS3, Line 17: playload Did you perhaps mean "payload"? Patchset: PS3: Aside from typos/grammar, I would give a CR+2 on the code itself at this point. File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/63b99f1d_eed0cec1 PS3, Line 541: with This extraneous use of "with" here is ungrammatical. Simply removing the extra "with" will produce correct English grammar. File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/16a07373_c32e788d PS3, Line 456: with Same as above, -- 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: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 29 Nov 2023 00:07:11 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/fe7bd69a_25c49d21 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > This is how it works: […] Oh, I overlooked the `skip_idle && trx != 0` part in the old code (left side). I don't remember why we had this constraint, but could you explain why are you removing it? With this constraint we only have power saving on Cn (n > 0). On the BCCH carrier we always transmit PDCH blocks at full power, no matter if there are active TBFs or not, because we always get DATA.req for the C0. By removing this constraint in your patch you're making osmo-bts-trx send Dummy Bursts (carrying no info at all) instead of Normal Bursts. Like I explained in my previous comment. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 22:38:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email )
Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip
..
Patch Set 2:
(1 comment)
File src/gprs_rlcmac_sched.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/45e2904c_d3c2aa5a
PS1, Line 486: * way we help BTS energy saving (on TRX!=C0)
by sending nothing
> IIRC you can only decrease a given number of dBm at specific points in time,
> it's specified somewher […]
This is how it works:
* on C0 (the BCCH carrier): osmo-bts-trx transmits Dummy Bursts (not Normal
Bursts), which can be transmitted at a lower power level (2 dB or even 4 dB
less relative to the full power, IIRC) in the BCCH carrier power saving mode;
* on Cn (n > 0): osmo-bts-trx simply transmits nothing and thus saves energy.
It's actually required by 3GPP specs. to maintain a continuous ("gapless")
transmission on the BCCH carrier (C0), so that a phone doing full power scan
would not overlook it.
It would have been more logical (and elegant, IMO) to offload the power saving
logic to the BTS completely, instead of making such a decision in osmo-pcu.
There would be no need to maintain a list of the power saving capable BTS
models here, and add lengthy comments explaining what the BTS is supposed to do.
My initial idea/proposal was to simply flag dummy blocks generated in the
absence of active TBFs, so that the BTS could decide what to do with such a
DATA.req on its own. Unfortunately, I was not able to defend this proposal back
then because I was on sick leave. Seeing how much effort/time it's taking to
fix OS#6191, I think we should consider getting back to this idea at some
point...
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6
Gerrit-Change-Number: 35151
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:30:23 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Comment-In-Reply-To: dexter
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email )
Change subject: libosmosim: Support Microsoft smart card discovery process
..
libosmosim: Support Microsoft smart card discovery process
Our class/instruction tables (used mainly by simtrace cardem host
software) only contain support for those instructions permitted
in the related card specification.
Microsoft blindly tries CLA=0xCA with INS=0x00 which is not somethin
that the GSM SIM, ETSI UICC or 3GPP USIM specs specify, and which
hence results in log output like this:
DLINP DEBUG [0] <= osmo_st2_cardem_request_sw_tx(sw=6a88)
DLGLOBAL INFO => DATA: flags=0x01 (HDR ), 00 ca 7f 68 00
DLGLOBAL ERROR Unknown APDU case 0
DLGLOBAL FATAL Failed to recognize APDU, terminating
Let's adjust to microsoft and *always* support their instructions
no matter which osim_cla_ins_card_profile was used.
Special thanks to Eric Wild for pointing me to this unexpected
behaviour of PC/SC on modern Windows.
Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Related: SYS#6617
---
M src/sim/class_tables.c
1 file changed, 47 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index 6d05ede..29c1e40 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -350,6 +350,13 @@
[0x88] = 4,/* AUTHENTICATE */
};
+/*
https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discovery-process
*/
+static const uint8_t microsoft_discovery_ins_tbl[256] = {
+ [0xA4] = 4,/* SELECT FILE */
+ [0xCA] = 2,/* GET DATA */
+ [0xC0] = 2,/* GET RESPONSE */
+};
+
int osim_determine_apdu_case(const struct osim_cla_ins_card_profile *prof,
const uint8_t *hdr)
{
@@ -374,5 +381,16 @@
return rc;
}
}
+ /* special handling for Microsoft who insists to use INS=0xCA in
CLA=0x00 which is not
+* really part of GSM SIM, ETSI UICC or 3GPP USIM specifications, but
only ISO7816. Rather than adding
+* it to each and every card profile, let's add the instructions listed
at
+*
https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discovery-process
explicitly
+* here. They will only be used in case no more specific match was
found in the actual profile above. */
+ if (cla == 0x00) {
+ rc = microsoft_discovery_ins_tbl[ins];
+ if (rc)
+ return rc;
+ }
+
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Gerrit-Change-Number: 35154
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email ) Change subject: libosmosim: Support Microsoft smart card discovery process .. Patch Set 4: (1 comment) Patchset: PS4: > It would probably be useful to add the msdn links to the commit message that > explain what MS does? the links are in the code comments, not sure we need them also in the commit message? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 22:24:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
Attention is currently required from: fixeria, laforge.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email )
Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
..
Patch Set 6:
(2 comments)
File src/common/l1sap.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12698):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/21244cd8_c8b32077
PS6, Line 1879: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12698):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/8f7b8427_f0815275
PS6, Line 1893: } else {
else is not generally useful after a break or return
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 6
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:12:21 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode .. Add GSMTAP encapsulation of RLP frames in CSD NT mode In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there are RLP (Radio Link Protocol) frames inside the modified V.110. wireshark alrady has a dissector for this, and we've introduced a GSMTAP type for RLP some time ago. So with this patch, we now generate such GSMTAP RLP frames. Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/vty.c M tests/osmo-bts.vty 5 files changed, 124 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35124/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: dexter, laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email ) Change subject: libosmosim: Support Microsoft smart card discovery process .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 22:09:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: dexter, laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email ) Change subject: libosmosim: Support Microsoft smart card discovery process .. Patch Set 4: (1 comment) Patchset: PS4: It would probably be useful to add the msdn links to the commit message that explain what MS does? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 22:07:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
Attention is currently required from: fixeria, laforge.
Jenkins Builder has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email )
Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode
..
Patch Set 5:
(2 comments)
File src/common/l1sap.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12695):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/cad0efa7_87105560
PS5, Line 1879: } else {
else is not generally useful after a break or return
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12695):
https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/5bdef780_58ff2f99
PS5, Line 1893: } else {
else is not generally useful after a break or return
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219
Gerrit-Change-Number: 35124
Gerrit-PatchSet: 5
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 28 Nov 2023 22:00:45 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: gsmtap-rlp: Add support for skipping generating NULL frames
Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: gsmtap-rlp: Add support for skipping generating NULL frames .. gsmtap-rlp: Add support for skipping generating NULL frames If there's nothing to transmit over a CSD NT channel, both ends generate NULL frames. Let's add an option to suppress GSMTAP output for those, creating pcap files with less noise. Change-Id: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad --- M TODO-RELEASE M include/osmo-bts/bts.h M src/common/l1sap.c M src/common/vty.c M tests/osmo-bts.vty 5 files changed, 37 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/35133/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?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: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad Gerrit-Change-Number: 35133 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode .. Add GSMTAP encapsulation of RLP frames in CSD NT mode In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there are RLP (Radio Link Protocol) frames inside the modified V.110. wireshark alrady has a dissector for this, and we've introduced a GSMTAP type for RLP some time ago. So with this patch, we now generate such GSMTAP RLP frames. Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/vty.c M tests/osmo-bts.vty 5 files changed, 123 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35124/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder .. Patch Set 8: (1 comment) File src/gsm/rlp.c: https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/36d19e64_9be1da80 PS4, Line 93: memcpy(out->info, data+2, 240/8 - 5); > I actually find it easier to understand the way it is. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 28 Nov 2023 21:56:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
Attention is currently required from: fixeria, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames .. Patch Set 3: (2 comments) File src/gsm/rlp.c: https://gerrit.osmocom.org/c/libosmocore/+/35134/comment/aafd05b9_812a024d PS3, Line 74: /* we only support 240 bit so far */ > this is not true anymore? Done https://gerrit.osmocom.org/c/libosmocore/+/35134/comment/cb81046a_f26ced39 PS3, Line 88: out->fcs = (data[data_len-1] << 16) | (data[data_len-2]) << 8 | (data[data_len-3] << 0); > all this could really go into the previous commit. yes, with the difference that the 240bit is actually tested while the 576 is not. I'd like to merge the 240bit code now and the 576bit later when I found devices and a working setup to actually verify it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?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: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 28 Nov 2023 21:56:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email to look at the new patch set (#8). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: Add a GSM RLP decoder and encoder .. Add a GSM RLP decoder and encoder This code implements a decoder and encoder for the RLP (Radio Link Protocol) as used in the bearer channel of GSM CSD (Circuit Switched Data). Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/rlp.h M src/gsm/Makefile.am M src/gsm/libosmogsm.map A src/gsm/rlp.c M tests/Makefile.am A tests/rlp/rlp_test.c A tests/rlp/rlp_test.ok M tests/testsuite.at 9 files changed, 608 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/35123/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, fixeria, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: rlp: Add support for 576bit RLP frames .. rlp: Add support for 576bit RLP frames The code so far only supported 240bit RLP frames; Add support for 576bit in this patch. We still only support versions 0+1 and not version 2. Change-Id: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c --- M src/gsm/rlp.c 1 file changed, 39 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/35134/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?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: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
Attention is currently required from: fixeria, osmith, pespin.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email )
Change subject: Add a GSM RLP decoder and encoder
..
Patch Set 7:
(5 comments)
File include/osmocom/gsm/rlp.h:
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/00ac2ee0_727e5ead
PS4, Line 1: /*
> maybe add a line description here pointing to 3GPP TS 24.022.
Done
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/a05a35af_4a0e4ba0
PS4, Line 24: /*! \defgroup rlp GSM RLP (Radio Link Protocol) as used in CSD
> or add reference to 3GPP TS 24.022 here.
Done
File src/gsm/rlp.c:
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/c0ed4035_e0af9efa
PS4, Line 85: //out->fcs = (data[240/8-3] << 16) | (data[240/8-2]) << 8 |
(data[240/8-1] << 0);
> this line can be dropped?
Done
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/9eb43577_a1c9b574
PS4, Line 89: if (n_s == 0x3f) {
> switch (n_s)
Done
https://gerrit.osmocom.org/c/libosmocore/+/35123/comment/ea8475af_4940224c
PS4, Line 93: memcpy(out->info, data+2, 240/8 - 5);
> This 240/8 appears a lot of times, it may be worth describing it in a define.
I actually find it easier to understand the way it is. Anyone working on RLP
will know the 240 / 576 byte frame size.
#define 240BITS_AS_BYTES (240/8) doesn't really make the code more readable,
IMHO.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?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: I2d9bd8eb4f0cd0f72c436996767b199429596917
Gerrit-Change-Number: 35123
Gerrit-PatchSet: 7
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: pespin
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 28 Nov 2023 21:54:22 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: Hoernchen, dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email ) Change subject: libosmosim: Support Microsoft smart card discovery process .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Attention: Hoernchen Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 21:54:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-mgw[master]: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email ) Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 21:23:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: sim/class_tables: Prevent out-of-bounds access
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35155?usp=email )
Change subject: sim/class_tables: Prevent out-of-bounds access
..
sim/class_tables: Prevent out-of-bounds access
The INS tables always must be declared with 256 elements, even
if they only use some of them. We never know which random INS
code might be used to index them.
This was not discovered until now as the only known user of those
tables is always using the SIM/UICC/USIM table and not the plain
ISO7816 table.
Change-Id: I6739f469f6e84eed9aab403cc481ebff86df0181
---
M src/sim/class_tables.c
1 file changed, 18 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index 724c077..6d05ede 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -19,7 +19,7 @@
#include
#include
-static const uint8_t iso7816_ins_tbl[] = {
+static const uint8_t iso7816_ins_tbl[256] = {
[0xB0] = 2,/* READ BIN */
[0xD0] = 3,/* WRITE BIN */
[0xD6] = 3,/* UPDATE BIN */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35155?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: I6739f469f6e84eed9aab403cc481ebff86df0181
Gerrit-Change-Number: 35155
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: sim/class_tables: Prevent out-of-bounds access
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35155?usp=email ) Change subject: sim/class_tables: Prevent out-of-bounds access .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35155?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: I6739f469f6e84eed9aab403cc481ebff86df0181 Gerrit-Change-Number: 35155 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 28 Nov 2023 21:22:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: Hoernchen, dexter. Hello Hoernchen, Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: libosmosim: Support Microsoft smart card discovery process .. libosmosim: Support Microsoft smart card discovery process Our class/instruction tables (used mainly by simtrace cardem host software) only contain support for those instructions permitted in the related card specification. Microsoft blindly tries CLA=0xCA with INS=0x00 which is not somethin that the GSM SIM, ETSI UICC or 3GPP USIM specs specify, and which hence results in log output like this: DLINP DEBUG [0] <= osmo_st2_cardem_request_sw_tx(sw=6a88) DLGLOBAL INFO => DATA: flags=0x01 (HDR ), 00 ca 7f 68 00 DLGLOBAL ERROR Unknown APDU case 0 DLGLOBAL FATAL Failed to recognize APDU, terminating Let's adjust to microsoft and *always* support their instructions no matter which osim_cla_ins_card_profile was used. Special thanks to Eric Wild for pointing me to this unexpected behaviour of PC/SC on modern Windows. Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Related: SYS#6617 --- M src/sim/class_tables.c 1 file changed, 47 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/35154/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Attention: Hoernchen Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: libosmosim: Support Microsoft smart card discovery process
Attention is currently required from: Hoernchen, dexter. Hello Hoernchen, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email to look at the new patch set (#2). Change subject: libosmosim: Support Microsoft smart card discovery process .. libosmosim: Support Microsoft smart card discovery process Our class/instruction tables (used mainly by simtrace cardem host software) only contain support for those instructions permitted in the related card specification. Microsoft blindly tries CLA=0xCA with INS=0x00 which is not somethin that the GSM SIM, ETSI UICC or 3GPP USIM specs specify, and which hence results in log output like this: DLINP DEBUG [0] <= osmo_st2_cardem_request_sw_tx(sw=6a88) DLGLOBAL INFO => DATA: flags=0x01 (HDR ), 00 ca 7f 68 00 DLGLOBAL ERROR Unknown APDU case 0 DLGLOBAL FATAL Failed to recognize APDU, terminating Let's adjust to microsoft and *always* support their instructions no matter which osim_cla_ins_card_profile was used. Special thanks to Eric Wild for pointing me to this unexpected behaviour of PC/SC on modern Windows. Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Related: SYS#6617 --- M src/sim/class_tables.c 1 file changed, 45 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/35154/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b Gerrit-Change-Number: 35154 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder Gerrit-Attention: Hoernchen Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in libosmocore[master]: sim/class_tables: Prevent out-of-bounds access
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35155?usp=email ) Change subject: sim/class_tables: Prevent out-of-bounds access .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: so trivial, doesn't need review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35155?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: I6739f469f6e84eed9aab403cc481ebff86df0181 Gerrit-Change-Number: 35155 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 28 Nov 2023 21:03:08 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: sim/class_tables: Prevent out-of-bounds access
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35155?usp=email )
Change subject: sim/class_tables: Prevent out-of-bounds access
..
sim/class_tables: Prevent out-of-bounds access
The INS tables always must be declared with 256 elements, even
if they only use some of them. We never know which random INS
code might be used to index them.
This was not discovered until now as the only known user of those
tables is always using the SIM/UICC/USIM table and not the plain
ISO7816 table.
Change-Id: I6739f469f6e84eed9aab403cc481ebff86df0181
---
M src/sim/class_tables.c
1 file changed, 18 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/55/35155/1
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index 7c11f3b..4e0bb60 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -19,7 +19,7 @@
#include
#include
-static const uint8_t iso7816_ins_tbl[] = {
+static const uint8_t iso7816_ins_tbl[256] = {
[0xB0] = 2,/* READ BIN */
[0xD0] = 3,/* WRITE BIN */
[0xD6] = 3,/* UPDATE BIN */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35155?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: I6739f469f6e84eed9aab403cc481ebff86df0181
Gerrit-Change-Number: 35155
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: libosmsim: Support Microsoft smart card discovery process
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35154?usp=email )
Change subject: libosmsim: Support Microsoft smart card discovery process
..
libosmsim: Support Microsoft smart card discovery process
Our class/instruction tables (used mainly by simtrace cardem host
software) only contain support for those instructions permitted
in the related card specification.
Microsoft blindly tries CLA=0xCA with INS=0x00 which is not somethin
that the GSM SIM, ETSI UICC or 3GPP USIM specs specify, and which
hence results in log output like this:
DLINP DEBUG [0] <= osmo_st2_cardem_request_sw_tx(sw=6a88)
DLGLOBAL INFO => DATA: flags=0x01 (HDR ), 00 ca 7f 68 00
DLGLOBAL ERROR Unknown APDU case 0
DLGLOBAL FATAL Failed to recognize APDU, terminating
Let's adjust to microsoft and *always* support their instructions
no matter which osim_cla_ins_card_profile was used.
Special thanks to Eric Wild for pointing me to this unexpected
behaviour of PC/SC on modern Windows.
Change-Id: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Related: SYS#6617
---
M src/sim/class_tables.c
1 file changed, 45 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/35154/1
diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c
index 724c077..7c11f3b 100644
--- a/src/sim/class_tables.c
+++ b/src/sim/class_tables.c
@@ -350,6 +350,13 @@
[0x88] = 4,/* AUTHENTICATE */
};
+/*
https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discovery-process
*/
+static const uint8_t microsoft_discovery_ins_tbl[256] = {
+ [0xA4] = 4,/* SELECT FILE */
+ [0xCA] = 2,/* GET DATA */
+ [0xC0] = 2,/* GET RESPONSE */
+};
+
int osim_determine_apdu_case(const struct osim_cla_ins_card_profile *prof,
const uint8_t *hdr)
{
@@ -374,5 +381,14 @@
return rc;
}
}
+ /* special handling for Microsoft who insists to use INS=0xCA in
CLA=0x00 which is not
+* really part of GSM SIM, ETSI UICC or 3GPP USIM specifications, but
only ISO7816. Rather than adding
+* it to each and every card profile, let's add the instructions listed
at
+*
https://learn.microsoft.com/en-us/windows-hardware/drivers/smartcard/discovery-process
explicitly
+* here. They will only be used in case no more specific match was
found in the actual profile above. */
+ rc = microsoft_discovery_ins_tbl[ins];
+ if (rc)
+ return rc;
+
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35154?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: I424964c0afab643e6a5d7824d91c2c86b0d3f25b
Gerrit-Change-Number: 35154
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
[M] Change in osmo-hnbgw[master]: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email )
Change subject: mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN
side
..
mgw_fsm: Assume IuUP HNB IP addr = Iuh during MGCP CRCX on RAN side
In general, the HNBs end up binding its IuUP/RTP streams to the same IP
address used for Iuh signalling.
When receiving a RAB-Ass-Req from CN, osmo-hnbgw creates an endpoint in
its co-located MGW and creates 2 MGCP conns on it, one facing the RAN
side and one facing the CN side. At that point, the remote CN IuUP IP address
is known (was include din the received RAB-Ass-Req), but the RAN one is
not yet known. Hence, the CRCX on the RAN-side conn contained no remote
IP address, which means MGW has to blindly guess a good local IP address
if "ip probing" is enabled.
As a result, when RAB-Ass-Resp comes back from the hNodeB containing the
allocated remote IuUP IP address and MGW is updated through MGCP MDCX,
it may happen that MGW rebinds to a better fitting local IP address and
returns it in MDCX. This has several downfalls:
1- We don't yet support updating the hNodeB about the changed IP address
(see mgw_fsm_mdcx_hnb). For that, we'd need to send a RAB-Modify-Req+Resp.
2- Even if we supported it, in the general case we'd be delaying call
establishment because an extra roundtrip is needed to update
RAB-Modify-Req+Resp.
In general, the HNBs end up binding its IuUP/RTP streams to the same IP
address used for the Iuh signalling. Hence, use this assumption to
announce the Iuh IP address as a remote IuUP IP address when
transmitting the MGCP CRCX at the RAN-side conn to the MGW. This way
the MGW can potentially select a proper local IuUP IP address from the
start, so no RAB-Modify-Req is required later on.
The logic to transmit RAB-Modify-Req is left unimplemented in this
commit and is left as a later improvement.
Related: SYS#6657
Change-Id: I87c514204603e0f15a55da9b619c7ce1e14f042e
T#
Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe
---
M src/osmo-hnbgw/mgw_fsm.c
1 file changed, 63 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/53/35153/1
diff --git a/src/osmo-hnbgw/mgw_fsm.c b/src/osmo-hnbgw/mgw_fsm.c
index 7b4c811..5251374 100644
--- a/src/osmo-hnbgw/mgw_fsm.c
+++ b/src/osmo-hnbgw/mgw_fsm.c
@@ -26,6 +26,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -132,6 +134,7 @@
{
struct mgw_fsm_priv *mgw_fsm_priv = fi->priv;
struct hnbgw_context_map *map = mgw_fsm_priv->map;
+ struct hnb_context *hnb_ctx = map->hnb_ctx;
struct osmo_sockaddr addr;
struct osmo_sockaddr_str addr_str;
RANAP_RAB_AssignmentRequestIEs_t *ies;
@@ -168,6 +171,21 @@
mgw_info.codecs[0] = CODEC_IUFP;
mgw_info.codecs_len = 1;
+ /* The HNB IuUP IP address & port is not yet known here (Rx RAB-Ass-Req
Tx CRCX (RAN) time):
+* Assume and announce "remote IuUP IP address" == "remote Iuh
signalling IP address" to the MGW
+* here, so that it can most probably select a proper IuUP local IP
address to be used from the
+* start. In the event we receive a "remote IuUP IP address" != "remote
Iuh signalling IP address"
+* later on during RAB-Ass-Resp, we'll update IP addr at the MGW
through MDCX and if MGW decides
+* to use another IuUP local IP address as a result, it will be updated
at the HNB through
+* RAB-Modify-Req. */
+ if (hnb_ctx && hnb_ctx->conn &&
+ (rc = osmo_stream_srv_get_fd(hnb_ctx->conn)) >= 0) {
+ if (osmo_sock_get_remote_ip(rc, mgw_info.addr,
sizeof(mgw_info.addr)) < 0)
+ LOGPFSML(fi, LOGL_ERROR, "Invalid Iuh IP Address\n");
+ }
+ LOGPFSML(fi, LOGL_ERROR, "PESPIN: mgw_info.addr=%s\n", mgw_info.addr);
+ //mgw_info.port = 80;
+
mgw_fsm_priv->mgcpc = mgcp_client_pool_get(g_hnbgw->mgw_pool);
if (!mgw_fsm_priv->mgcpc) {
LOGPFSML(fi, LOGL_ERROR,
@@ -322,8 +340,7 @@
* normally. This is a situation we cannot recover from. */
LOGPFSML(fi, LOGL_ERROR, "Failed to extract RTP IP-address and
Port from RAB-AssignmentResponse\n");
osmo_fsm_inst_state_chg(fi, MGW_ST_FAILURE, 0, 0);
- return;
- }
+ return; }
rc = osmo_sockaddr_str_from_sockaddr(_str, );
if (rc < 0) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35153?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Icf43e3a1cde809d844f17ef2d0600efe64bc3dfe
Gerrit-Change-Number: 35153
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
[M] Change in osmo-mgw[master]: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email )
Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
..
mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
A client may know the IP address during CRCX but not yet the port, or it
may simply want to hint an initial IP address so that the MGW can better
guess when allocating a local IP address.
Related: SYS#6657
Change-Id: I30165dbac5e484011d0acf46af36f105954a501d
---
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_fsm.c
2 files changed, 58 insertions(+), 31 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/52/35152/1
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index b5897a6..103f17f 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -1302,9 +1302,6 @@
local_ip_family = osmo_ip_str_type(local_ip);
if (local_ip_family == AF_UNSPEC)
return -EINVAL;
- audio_ip_family = osmo_ip_str_type(mgcp_msg->audio_ip);
- if (audio_ip_family == AF_UNSPEC)
- return -EINVAL;
/* Add owner/creator (SDP) */
MSGB_PRINTF_OR_RET("o=- %x 23 IN IP%c %s\r\n", mgcp_msg->call_id,
@@ -1314,33 +1311,41 @@
/* Add session name (none) */
MSGB_PRINTF_OR_RET("s=-\r\n");
- /* Add RTP address and port */
- if (mgcp_msg->audio_port == 0) {
- LOGPMGW(mgcp, LOGL_ERROR,
- "Invalid port number, can not generate MGCP message\n");
- msgb_free(msg);
- return -EINVAL;
+ /* Add RTP address */
+ if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_IP) {
+ audio_ip_family = osmo_ip_str_type(mgcp_msg->audio_ip);
+ if (audio_ip_family == AF_UNSPEC)
+ return -EINVAL;
+ if (strlen(mgcp_msg->audio_ip) <= 0) {
+ LOGPMGW(mgcp, LOGL_ERROR,
+ "Empty ip address, can not generate MGCP
message\n");
+ msgb_free(msg);
+ return -EINVAL;
+ }
+ MSGB_PRINTF_OR_RET("c=IN IP%c %s\r\n",
+ audio_ip_family == AF_INET6 ? '6' : '4',
+ mgcp_msg->audio_ip);
}
- if (strlen(mgcp_msg->audio_ip) <= 0) {
- LOGPMGW(mgcp, LOGL_ERROR,
- "Empty ip address, can not generate MGCP message\n");
- msgb_free(msg);
- return -EINVAL;
- }
- MSGB_PRINTF_OR_RET("c=IN IP%c %s\r\n",
- audio_ip_family == AF_INET6 ? '6' : '4',
- mgcp_msg->audio_ip);
/* Add time description, active time (SDP) */
MSGB_PRINTF_OR_RET("t=0 0\r\n");
- MSGB_PRINTF_OR_RET("m=audio %u RTP/AVP", mgcp_msg->audio_port);
- for (i = 0; i < mgcp_msg->codecs_len; i++) {
- pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len,
mgcp_msg->codecs[i]);
- MSGB_PRINTF_OR_RET(" %u", pt);
+ /* Add RTP address port and codecs */
+ if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT) {
+ if (mgcp_msg->audio_port == 0) {
+ LOGPMGW(mgcp, LOGL_ERROR,
+ "Invalid port number, can not generate MGCP
message\n");
+ msgb_free(msg);
+ return -EINVAL;
+ }
+ MSGB_PRINTF_OR_RET("m=audio %u RTP/AVP", mgcp_msg->audio_port);
+ for (i = 0; i < mgcp_msg->codecs_len; i++) {
+ pt = map_codec_to_pt(mgcp_msg->ptmap,
mgcp_msg->ptmap_len, mgcp_msg->codecs[i]);
+ MSGB_PRINTF_OR_RET(" %u", pt);
+ }
+ MSGB_PRINTF_OR_RET("\r\n");
}
- MSGB_PRINTF_OR_RET("\r\n");
/* Add optional codec parameters (fmtp) */
if (mgcp_msg->param_present) {
@@ -1470,10 +1475,10 @@
MSGB_PRINTF_OR_RET("I: %s\r\n", mgcp_msg->conn_id);
}
- /* Using SDP makes sense when a valid IP/Port combination is specified,
+ /* Using SDP makes sense when a valid IP or Port is specified,
* if we do not know this information yet, we fall back to LCO */
if (mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_IP
- && mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT)
+ || mgcp_msg->presence & MGCP_MSG_PRESENCE_AUDIO_PORT)
use_sdp = true;
/* Add local connection options (LCO) */
diff --git a/src/libosmo-mgcp-client/mgcp_client_fsm.c
b/src/libosmo-mgcp-client/mgcp_client_fsm.c
index 660f0ad..73479f1 100644
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++
[S] Change in libosmocore[master]: gsup: add message type for osmo-epdg CEAI interface
lynxis lazus has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/32033?usp=email )
Change subject: gsup: add message type for osmo-epdg CEAI interface
..
gsup: add message type for osmo-epdg CEAI interface
The CEIA interface is an interface between osmo-epdg and
strongswan.
It is used by the osmo-epdg to synchronize state.
Related: OS#6091
Change-Id: I6f7c20340c99f94b1326a8a7dc99c86cf6a0dbc3
---
M include/osmocom/gsm/gsup.h
M src/gsm/gsup.c
2 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 56d7a30..6e7fcf0 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -198,6 +198,10 @@
OSMO_GSUP_MSGT_E_ABORT = 0b01001011,
OSMO_GSUP_MSGT_ROUTING_ERROR= 0b01001110,
+
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST = 0b0101,
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR= 0b01010001,
+ OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT = 0b01010010,
};
#define OSMO_GSUP_MSGT_E_ROUTING_ERROR OSMO_GSUP_MSGT_ROUTING_ERROR
@@ -281,6 +285,7 @@
OSMO_GSUP_MESSAGE_CLASS_SMS = 2,
OSMO_GSUP_MESSAGE_CLASS_USSD = 3,
OSMO_GSUP_MESSAGE_CLASS_INTER_MSC = 4,
+ OSMO_GSUP_MESSAGE_CLASS_IPSEC_EPDG = 5,
/* Keep this as last entry with a value of max(enum
osmo_gsup_message_class) + 1.
* This value shall serve as the size for an array to aid de-muxing all
known GSUP classes. */
OSMO_GSUP_MESSAGE_CLASS_ARRAYSIZE
diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c
index ef33ed0..4e09ac8 100644
--- a/src/gsm/gsup.c
+++ b/src/gsm/gsup.c
@@ -103,6 +103,10 @@
OSMO_VALUE_STRING(OSMO_GSUP_MSGT_ROUTING_ERROR),
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST),
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT),
+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR),
+
{ 0, NULL }
};
@@ -911,6 +915,7 @@
{ OSMO_GSUP_MESSAGE_CLASS_SMS, "SMS" },
{ OSMO_GSUP_MESSAGE_CLASS_USSD, "USSD" },
{ OSMO_GSUP_MESSAGE_CLASS_INTER_MSC, "Inter-MSC" },
+ { OSMO_GSUP_MESSAGE_CLASS_IPSEC_EPDG, "IPsec-ePDG" },
{}
};
--
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: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-CC: pespin
Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: Bump version: 1.11.0.5-67677-dirty → 1.11.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?usp=email ) Change subject: Bump version: 1.11.0.5-67677-dirty → 1.11.1 .. Bump version: 1.11.0.5-67677-dirty → 1.11.1 Depends: osmo-ggsn I1f116e1cded135f231f22ebc9b817aebf3736fc2 Change-Id: I869eef2032d6025c8ed59a1b25192c6c5c08977e --- M TODO-RELEASE M configure.ac M contrib/osmo-sgsn.spec.in M debian/changelog M debian/control 5 files changed, 26 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index bb4f900..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +1 @@ #component whatdescription / commit summary line -libgtp > 1.10 use gtp_cause_successful() diff --git a/configure.ac b/configure.ac index 6eac7c9..ddd91ab 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.4.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.7.0) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.10.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.11.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index 8ee0a75..7ba994f 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -34,7 +34,7 @@ %endif BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libgtp) >= 1.10.0 +BuildRequires: pkgconfig(libgtp) >= 1.11.0 BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.7.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0 BuildRequires: pkgconfig(libosmoabis) >= 1.5.0 diff --git a/debian/changelog b/debian/changelog index 206efd4..cb629fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +osmo-sgsn (1.11.1) unstable; urgency=medium + + [ Philipp Maier ] + * sgsn_rim: forward message based on RIM ROUTING ADDRESS + + [ Daniel Willmann ] + * sgsn_vty: Fix output in config_write_sgsn + * sgsn_vty: Correctly indent encryption cipher-plugin-path + * vty-tests: Test encryption options + * libgtp: Check for all successful create_pdp_conf causes + + -- Oliver Smith Tue, 28 Nov 2023 13:32:46 +0100 + osmo-sgsn (1.11.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 77af36e..aa59455 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.10.0), + libgtp-dev (>= 1.11.0), libosmocore-dev (>= 1.9.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?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: I869eef2032d6025c8ed59a1b25192c6c5c08977e Gerrit-Change-Number: 35150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:57:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/451abde9_942e3096 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > That makes more sense now, so when we can safely assume that nobody is > listening, then we skip the i […] IIRC you can only decrease a given number of dBm at specific points in time, it's specified somewhere in the specs, we have that implemented in osmo-bts. At least for C0, others may be able to transmit nothing. Hence why it's fine sending nothing in general for TRX!=0 no matter whether the BTS supports it, but for TRX0 we really need to transmit something in time (and that's done by BTS or PCU depending on what the bts supports atPCUIF/lower layer level). I think it's also meant to avoid/lower radio interference/noise. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:55:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: Bump version: 1.11.0.5-67677-dirty → 1.11.1
Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?usp=email ) Change subject: Bump version: 1.11.0.5-67677-dirty → 1.11.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?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: I869eef2032d6025c8ed59a1b25192c6c5c08977e Gerrit-Change-Number: 35150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 15:44:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: app: do not catch exceptions in init_card
laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/35101?usp=email )
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(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
diff --git a/pySim/app.py b/pySim/app.py
index 1711a1c..b0df85f 100644
--- a/pySim/app.py
+++ b/pySim/app.py
@@ -55,14 +55,7 @@
# Wait up to three seconds for a card in reader and try to detect
# the card type.
print("Waiting for card...")
-try:
-sl.wait_for_card(3)
-except NoCardError:
-print("No card detected!")
-return None, None
-except:
-print("Card not readable!")
-return None, None
+sl.wait_for_card(3)
generic_card = False
card = card_detect(scc)
@@ -73,6 +66,10 @@
profile = CardProfile.pick(scc)
if profile is None:
+# It is not an unrecoverable error in case profile detection fails. It
+# just means that pySim was unable to recognize the card profile. This
+# may happen in particular with unprovisioned cards that do not have
+# any files on them yet.
print("Unsupported card type!")
return None, card
--
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-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors
laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/35102?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)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(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/pySim-shell.py b/pySim-shell.py
index 795276a..4e08eb7 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -979,7 +979,9 @@
" it should also be noted that some readers may behave strangely
when no card")
print(" is inserted.)")
print("")
-app = PysimApp(None, None, sl, ch, opts.script)
+if opts.script:
+print("will not execute startup script due to card initialization
errors!")
+app = PysimApp(None, None, sl, ch)
# If the user supplies an ADM PIN at via commandline args authenticate
# immediately so that the user does not have to use the shell commands
--
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-MessageType: merged
[S] Change in pysim[master]: app: do not catch exceptions in init_card
Attention is currently required from: dexter. 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 2: Code-Review+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-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:41:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: neels, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?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: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 15:41:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:40:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: fixeria, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 2: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/01ba615e_60329e37 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > IIRC osmo-bts-trx does something slightly different if it detects no block is > to be sent because no […] That makes more sense now, so when we can safely assume that nobody is listening, then we skip the idle blocks. The TRX then sends idle blocks for us which are reduced in power so that energy is saved. (Why not turning off the TRX completely? Nobody is listening anyway? Or is this forbidden by the spec?) When I get this right the skipping of idle blocks only refers to the periods where no TBF is allocated. When there is a TBF we still send dummy blocks from the PCU. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 28 Nov 2023 15:33:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: gprs_rlcmac_sched: rewrite logic around idle block skip .. gprs_rlcmac_sched: rewrite logic around idle block skip The logic that decides whether to generate idle / dummy blocks directly at the PCU or leave the work to the TRX implementation of that specific BTS has a confusing appeareance. (This is a follow up patch to change I7a08d8cc670fa14f7206dbc22351f3668a17) Related: OS#6191 Change-Id: Iadb62748b18605bf158169b317f880352bc0a5a6 --- M src/gprs_rlcmac_sched.cpp 1 file changed, 31 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/35151/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: vty: disallow combination of early-IA and frequency hopping
Attention is currently required from: neels, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35097?usp=email ) Change subject: vty: disallow combination of early-IA and frequency hopping .. Patch Set 2: (1 comment) File src/osmo-bsc/bts_trx_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/35097/comment/7cfd114b_94b51cc7 PS2, Line 352: ts->hopping.enabled = enabled; > I would have expected the error + return before actually enabling it. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35097?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: I8d375e5155be7b53034d5c0be5566d2f33af5db0 Gerrit-Change-Number: 35097 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 15:22:02 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: add sdp_audio_codec_to_speech_codec_list()
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email ) Change subject: add sdp_audio_codec_to_speech_codec_list() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35050?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I6ac23c54bc26939e048ff2df06eb987421cfb1c5 Gerrit-Change-Number: 35050 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 15:16:38 + 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. pespin 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-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:10:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 1: (2 comments) Patchset: PS1: btw, I think this code change can also be applied to the other place where you removed the #ifdef in the previous commit. File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/c2b472ef_35de08e1 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing > I don't get why this is energy saving. The dummy block is sent in any case. > […] IIRC osmo-bts-trx does something slightly different if it detects no block is to be sent because no one is listening, like decreasing the Tx power during that time. If MS are listening on that PDCH, then we still need to transmit at regular Tx power. @vyanits...@sysmocom.de probably remembers better. In any case, I'd rather leave the comment where it was, immedatelly after the parent "else" block, since it refers to the whole case where an RLCMAC Dummy Block would be sent. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 15:06:56 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: fix condition for generating dummy blocks on idle
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/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/15e16302_097cbebb PS2, Line 492: skip_idle = skip_idle && trx != 0; > I think now that we don't have the #ifdef, we can really simplify this to: > […] I have created a follow up patch now, so we can discuss there how we simplify this: https://gerrit.osmocom.org/c/osmo-pcu/+/35151 -- 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-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 14:44:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email ) Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip .. Patch Set 1: (1 comment) File src/gprs_rlcmac_sched.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/35151/comment/724b3af7_7e2b6a19 PS1, Line 486: * way we help BTS energy saving (on TRX!=C0) by sending nothing I don't get why this is energy saving. The dummy block is sent in any case. A dummy block should consume as much energy as a block that has actual data in it. So all we do here is looking up if there are TBF. If there are none => msg = NULL => TRX will create and send a dummy frame by itself) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6 Gerrit-Change-Number: 35151 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 14:43:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-pcu[master]: gprs_rlcmac_sched: rewrite logic around idle block skip
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-pcu/+/35151?usp=email )
Change subject: gprs_rlcmac_sched: rewrite logic around idle block skip
..
gprs_rlcmac_sched: rewrite logic around idle block skip
The logic that decides whether to generate idle / dummy blocks directly
at the PCU or leave the work to the TRX implementation of that specific
BTS has a confusing appeareance.
(This is a follow up patch to change
I7a08d8cc670fa14f7206dbc22351f3668a17)
Related: OS#6191
Change-Id: Iadb62748b18605bf158169b317f880352bc0a5a6
---
M src/gprs_rlcmac_sched.cpp
1 file changed, 36 insertions(+), 15 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/35151/1
diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp
index 12b9e50..a56fcb3 100644
--- a/src/gprs_rlcmac_sched.cpp
+++ b/src/gprs_rlcmac_sched.cpp
@@ -474,22 +474,26 @@
}
/* Prio 3: send dummy control message if need to poll or USF */
else {
- /* If there's no TBF attached to this PDCH, we can submit an
empty
-* data_req since there's nothing to transmit nor to poll/USF.
This
-* way we help BTS energy saving (on TRX!=C0) by sending nothing
-* instead of a dummy block. The early return is done here and
-* not at the start of the function because the condition below
-* (num_tbfs==0) may not be enough, because temporary dummy TBFs
-* created to send Imm Ass Rej (see handle_tbf_reject()) don't
-* have a TFI assigned and hence are not attached to the PDCH
-* TS, so they don't show up in the count below.
-*/
- const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
- + pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
- bool skip_idle = (num_tbfs == 0);
+ bool skip_idle;
- if (bts->gen_idle_blocks)
- skip_idle = skip_idle && trx != 0;
+ if (bts->gen_idle_blocks) {
+ /* Always generate all idle blocks since the TRX of
this BTS does
+* not generate idle blocks by itself. */
+ skip_idle = false;
+ } else {/* Only skip if no one is listening on this PDCH:
+* If there's no TBF attached to this PDCH, we can
submit an empty
+* data_req since there's nothing to transmit nor to
poll/USF. This
+* way we help BTS energy saving (on TRX!=C0) by
sending nothing
+* instead of a dummy block. The early return is done
here and
+* not at the start of the function because the
condition below
+* (num_tbfs==0) may not be enough, because temporary
dummy TBFs
+* created to send Imm Ass Rej (see
handle_tbf_reject()) don't
+* have a TFI assigned and hence are not attached to
the PDCH
+* TS, so they don't show up in the count below. */
+ const unsigned num_tbfs =
pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
+ +
pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
+ skip_idle = (num_tbfs == 0);
+ }
if (!skip_idle && (msg = sched_dummy())) {
/* increase counter */
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/35151?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: Iadb62748b18605bf158169b317f880352bc0a5a6
Gerrit-Change-Number: 35151
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: osmo_io: Factor out and use common send function from backend
Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35078?usp=email ) Change subject: osmo_io: Factor out and use common send function from backend .. Patch Set 1: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/35078/comment/e07d3106_06f58829 PS1, Line 360: rc == 0 case seems to be missing here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35078?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: I6da2653d32aedd0e7872be0cf90a841b56462e59 Gerrit-Change-Number: 35078 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 13:41:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No 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.
pespin 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/gprs_rlcmac_sched.cpp:
https://gerrit.osmocom.org/c/osmo-pcu/+/35096/comment/bc33e489_dccdf6cf
PS2, Line 492: skip_idle = skip_idle && trx != 0;
I think now that we don't have the #ifdef, we can really simplify this to:
bool skip_dummy;
if (bts->gen_dummy_blk) {
skip_dummy = false;
} else {
const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
skip_dummy = (num_tbfs == 0);
}
This can again be simplified to:
bool skip_dummy = bts->gen_dummy_blk;
if (skip_dummy) {
/* Only skip if no one is listening on this PDCH: */
const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
skip_dummy = (num_tbfs == 0);
}
--
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-Reviewer: laforge
Gerrit-CC: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 28 Nov 2023 13:38:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: early-IA: use the correct TRX
Attention is currently required from: daniel, neels. pespin 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/3000b245_8e7cd8de PS3, Line 1403: /* hopping is disabled. */ > What if hopping is enabled? Should we return an rsl_tx_error_report() Ack -- 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-CC: pespin Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 13:08:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: Bump version: 1.11.0.5-67677-dirty → 1.11.1
Attention is currently required from: osmith, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?usp=email ) Change subject: Bump version: 1.11.0.5-67677-dirty → 1.11.1 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?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: I869eef2032d6025c8ed59a1b25192c6c5c08977e Gerrit-Change-Number: 35150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 13:07:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625 → 1.11.0
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625 → 1.11.0 .. Bump version: 1.10.2.1-a625 → 1.11.0 Change-Id: I1f116e1cded135f231f22ebc9b817aebf3736fc2 --- M debian/changelog M gtp/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f72d9f6..9eb37fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-ggsn (1.11.0) unstable; urgency=medium + + [ Daniel Willmann ] + * gtp: Add net GTP cause values and a function to check for success + + -- Oliver Smith Tue, 28 Nov 2023 13:38:29 +0100 + osmo-ggsn (1.10.2) unstable; urgency=medium [ Vadim Yanitskiy ] diff --git a/gtp/Makefile.am b/gtp/Makefile.am index cb32da7..99ad8bb 100644 --- a/gtp/Makefile.am +++ b/gtp/Makefile.am @@ -2,7 +2,7 @@ # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html # If major=current-age is increased, remember to update the dh_strip line in debian/rules! -LIBVERSION=9:0:3 +LIBVERSION=9:1:3 lib_LTLIBRARIES = libgtp.la -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625 → 1.11.0
Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625 → 1.11.0 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 13:07:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625 → 1.11.0
Attention is currently required from: daniel, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625 → 1.11.0 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 13:04:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, fixeria, laforge, neels.
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Introduce per-BTS timers, RLC timer commands
..
Patch Set 16: Code-Review-1
(16 comments)
File include/osmocom/bsc/gsm_data.h:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/805a2cc6_e0ac3ba7
PS16, Line 720: enum gprs_rlc_par {
I bet this is not needed anymore and can be dropped?
File src/osmo-bsc/bsc_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/709588ee_c5374837
PS16, Line 51: extern void bts_gprs_timer_groups_init(struct gsm_bts *bts);
why don't you add this to a header file?
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/1ea08409_2909a72c
PS16, Line 240: bts_gprs_timer_groups_init(bts);
why is this put here and not in gsm_bts_alloc_register() ?
File src/osmo-bsc/bsc_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/d8c3ec12_bf937d5a
PS16, Line 235:
You could submit this a a preparation patch.
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/5059a9c4_d631760d
PS16, Line 336: int rc = CMD_WARNING, bts_nr = atoi(argv[0]);
please use separate lines.
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/200c39ee_c7676da8
PS16, Line 346: if (bts->gprs.mode == BTS_GPRS_NONE) {
why can't I configure gprs timers if gprs is not currently enabled? I don't see
a problem with it, and several usability problems, like having to comment all
timer lines if I decide to start the app with "gprs mode none".
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/07070b25_bd8b2072
PS16, Line 351: ++group;
we tend to use group++ unless there's a good reason to use preinc.
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/ffb743b5_be8f4972
PS16, Line 354: if (bts_write_group_timers(vty, "", bts_nr,
group, T_arg, false) == CMD_WARNING)
I don't really understand what are you doing here comparing against ==
CMD_WARNING and then doing rc = CMD_SUCCESS.
File src/osmo-bsc/bts_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/fb231078_729120e6
PS12, Line 60: 3101
> I actually find this problematic. […]
Simply use 3101 for T3101, and -3101 (X3101) for N3101.
File src/osmo-bsc/bts_init.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/dde08777_91ad0b5f
PS16, Line 88: for (gbtg = 0; gbtg <
ARRAY_SIZE(bts_gprs_timer_template_groups); gbtg++)
memcpy(>timer_groups[0], bts_gprs_timer_template_groups[0],
ARRAY_SIZE(bts_gprs_timer_template_groups));
File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/882fe6f8_b5ac08bf
PS12, Line 253: struct abis_nm_ipacc_att_rlc_cfg
> cosmetic: it's not necessary to specify the struct type here.
Ack
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/c071f5c0_bce88d2d
PS3, Line 1706: /* TODO (BSSGP timer patch): If argument is one of
BSSGP Timers strings, then translate to
> My understanding so far has been, that we have three timer groups that relate
> to OS#5335 (e.g. […]
So if this patch is for RLC; why are you touching BSSGP lines here?
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/28ee33b2_d47d1a37
PS12, Line 56: limits.h
> why including thise header? I cannot see `_MIN` or `_MAX` in new code...
Ack
File tests/nanobts_omlattr/nanobts_omlattr_test.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/ad2e2f37_e3dc11a2
PS16, Line 37: extern void bts_gprs_timer_groups_init(struct gsm_bts *bts);
don't we have headers for this?
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/165508af_c16add51
PS16, Line 38: extern void bts_grprs_tdef_groups_init(void);
typo: grprs.
https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/b11f60da_c8b22194
PS16, Line 158: bts_grprs_tdef_groups_init();
typo: grprs.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?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: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 16
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: arehbein
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Tue, 28 Nov 2023 13:04:06 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: arehbein
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email ) Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?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: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Tue, 28 Nov 2023 12:46:15 + 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 3: Code-Review+1 -- 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: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: falconia Gerrit-Comment-Date: Tue, 28 Nov 2023 12:44:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: Bump version: 1.11.0.5-67677-dirty → 1.11.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?usp=email ) Change subject: Bump version: 1.11.0.5-67677-dirty → 1.11.1 .. Bump version: 1.11.0.5-67677-dirty → 1.11.1 Depends: osmo-ggsn I1f116e1cded135f231f22ebc9b817aebf3736fc2 Change-Id: I869eef2032d6025c8ed59a1b25192c6c5c08977e --- M TODO-RELEASE M configure.ac M contrib/osmo-sgsn.spec.in M debian/changelog M debian/control 5 files changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/50/35150/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index bb4f900..1c5d61f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +1 @@ #component whatdescription / commit summary line -libgtp > 1.10 use gtp_cause_successful() diff --git a/configure.ac b/configure.ac index 6eac7c9..ddd91ab 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.5.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.4.0) PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.7.0) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.10.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.11.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], diff --git a/contrib/osmo-sgsn.spec.in b/contrib/osmo-sgsn.spec.in index 8ee0a75..7ba994f 100644 --- a/contrib/osmo-sgsn.spec.in +++ b/contrib/osmo-sgsn.spec.in @@ -34,7 +34,7 @@ %endif BuildRequires: pkgconfig(libcares) BuildRequires: pkgconfig(libcrypto) >= 0.9.5 -BuildRequires: pkgconfig(libgtp) >= 1.10.0 +BuildRequires: pkgconfig(libgtp) >= 1.11.0 BuildRequires: pkgconfig(libosmo-gsup-client) >= 1.7.0 BuildRequires: pkgconfig(libosmo-netif) >= 1.4.0 BuildRequires: pkgconfig(libosmoabis) >= 1.5.0 diff --git a/debian/changelog b/debian/changelog index 206efd4..cb629fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +osmo-sgsn (1.11.1) unstable; urgency=medium + + [ Philipp Maier ] + * sgsn_rim: forward message based on RIM ROUTING ADDRESS + + [ Daniel Willmann ] + * sgsn_vty: Fix output in config_write_sgsn + * sgsn_vty: Correctly indent encryption cipher-plugin-path + * vty-tests: Test encryption options + * libgtp: Check for all successful create_pdp_conf causes + + -- Oliver Smith Tue, 28 Nov 2023 13:32:46 +0100 + osmo-sgsn (1.11.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 77af36e..aa59455 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.10.0), + libgtp-dev (>= 1.11.0), libosmocore-dev (>= 1.9.0), libosmo-abis-dev (>= 1.5.0), libosmo-netif-dev (>= 1.4.0), -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35150?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: I869eef2032d6025c8ed59a1b25192c6c5c08977e Gerrit-Change-Number: 35150 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625 → 1.11.0
Attention is currently required from: daniel, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625 → 1.11.0 .. Patch Set 1: (1 comment) File gtp/Makefile.am: https://gerrit.osmocom.org/c/osmo-ggsn/+/35149/comment/f88b7008_cfe8fda8 PS1, Line 5: LIBVERSION=9:1:3 > this is wrong, a new API gtp_cause_successful() has been added. It should be LIBVERSION=10:0:4. it's a static inline function, so 9:1:3 is fine as discussed in chat > And hence not a patch release, but a minor release. done -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 12:40:25 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625 → 1.11.0
Attention is currently required from: daniel, osmith, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by pespin, Verified+1 by Jenkins Builder Change subject: Bump version: 1.10.2.1-a625 → 1.11.0 .. Bump version: 1.10.2.1-a625 → 1.11.0 Change-Id: I1f116e1cded135f231f22ebc9b817aebf3736fc2 --- M debian/changelog M gtp/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/49/35149/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-MessageType: newpatchset
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625-dirty → 1.10.3
Attention is currently required from: daniel, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625-dirty → 1.10.3 .. Patch Set 1: (1 comment) Patchset: PS1: the LIBVERSION is fine since it's a static inline, but the verison still needs to be bumped as minor, not patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 12:37:59 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: tell PCU a more realistic BTS model
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?usp=email )
Change subject: PCU_Tests: tell PCU a more realistic BTS model
..
PCU_Tests: tell PCU a more realistic BTS model
In ts_PCUIF_INFO_default we set the bts_model member to
PCU_IF_BTS_MODEL_UNSPEC. This means that the PCU will not know the BTS
model and thus it is not able to comply to the specific pecularities of
the BTS model that is used. In PCU_Tests.ttcn we simulate the behavior
of an OsmoBTS with OsmoTRX, therefore we should set the BTS model to
PCU_IF_BTS_MODEL_TRX.
This will also fix the problems we have with unexpected DUMMY messages
we currently receive since in an OsmoTRX based BTS model those frames
will be generated by OsmoTRX and do not appear on the PCUIF interface.
When the BTS model is left unspecified, then the PCU will generate those
DUMMY messages and irretate the testsuite.
Related: OS#6191
Change-Id: I6b516eece6acc96ebde9759bcb609197a245dd84
---
M pcu/PCU_Tests.ttcn
1 file changed, 24 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index fb935d9..442d617 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -112,7 +112,7 @@
remote_port := { mp_nsconfig.nsvc[0].provider.ip.local_udp_port, 0 },
remote_addr := f_PCUIF_RemoteAddr(
f_PCUIF_AF2addr_type(mp_nsconfig.nsvc[0].provider.ip.address_family),
mp_nsconfig.nsvc[0].provider.ip.local_ip),
- bts_model := PCU_IF_BTS_MODEL_UNSPEC
+ bts_model := PCU_IF_BTS_MODEL_TRX
}
/* Passed in RAN-INFO message from emulated neighbor using RIM */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?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: I6b516eece6acc96ebde9759bcb609197a245dd84
Gerrit-Change-Number: 35144
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ggsn[master]: Bump version: 1.10.2.1-a625-dirty → 1.10.3
Attention is currently required from: daniel, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?usp=email ) Change subject: Bump version: 1.10.2.1-a625-dirty → 1.10.3 .. Patch Set 1: Code-Review-1 (1 comment) File gtp/Makefile.am: https://gerrit.osmocom.org/c/osmo-ggsn/+/35149/comment/d56dbb2a_9ece2d04 PS1, Line 5: LIBVERSION=9:1:3 this is wrong, a new API gtp_cause_successful() has been added. It should be LIBVERSION=10:0:4. And hence not a patch release, but a minor release. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/35149?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: I1f116e1cded135f231f22ebc9b817aebf3736fc2 Gerrit-Change-Number: 35149 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: daniel Gerrit-Comment-Date: Tue, 28 Nov 2023 12:34:40 + Gerrit-HasComments: Yes 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, fixeria, jolly. pespin 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 3: Code-Review+1 -- 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: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: falconia Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 28 Nov 2023 12:32:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: tell PCU a more realistic BTS model
Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?usp=email ) Change subject: PCU_Tests: tell PCU a more realistic BTS model .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?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: I6b516eece6acc96ebde9759bcb609197a245dd84 Gerrit-Change-Number: 35144 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 12:29:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number
Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35136?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35136?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: I0b37f01f4c7bb829053231339e39ab734f4c8cbc Gerrit-Change-Number: 35136 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Attention: dexter Gerrit-Comment-Date: Tue, 28 Nov 2023 12:25:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-msc[master]: test_call: codecs: allow specific PT numbers [2/2]
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35141?usp=email ) Change subject: test_call: codecs: allow specific PT numbers [2/2] .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35141?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I25df2ed7ad792fbe66dfd0fbf08182c9cf6cfc5b Gerrit-Change-Number: 35141 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 12:25:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-msc[master]: test_call: codecs: allow specific PT numbers [1/2]
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35140?usp=email ) Change subject: test_call: codecs: allow specific PT numbers [1/2] .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35140?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I618e3cf1b412985589a0c63bd76b7a60202f17b9 Gerrit-Change-Number: 35140 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 12:24:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: add comment in codec_mapping.c
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35139?usp=email ) Change subject: add comment in codec_mapping.c .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0905a1264cd8f940c7a9964addf241091425fe72 Gerrit-Change-Number: 35139 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 12:22:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-msc[master]: msc_vlr_test_call: codecs: properly test new codec matching
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35138?usp=email ) Change subject: msc_vlr_test_call: codecs: properly test new codec matching .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib933554f826c1b4347dfa3f6c4f6fe086be8b133 Gerrit-Change-Number: 35138 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 12:21:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-msc[master]: msc_vlr_test_call: drop misleading log
Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35137?usp=email ) Change subject: msc_vlr_test_call: drop misleading log .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35137?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I94e430e4e5b5bf18dbb155258d82f599ada453e6 Gerrit-Change-Number: 35137 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: neels Gerrit-Comment-Date: Tue, 28 Nov 2023 12:16:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.2]: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email ) Change subject: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error .. sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error It's fine changing the define because due to the previous error it means basically that it was never used so far, because using it triggers a compilation error. The error was introduced because I ended up not using this in the past after submitting this code, and now that I want to use it it went noticed that it fails. Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 (cherry picked from commit d9a5c8d32f10af0479c87b957fd7e23cecb8fcce) --- M include/osmocom/core/sockaddr_str.h 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 2d3e7e9..c646f49 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -63,7 +63,7 @@ ((R)->af == AF_INET6) ? "[" : "", \ (R)->ip, \ ((R)->af == AF_INET6) ? "]" : "", \ - (R)->port : 0 + (R)->port #define OSMO_SOCKADDR_STR_FMT_ARGS(R) \ ((R) && (R)->af == AF_INET6) ? "[" : "", \ (R) ? (R)->ip : "NULL", \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 Gerrit-Change-Number: 35145 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.2]: Disable uring when building for embedded
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email ) Change subject: Disable uring when building for embedded .. Disable uring when building for embedded Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Related: OS#6233 (cherry picked from commit 0266b531c5f261e3e3a0235d2681bedd8b9e0f31) --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved 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/+/35147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 35147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.2]: Bump version: 1.9.1.3-128b-dirty → 1.9.2
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email ) Change subject: Bump version: 1.9.1.3-128b-dirty → 1.9.2 .. Bump version: 1.9.1.3-128b-dirty → 1.9.2 Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 --- M debian/changelog M src/core/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 012a76d..9a06fe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libosmocore (1.9.2) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error + + [ Daniel Willmann ] + * logging_gsmtap: Temporarily disable logging when sending the logs + * Disable uring when building for embedded + + -- Oliver Smith Tue, 28 Nov 2023 12:59:15 +0100 + libosmocore (1.9.1) unstable; urgency=medium [ Manawyrm ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 109aae7..796e906 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:1:0 +LIBVERSION=21:2:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 Gerrit-Change-Number: 35148 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.2]: logging_gsmtap: Temporarily disable logging when sending the logs
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs .. logging_gsmtap: Temporarily disable logging when sending the logs This avoids an infinite recursion when sending a gsmtap log message causes a log message. Temporarily set target->loglevel higher than LOGL_FATAL, which effectively disables logging for that target. Other targets like stderr will still log this message so there is still an indication that something went wrong. Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Related: OS#6213 (cherry picked from commit f2629675aac5f95ae3c01f86f5bb3f342a1c1f9b) --- M src/core/logging_gsmtap.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index dfd059b..7775c27 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -65,6 +65,7 @@ struct timeval tv; int rc; const char *file_basename; + unsigned int _level; /* get timestamp ASAP */ osmo_gettimeofday(, NULL); @@ -114,7 +115,11 @@ } msgb_put(msg, rc); + /* Ensure that any error occurring when sending the log message doesn't cause infinite recursion */ + _level = target->loglevel; + target->loglevel = UINT8_MAX; rc = gsmtap_sendmsg(target->tgt_gsmtap.gsmtap_inst, msg); + target->loglevel = _level; if (rc) msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 35146 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.2]: Bump version: 1.9.1.3-128b-dirty → 1.9.2
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email ) Change subject: Bump version: 1.9.1.3-128b-dirty → 1.9.2 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 Gerrit-Change-Number: 35148 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 12:01:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.2]: Disable uring when building for embedded
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email ) Change subject: Disable uring when building for embedded .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 35147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: daniel Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.2]: logging_gsmtap: Temporarily disable logging when sending the logs
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 35146 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-CC: daniel Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.2]: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email ) Change subject: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 Gerrit-Change-Number: 35145 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:34 + 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, pespin.
Hello Jenkins Builder, falconia, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/35132?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
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/AHS 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, 57 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/35132/3
--
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: 3
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia
Gerrit-Reviewer: fixeria
Gerrit-CC: pespin
Gerrit-Attention: jolly
Gerrit-Attention: falconia
Gerrit-Attention: pespin
Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: Transmit invalid AMR speech blocks instead of dummy FACCH
Attention is currently required from: falconia, fixeria, pespin. jolly 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 2: (6 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/ae389c39_b8a82383 PS2, Line 12: TCH/HS > TCH/AHS, not TCH/HS. Done File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/81449da0_c741db9e PS2, Line 541: AMR > Maybe say TCH/AFS rather than just AMR, for consistency. Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/298e64c5_24a77de1 PS2, Line 541: * - If the channel mode is AMR, transmit a dummy with speech > And yes, as @falcon@freecalypso. […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/aac791c5_2168bf2d PS2, Line 578: dummy_facch: > Alternatively, we can move generation of dummy FACCH into a `static inline` > function (`src/osmo-bts- […] I implemented the suggestion by @pes...@sysmocom.de. Moving code to an inline function is ok with TCH/F, but not TCH/H, because there is an additional check that refers, if FACCH is not allowed at the FN of the requested bursts: "if (!sched_tchh_dl_facch_map[br->fn % 26])" File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/edee87f2_ae025ee5 PS2, Line 453: /* - If the channel mode is TCH/HS or TCH/EFS, transmit a dummy > The overall structure of the comment after your change no longer makes sense. > […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35132/comment/6e6d4645_de5d7773 PS2, Line 453: TCH/EFS > If we are keeping the whole comment structure as-is (see my other comment), > this part should read TC […] Done -- 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: 2 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Attention: falconia Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 28 Nov 2023 12:00:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: falconia Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.2]: Bump version: 1.9.1.3-128b-dirty → 1.9.2
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email ) Change subject: Bump version: 1.9.1.3-128b-dirty → 1.9.2 .. Bump version: 1.9.1.3-128b-dirty → 1.9.2 Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 --- M debian/changelog M src/core/Makefile.am 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/35148/1 diff --git a/debian/changelog b/debian/changelog index 012a76d..9a06fe9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +libosmocore (1.9.2) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error + + [ Daniel Willmann ] + * logging_gsmtap: Temporarily disable logging when sending the logs + * Disable uring when building for embedded + + -- Oliver Smith Tue, 28 Nov 2023 12:59:15 +0100 + libosmocore (1.9.1) unstable; urgency=medium [ Manawyrm ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 109aae7..796e906 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:1:0 +LIBVERSION=21:2:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35148?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I0feec4b39d59f11c2f6d77bcac96c89de549fcd5 Gerrit-Change-Number: 35148 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in libosmocore[osmith/1.9.2]: logging_gsmtap: Temporarily disable logging when sending the logs
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email ) Change subject: logging_gsmtap: Temporarily disable logging when sending the logs .. logging_gsmtap: Temporarily disable logging when sending the logs This avoids an infinite recursion when sending a gsmtap log message causes a log message. Temporarily set target->loglevel higher than LOGL_FATAL, which effectively disables logging for that target. Other targets like stderr will still log this message so there is still an indication that something went wrong. Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Related: OS#6213 (cherry picked from commit f2629675aac5f95ae3c01f86f5bb3f342a1c1f9b) --- M src/core/logging_gsmtap.c 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/35146/1 diff --git a/src/core/logging_gsmtap.c b/src/core/logging_gsmtap.c index dfd059b..7775c27 100644 --- a/src/core/logging_gsmtap.c +++ b/src/core/logging_gsmtap.c @@ -65,6 +65,7 @@ struct timeval tv; int rc; const char *file_basename; + unsigned int _level; /* get timestamp ASAP */ osmo_gettimeofday(, NULL); @@ -114,7 +115,11 @@ } msgb_put(msg, rc); + /* Ensure that any error occurring when sending the log message doesn't cause infinite recursion */ + _level = target->loglevel; + target->loglevel = UINT8_MAX; rc = gsmtap_sendmsg(target->tgt_gsmtap.gsmtap_inst, msg); + target->loglevel = _level; if (rc) msgb_free(msg); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: I19203cadbad6019a3834793b8ac816d903fe088e Gerrit-Change-Number: 35146 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: daniel Gerrit-MessageType: newchange
[S] Change in libosmocore[osmith/1.9.2]: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email ) Change subject: sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error .. sockaddr_str.h Fix OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL syntax error It's fine changing the define because due to the previous error it means basically that it was never used so far, because using it triggers a compilation error. The error was introduced because I ended up not using this in the past after submitting this code, and now that I want to use it it went noticed that it fails. Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 (cherry picked from commit d9a5c8d32f10af0479c87b957fd7e23cecb8fcce) --- M include/osmocom/core/sockaddr_str.h 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/35145/1 diff --git a/include/osmocom/core/sockaddr_str.h b/include/osmocom/core/sockaddr_str.h index 2d3e7e9..c646f49 100644 --- a/include/osmocom/core/sockaddr_str.h +++ b/include/osmocom/core/sockaddr_str.h @@ -63,7 +63,7 @@ ((R)->af == AF_INET6) ? "[" : "", \ (R)->ip, \ ((R)->af == AF_INET6) ? "]" : "", \ - (R)->port : 0 + (R)->port #define OSMO_SOCKADDR_STR_FMT_ARGS(R) \ ((R) && (R)->af == AF_INET6) ? "[" : "", \ (R) ? (R)->ip : "NULL", \ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35145?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iee361d740845257fa62c9093e30e8079fa933827 Gerrit-Change-Number: 35145 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: pespin Gerrit-MessageType: newchange
[S] Change in libosmocore[osmith/1.9.2]: Disable uring when building for embedded
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35147?usp=email ) Change subject: Disable uring when building for embedded .. Disable uring when building for embedded Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Related: OS#6233 (cherry picked from commit 0266b531c5f261e3e3a0235d2681bedd8b9e0f31) --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/35147/1 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/+/35147?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.2 Gerrit-Change-Id: Iec2503986c6d3487761ba592daef0fd42478aa7d Gerrit-Change-Number: 35147 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-CC: daniel Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: PCU_Tests: tell PCU a more realistic BTS model
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?usp=email )
Change subject: PCU_Tests: tell PCU a more realistic BTS model
..
PCU_Tests: tell PCU a more realistic BTS model
In ts_PCUIF_INFO_default we set the bts_model member to
PCU_IF_BTS_MODEL_UNSPEC. This means that the PCU will not know the BTS
model and thus it is not able to comply to the specific pecularities of
the BTS model that is used. In PCU_Tests.ttcn we simulate the behavior
of an OsmoBTS with OsmoTRX, therefore we should set the BTS model to
PCU_IF_BTS_MODEL_TRX.
This will also fix the problems we have with unexpected DUMMY messages
we currently receive since in an OsmoTRX based BTS model those frames
will be generated by OsmoTRX and do not appear on the PCUIF interface.
When the BTS model is left unspecified, then the PCU will generate those
DUMMY messages and irretate the testsuite.
Related: OS#6191
Change-Id: I6b516eece6acc96ebde9759bcb609197a245dd84
---
M pcu/PCU_Tests.ttcn
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/44/35144/1
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index fb935d9..442d617 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -112,7 +112,7 @@
remote_port := { mp_nsconfig.nsvc[0].provider.ip.local_udp_port, 0 },
remote_addr := f_PCUIF_RemoteAddr(
f_PCUIF_AF2addr_type(mp_nsconfig.nsvc[0].provider.ip.address_family),
mp_nsconfig.nsvc[0].provider.ip.local_ip),
- bts_model := PCU_IF_BTS_MODEL_UNSPEC
+ bts_model := PCU_IF_BTS_MODEL_TRX
}
/* Passed in RAN-INFO message from emulated neighbor using RIM */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35144?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: I6b516eece6acc96ebde9759bcb609197a245dd84
Gerrit-Change-Number: 35144
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
[S] Change in libosmocore[osmith/1.9.1]: Bump version: 1.9.0.1-7d414-dirty → 1.9.1
osmith has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email ) Change subject: Bump version: 1.9.0.1-7d414-dirty → 1.9.1 .. Bump version: 1.9.0.1-7d414-dirty → 1.9.1 Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a --- M debian/changelog M src/core/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c9184df..012a76d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.9.1) unstable; urgency=medium + + [ Manawyrm ] + * logging: ensure ANSI color escape is sent in same line/before newline + + -- Oliver Smith Tue, 28 Nov 2023 11:21:41 +0100 + libosmocore (1.9.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 326c68d..109aae7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:0:0 +LIBVERSION=21:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a Gerrit-Change-Number: 35143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.1]: logging: ensure ANSI color escape is sent in same line/before newline
osmith has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email )
Change subject: logging: ensure ANSI color escape is sent in same line/before
newline
..
logging: ensure ANSI color escape is sent in same line/before newline
This fixes multi-line color clobbering in logging daemons like
systemd-journald, which work with single-lines only.
Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433
Closes: OS#6249
(cherry picked from commit 11a416827dd9f2da6b7c1db0e1e83adb1e6e5cc8)
---
M src/core/logging.c
M tests/loggingrb/logging_test.err
2 files changed, 25 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/core/logging.c b/src/core/logging.c
index c6774f5..dc19cf3 100644
--- a/src/core/logging.c
+++ b/src/core/logging.c
@@ -616,7 +616,15 @@
}
if (target->use_color && c_subsys) {
- ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END);
+ /* Ensure the last color escape is sent before the newline
+ * (to not clobber journald, which works on single-lines only) */
+ if (offset > 0 && buf[offset - 1] == '\n') {
+ offset--; rem++;
+ ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END
"\n");
+ } else {
+ ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END);
+ }
+
if (ret < 0)
goto err;
OSMO_SNPRINTF_RET(ret, rem, offset, len);
diff --git a/tests/loggingrb/logging_test.err b/tests/loggingrb/logging_test.err
index b59d2e8..e070561 100644
--- a/tests/loggingrb/logging_test.err
+++ b/tests/loggingrb/logging_test.err
@@ -1,3 +1,2 @@
-[1;31mYou should see this
-[0;m[1;32mYou should see this
-[0;m
\ No newline at end of file
+[1;31mYou should see this[0;m
+[1;32mYou should see this[0;m
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: osmith/1.9.1
Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433
Gerrit-Change-Number: 35142
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-CC: manawyrm
Gerrit-MessageType: merged
[S] Change in libosmocore[osmith/1.9.1]: Bump version: 1.9.0.1-7d414-dirty → 1.9.1
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email ) Change subject: Bump version: 1.9.0.1-7d414-dirty → 1.9.1 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a Gerrit-Change-Number: 35143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 11:17:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.1]: logging: ensure ANSI color escape is sent in same line/before newline
Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email ) Change subject: logging: ensure ANSI color escape is sent in same line/before newline .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Gerrit-Change-Number: 35142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: manawyrm Gerrit-Attention: osmith Gerrit-Comment-Date: Tue, 28 Nov 2023 11:17:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.1]: logging: ensure ANSI color escape is sent in same line/before newline
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email ) Change subject: logging: ensure ANSI color escape is sent in same line/before newline .. Patch Set 1: (1 comment) Patchset: PS1: The patch is quite the usability improvement for "journalctl -a", making a backport of it as discussed in today's meeting. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433 Gerrit-Change-Number: 35142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: manawyrm Gerrit-Comment-Date: Tue, 28 Nov 2023 10:27:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[osmith/1.9.1]: Bump version: 1.9.0.1-7d414-dirty → 1.9.1
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email ) Change subject: Bump version: 1.9.0.1-7d414-dirty → 1.9.1 .. Bump version: 1.9.0.1-7d414-dirty → 1.9.1 Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a --- M debian/changelog M src/core/Makefile.am 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/35143/1 diff --git a/debian/changelog b/debian/changelog index c9184df..012a76d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosmocore (1.9.1) unstable; urgency=medium + + [ Manawyrm ] + * logging: ensure ANSI color escape is sent in same line/before newline + + -- Oliver Smith Tue, 28 Nov 2023 11:21:41 +0100 + libosmocore (1.9.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 326c68d..109aae7 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:0:0 +LIBVERSION=21:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: osmith/1.9.1 Gerrit-Change-Id: I2ce06826d6b11bcd88daa99fada77a05f740eb7a Gerrit-Change-Number: 35143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange
[S] Change in libosmocore[osmith/1.9.1]: logging: ensure ANSI color escape is sent in same line/before newline
osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email )
Change subject: logging: ensure ANSI color escape is sent in same line/before
newline
..
logging: ensure ANSI color escape is sent in same line/before newline
This fixes multi-line color clobbering in logging daemons like
systemd-journald, which work with single-lines only.
Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433
Closes: OS#6249
(cherry picked from commit 11a416827dd9f2da6b7c1db0e1e83adb1e6e5cc8)
---
M src/core/logging.c
M tests/loggingrb/logging_test.err
2 files changed, 25 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/42/35142/1
diff --git a/src/core/logging.c b/src/core/logging.c
index c6774f5..dc19cf3 100644
--- a/src/core/logging.c
+++ b/src/core/logging.c
@@ -616,7 +616,15 @@
}
if (target->use_color && c_subsys) {
- ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END);
+ /* Ensure the last color escape is sent before the newline
+ * (to not clobber journald, which works on single-lines only) */
+ if (offset > 0 && buf[offset - 1] == '\n') {
+ offset--; rem++;
+ ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END
"\n");
+ } else {
+ ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END);
+ }
+
if (ret < 0)
goto err;
OSMO_SNPRINTF_RET(ret, rem, offset, len);
diff --git a/tests/loggingrb/logging_test.err b/tests/loggingrb/logging_test.err
index b59d2e8..e070561 100644
--- a/tests/loggingrb/logging_test.err
+++ b/tests/loggingrb/logging_test.err
@@ -1,3 +1,2 @@
-[1;31mYou should see this
-[0;m[1;32mYou should see this
-[0;m
\ No newline at end of file
+[1;31mYou should see this[0;m
+[1;32mYou should see this[0;m
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35142?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: osmith/1.9.1
Gerrit-Change-Id: Ia7de9d88aa5ac48ec0d5c1a931a89d21c02c5433
Gerrit-Change-Number: 35142
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-CC: manawyrm
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number
Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/35136?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: ttcn3-pcu-test/sns: fix PCUIF version number .. ttcn3-pcu-test/sns: fix PCUIF version number The current master of OsmoPCU is now using PCUIF version number 12. However, the configuration file of the the SNS tests still sets it to 11. Related: OS#6275 Change-Id: I0b37f01f4c7bb829053231339e39ab734f4c8cbc --- M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/35136/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35136?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: I0b37f01f4c7bb829053231339e39ab734f4c8cbc Gerrit-Change-Number: 35136 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number
Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35136?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number .. Patch Set 2: (1 comment) Patchset: PS1: > Just to be sure, doesn't this patch break the `-latest`? […] you probably mean jenkins-sns.sh. Yes I also thing that it needs upgrading as well. When we change the version number from 11 to 12 in PCU_Tests.cfg, then the SED commandline in jenkins-sns.sh needs to be updated as well. I have updated the patch now. In any case I can see no relation to ttcn3-pcu-test-latest here. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35136?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: I0b37f01f4c7bb829053231339e39ab734f4c8cbc Gerrit-Change-Number: 35136 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: fixeria Gerrit-Comment-Date: Tue, 28 Nov 2023 10:19:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: Make BSSGP timing data configurable
Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email ) Change subject: Make BSSGP timing data configurable .. Patch Set 6: (1 comment) File src/osmo-bsc/bts_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12664): https://gerrit.osmocom.org/c/osmo-bsc/+/31882/comment/82cb6fbd_e52e7353 PS6, Line 1755: if (osmo_tdef_set(bts_bssgp->tdefs, tdef_params->tdef_id, (val * tdef_params->factor)? : 1, tdef_params->unit) < 0) spaces required around that '?' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?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: Id4779f033b5eb1742462d4efc28a0398645acfe6 Gerrit-Change-Number: 31882 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Tue, 28 Nov 2023 10:02:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, fixeria, laforge, neels, pespin.
Hello Jenkins Builder, fixeria, laforge, neels, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
to look at the new patch set (#16).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: Introduce per-BTS timers, RLC timer commands
..
Introduce per-BTS timers, RLC timer commands
- Add per-BTS timer groups ('rlc' only for now, others to follow)
- Add vty commands & tests for those timers
Related: OS#5335
Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/vty.h
M src/osmo-bsc/bsc_init.c
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M src/osmo-bsc/bts_init.c
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
M src/osmo-bsc/bts_vty.c
M src/osmo-bsc/pcu_sock.c
M tests/bts_features.vty
M tests/nanobts_omlattr/nanobts_omlattr_test.c
12 files changed, 473 insertions(+), 50 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/31878/16
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?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: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 16
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: neels
Gerrit-Attention: arehbein
Gerrit-Attention: laforge
Gerrit-Attention: fixeria
Gerrit-Attention: pespin
Gerrit-MessageType: newpatchset
[M] Change in osmo-bsc[master]: Make BSSGP timing data configurable
Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31882?usp=email ) Change subject: Make BSSGP timing data configurable .. Patch Set 5: (1 comment) File src/osmo-bsc/bts_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12662): https://gerrit.osmocom.org/c/osmo-bsc/+/31882/comment/ca036c67_466958e6 PS5, Line 1755: if (osmo_tdef_set(bts_bssgp->tdefs, tdef_params->tdef_id, (val * tdef_params->factor)? : 1, tdef_params->unit) < 0) spaces required around that '?' (ctx:VxW) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31882?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: Id4779f033b5eb1742462d4efc28a0398645acfe6 Gerrit-Change-Number: 31882 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: arehbein Gerrit-Comment-Date: Tue, 28 Nov 2023 09:48:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
