laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/42179?usp=email )
Change subject: dfu: make resp buffer static
......................................................................
dfu: make resp buffer static
USB dma uses a buffer depending on alignment, so this can be safe,
but it should not be depend on reading and knowing the asf source code...
Change-Id: I2f9336143190350817e6352b00751b35b1600b62
---
M usb/class/dfu/device/dfudf.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
lynxis lazus: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/usb/class/dfu/device/dfudf.c b/usb/class/dfu/device/dfudf.c
index 5c5682e..c62cafb 100644
--- a/usb/class/dfu/device/dfudf.c
+++ b/usb/class/dfu/device/dfudf.c
@@ -153,7 +153,7 @@
}
int32_t to_return = ERR_NONE;
- uint8_t response[6]; // buffer for the response to this request
+ static uint8_t response[6]; // static: usbdc_xfer stores a pointer for async DMA
switch (req->bRequest) {
case USB_DFU_UPLOAD: // upload firmware from flash not supported
dfu_state = USB_DFU_STATE_DFU_ERROR; // unsupported class request
--
To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/42179?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-asf4-dfu
Gerrit-Branch: master
Gerrit-Change-Id: I2f9336143190350817e6352b00751b35b1600b62
Gerrit-Change-Number: 42179
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/42197?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: RTP: make ortp optional at compile time
......................................................................
RTP: make ortp optional at compile time
It is now possible to run osmo-bts configure with --disable-ortp
option, which makes it use only twrtp library (integrated into
libosmo-netif) and removes all dependency on Belledonne software,
such that osmo-bts can be built on top of libosmo-abis that has also
been configured with its respective --disable-ortp option.
TODO: contrib/ber/rtp_ber utility still uses ortp and has no support
for twrtp or any other alternative - therefore, when osmo-bts is
configured with --disable-ortp, this utility is not built.
Related: OS#6474
Change-Id: Ib171bd42a65117457319befee2615e0c36c8d9e1
---
M configure.ac
M contrib/ber/Makefile.am
M src/common/bts.c
M src/common/rtp_abstract.c
M src/common/vty.c
5 files changed, 49 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/42197/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42197?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib171bd42a65117457319befee2615e0c36c8d9e1
Gerrit-Change-Number: 42197
Gerrit-PatchSet: 2
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Attention is currently required from: Hoernchen, jolly, laforge.
lynxis lazus has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email )
Change subject: ccid_device: Reject XfrBlock with zero-length data
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Further the CCID with len 0 or 1 is allowed, it further crashs then when checking for the minimum TPDU.
What is the minimal required TPDU for T=0? 5 bytes? Wikipedia says 4 bytes, but I'm not an expert on this protocol layer.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I65df88477e4b1c03dc20a8d41e5cbd1c9f363ba8
Gerrit-Change-Number: 42192
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 24 Feb 2026 18:55:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Attention is currently required from: pespin.
falconia has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bts/+/42167?usp=email )
Change subject: RTP: add vty option for ortp vs twrtp selection
......................................................................
Patch Set 6:
(2 comments)
File src/common/vty.c:
https://gerrit.osmocom.org/c/osmo-bts/+/42167/comment/c1a06cd2_2c31e757?usp… :
PS5, Line 434: if (bts->use_twrtp != g_use_twrtp_default) {
> I don't have extra spoons to fight it - so I'll implement your way in the next patch iteration. […]
I reworked the patch into the manner you asked for - is it good now?
https://gerrit.osmocom.org/c/osmo-bts/+/42167/comment/9dc912a4_df2adc13?usp… :
PS5, Line 1529: vty_out(vty,
> I understand your point, but this simply deviates for how all the other N-thousand parameteres we ha […]
I changed this show command to display only the current setting, and display it in the exact format you asked for.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42167?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iff4e3a399250c16ba8fe4cb12e4e22f4c6b346ec
Gerrit-Change-Number: 42167
Gerrit-PatchSet: 6
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 24 Feb 2026 18:35:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: falconia <falcon(a)freecalypso.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bts/+/42167?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: RTP: add vty option for ortp vs twrtp selection
......................................................................
RTP: add vty option for ortp vs twrtp selection
With this patch it finally becomes possible for the user to select
which RTP library should be used: ortp or twrtp. ortp is still
the default for now, in order to not alter behavior for existing
installations until twrtp receives more real world testing by users
beyond the original author. Future patches may change the default
or even remove ortp support altogether - but twrtp should receive
more testing as a user opt-in feature first.
Related: OS#6474
Change-Id: Iff4e3a399250c16ba8fe4cb12e4e22f4c6b346ec
---
M include/osmo-bts/bts.h
M src/common/bts.c
M src/common/lchan.c
M src/common/vty.c
M tests/osmo-bts.vty
5 files changed, 74 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/42167/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42167?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iff4e3a399250c16ba8fe4cb12e4e22f4c6b346ec
Gerrit-Change-Number: 42167
Gerrit-PatchSet: 6
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42197?usp=email )
Change subject: RTP: make ortp optional at compile time
......................................................................
RTP: make ortp optional at compile time
It is now possible to run osmo-bts configure with --disable-ortp
option, which makes it use only twrtp library (integrated into
libosmo-netif) and removes all dependency on Belledonne software,
such that osmo-bts can be built on top of libosmo-abis that has also
been configured with its respective --disable-ortp option.
TODO: contrib/ber/rtp_ber utility still uses ortp and has no support
for twrtp or any other alternative - therefore, when osmo-bts is
configured with --disable-ortp, this utility is not built.
Related: OS#6474
Change-Id: Ib171bd42a65117457319befee2615e0c36c8d9e1
---
M configure.ac
M contrib/ber/Makefile.am
M src/common/bts.c
M src/common/rtp_abstract.c
M src/common/vty.c
5 files changed, 47 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/42197/1
diff --git a/configure.ac b/configure.ac
index 423b710..fe69954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,6 +308,19 @@
CPPFLAGS=$oldCPPFLAGS
fi
+AC_ARG_ENABLE([ortp], [AS_HELP_STRING([--disable-ortp], [Build without ortp support])],
+ [
+ ENABLE_ORTP=$enableval
+ ],
+ [
+ ENABLE_ORTP="yes"
+ ])
+AS_IF([test "x$ENABLE_ORTP" = "xyes"], [
+ AC_DEFINE([HAVE_ORTP],[1],[Build with ortp support])
+])
+AM_CONDITIONAL(ENABLE_ORTP, test "x$ENABLE_ORTP" = "xyes")
+AC_SUBST(ENABLE_ORTP)
+
# Generate manuals
AC_ARG_ENABLE(manuals,
[AS_HELP_STRING(
diff --git a/contrib/ber/Makefile.am b/contrib/ber/Makefile.am
index 9bd7f40..44126b0 100644
--- a/contrib/ber/Makefile.am
+++ b/contrib/ber/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_ORTP
+
AM_CPPFLAGS = \
$(all_includes) \
-I$(top_srcdir)/include \
@@ -26,3 +28,5 @@
update_codec_bit_class_h: rtp_gen_map
$(AM_V_GEN)./$< > $(top_srcdir)/contrib/ber/codec_bit_class.h
+
+endif
diff --git a/src/common/bts.c b/src/common/bts.c
index 11f57a7..2cf4d0a 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -20,6 +20,8 @@
*
*/
+#include "btsconfig.h"
+
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
@@ -38,7 +40,10 @@
#include <osmocom/gsm/protocol/gsm_12_21.h>
#include <osmocom/gsm/gsm48.h>
#include <osmocom/gsm/lapdm.h>
+
+#ifdef HAVE_ORTP
#include <osmocom/trau/osmo_ortp.h>
+#endif
#include <osmo-bts/logging.h>
#include <osmo-bts/abis.h>
@@ -316,7 +321,6 @@
{
int rc, i;
static int initialized = 0;
- void *tall_rtp_ctx;
bts->band = GSM_BAND_1800;
@@ -358,11 +362,14 @@
* by users of the software (GSM network operators), as opposed
* to being imposed by developers as a flag day change.
* The current default is to use ortp, in order to avoid any
- * surprise changes in behaviour. It is expected that this
- * default will change at some point in the future, prior to
- * full discontinuation of support for ortp.
+ * surprise changes in behaviour - but only if ortp is available
+ * at compile time.
*/
+#ifdef HAVE_ORTP
bts->use_twrtp = false;
+#else
+ bts->use_twrtp = true;
+#endif
/* Default (fall-back) MS/BS Power control parameters */
power_ctrl_params_def_reset(&bts->bs_dpc_params, true);
@@ -393,10 +400,15 @@
oml_mo_state_init(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);
oml_mo_state_init(&bts->gprs.cell.mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED);
+#ifdef HAVE_ORTP
/* allocate a talloc pool for ORTP to ensure it doesn't have to go back
* to the libc malloc all the time */
- tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144);
- osmo_rtp_init(tall_rtp_ctx);
+ {
+ void *tall_rtp_ctx;
+ tall_rtp_ctx = talloc_pool(tall_bts_ctx, 262144);
+ osmo_rtp_init(tall_rtp_ctx);
+ }
+#endif
/* Osmux */
rc = bts_osmux_init(bts);
diff --git a/src/common/rtp_abstract.c b/src/common/rtp_abstract.c
index 4854b25..fabfe6f 100644
--- a/src/common/rtp_abstract.c
+++ b/src/common/rtp_abstract.c
@@ -11,7 +11,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#define HAVE_ORTP
+#include "btsconfig.h"
#include <osmocom/core/logging.h>
#include <osmocom/core/msgb.h>
diff --git a/src/common/vty.c b/src/common/vty.c
index af381b5..95ec94c 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -815,8 +815,18 @@
BTS_VTY_ATTR_NEW_LCHAN)
{
struct gsm_bts *bts = vty->index;
+ bool use_twrtp;
- bts->use_twrtp = !strcmp(argv[0], "twrtp");
+ use_twrtp = !strcmp(argv[0], "twrtp");
+#ifndef HAVE_ORTP
+ if (!use_twrtp) {
+ vty_out(vty,
+ "%% Error: OsmoBTS was built without ortp support%s",
+ VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+#endif
+ bts->use_twrtp = use_twrtp;
return CMD_SUCCESS;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42197?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib171bd42a65117457319befee2615e0c36c8d9e1
Gerrit-Change-Number: 42197
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Attention is currently required from: Hoernchen, jolly, laforge.
lynxis lazus has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email )
Change subject: ccid_device: Reject XfrBlock with zero-length data
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> UNTESTED
When using your patch, the bankd will close the connection, because pcsc fail the transaction.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I65df88477e4b1c03dc20a8d41e5cbd1c9f363ba8
Gerrit-Change-Number: 42192
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 24 Feb 2026 18:17:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: Hoernchen, jolly, laforge.
lynxis lazus has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email )
Change subject: ccid_device: Reject XfrBlock with zero-length data
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Without your patch, it fails in ../ccid_common/iso7816_fsm.c:1260,
the trace shows a different location, but line no 1260 is taking from parsing fmt & args from frame 2.
> OSMO_ASSERT(msgb_length(tfp->tpdu) >= sizeof(*tpduh));
(gdb) bt
#0 0x0000ae70 in bdg_bkptpanic (fmt=0x16635 "Assert failed %s %s:%d\n", args=...) at ../main.c:44
#1 0x000107ba in osmo_panic (fmt=0x16635 "Assert failed %s %s:%d\n") at panic.c:78
#2 0x00005cf0 in tpdu_s_init_action (fi=0x2000f070, event=<optimized out>, data=0x20013f60) at ../ccid_common/iso7816_fsm.c:1279
#3 0x0000ebda in _osmo_fsm_inst_dispatch (fi=0x2000f070, event=7, data=0x20013f60, file=0x1664d "../ccid_common/iso7816_fsm.c", line=402)
at fsm.c:875
#4 0x00004f0a in iso7816_3_wait_tpdu_action (fi=0x2000ecd8, event=7, data=0x20013f60) at ../ccid_common/iso7816_fsm.c:407
#5 0x0000ebda in _osmo_fsm_inst_dispatch (fi=0x2000ecd8, event=event@entry=7, data=data@entry=0x20013f60,
file=file@entry=0x16b4b "../ccid_common/ccid_slot_fsm.c", line=line@entry=366) at fsm.c:875
#6 0x000070f6 in iso_fsm_slot_xfr_block_async (cs=0x20001d48 <g_ci>, msg=0x20013f60, xfb=<optimized out>) at ../ccid_common/ccid_slot_fsm.c:366
#7 0x00004850 in ccid_handle_xfr_block (cs=0x20001d48 <g_ci>, msg=0x20013f60) at ../ccid_common/ccid_device.c:464
#8 ccid_handle_out (ci=ci@entry=0x20001d48 <g_ci>, msg=0x20013f60) at ../ccid_common/ccid_device.c:761
#9 0x0000bbac in feed_ccid () at ../main.c:509
#10 main () at ../main.c:731
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42192?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I65df88477e4b1c03dc20a8d41e5cbd1c9f363ba8
Gerrit-Change-Number: 42192
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <andreas(a)eversberg.eu>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 24 Feb 2026 18:08:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No