February 2026 - gerrit-log - lists.osmocom.org

[L] Change in osmo-bts[master]: RTP: implement RTP socket abstraction layer
by Jenkins Builder 22 Feb '26

22 Feb '26

Jenkins Builder has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-bts/+/42165?usp=email ) Change subject: RTP: implement RTP socket abstraction layer ...................................................................... Patch Set 1: (1 comment) File src/common/rtp_abstract.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-bts/+/42165/comment/508a62bb_3f6c64c4?usp… : PS1, Line 365: twrtp_stats->rx_rtcp_invalid); code indent should use tabs where possible -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42165?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: Ic945f6d753ec7f5c0ac5cecc9f71049464de7e8f Gerrit-Change-Number: 42165 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 22 Feb 2026 03:44:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in osmo-bts[master]: RTP: add vty option for ortp vs twrtp selection
by falconia 22 Feb '26

22 Feb '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42167?usp=email ) 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 4 files changed, 35 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/67/42167/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index ec13d71..8bd3a83 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -319,6 +319,7 @@ struct llist_head bsc_oml_hosts; unsigned int rtp_jitter_buf_ms; bool rtp_jitter_adaptive; + bool use_twrtp; struct osmo_twjit_config *twjit_cfg; uint16_t rtp_port_range_start; diff --git a/src/common/bts.c b/src/common/bts.c index 78ea417..11f57a7 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -347,6 +347,23 @@ bts->rtp_priority = -1; bts->emit_hr_rfc5993 = true; + /* At the present point in OsmoBTS evolution the user can select + * which RTP library should be used: Belledonne ortp (legacy) or + * Themyscira twrtp (integrated into libosmo-netif). There is + * a desire to eventually deprecate ortp altogether and support + * only Osmocom-native twrtp, but because the two implementations + * take drastically different approaches to the hard problem of + * converting from an incoming RTP stream to fixed timing for + * GSM TCH Tx, the transition should involve extensive testing + * 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. + */ + bts->use_twrtp = false; + /* Default (fall-back) MS/BS Power control parameters */ power_ctrl_params_def_reset(&bts->bs_dpc_params, true); power_ctrl_params_def_reset(&bts->ms_dpc_params, false); diff --git a/src/common/lchan.c b/src/common/lchan.c index b5623e3..96d3f35 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -587,7 +587,7 @@ //if (!payload_type) lchan->tch.last_fn = LCHAN_FN_DUMMY; lchan->abis_ip.rtp_socket = rtp_abst_socket_create(lchan->ts->trx, - false, bts->twjit_cfg); + bts->use_twrtp, bts->twjit_cfg); if (!lchan->abis_ip.rtp_socket) { LOGPLCHAN(lchan, DRTP, LOGL_ERROR, "IPAC Failed to create RTP/RTCP sockets\n"); diff --git a/src/common/vty.c b/src/common/vty.c index 0411060..4c35cc7 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -424,6 +424,8 @@ vty_out(vty, " rtp ip-dscp %d%s", bts->rtp_ip_dscp, VTY_NEWLINE); if (bts->rtp_priority != -1) vty_out(vty, " rtp socket-priority %d%s", bts->rtp_priority, VTY_NEWLINE); + vty_out(vty, " rtp library %s%s", bts->use_twrtp ? "twrtp" : "ortp", + VTY_NEWLINE); if (bts->rtp_nogaps_mode) vty_out(vty, " rtp continuous-streaming%s", VTY_NEWLINE); vty_out(vty, " %srtp internal-uplink-ecu%s", @@ -797,6 +799,19 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_bts_rtp_library, + cfg_bts_rtp_library_cmd, + "rtp library (ortp|twrtp)", + RTP_STR "RTP library selection\n" + "Belledonne ortp\n" "Themyscira twrtp\n", + BTS_VTY_ATTR_NEW_LCHAN) +{ + struct gsm_bts *bts = vty->index; + + bts->use_twrtp = !strcmp(argv[0], "twrtp"); + return CMD_SUCCESS; +} + DEFUN(cfg_bts_rtp_cont_stream, cfg_bts_rtp_cont_stream_cmd, "rtp continuous-streaming", @@ -2779,6 +2794,7 @@ install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd); install_element(BTS_NODE, &cfg_bts_rtp_ip_dscp_cmd); install_element(BTS_NODE, &cfg_bts_rtp_priority_cmd); + install_element(BTS_NODE, &cfg_bts_rtp_library_cmd); install_element(BTS_NODE, &cfg_bts_rtp_cont_stream_cmd); install_element(BTS_NODE, &cfg_bts_no_rtp_cont_stream_cmd); install_element(BTS_NODE, &cfg_bts_rtp_int_ul_ecu_cmd); -- 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: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iff4e3a399250c16ba8fe4cb12e4e22f4c6b346ec Gerrit-Change-Number: 42167 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-bts[master]: RTP: use new abstraction layer instead of direct osmo_ortp
by falconia 22 Feb '26

22 Feb '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42166?usp=email ) Change subject: RTP: use new abstraction layer instead of direct osmo_ortp ...................................................................... RTP: use new abstraction layer instead of direct osmo_ortp As of this patch in the series, the RTP library in active use is still always ortp, but all BTS code now accesses it through the new abstraction layer, paving the way for twrtp option. Related: OS#6474 Change-Id: I5e3de4f84e8e8875437cb94a9b8feeb07f9cc1cf --- M include/osmo-bts/l1sap.h M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/msg_utils.c M src/common/rsl.c M src/common/vty.c 7 files changed, 44 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/42166/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index 34259bd..b90992a 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -93,7 +93,7 @@ uint16_t arfcn, uint8_t block_nr, const uint8_t *data, uint8_t len); /* call-back function for incoming RTP */ -void l1sap_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl, +void l1sap_rtp_rx_cb(struct rtp_abst_socket *rs, const uint8_t *rtp_pl, unsigned int rtp_pl_len, uint16_t seq_number, uint32_t timestamp, bool marker); diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 2b19c28..071197d 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -190,7 +190,7 @@ /* Used to build rtp messages we send to osmux */ struct osmo_rtp_handle *rtpst; } osmux; - struct osmo_rtp_socket *rtp_socket; + struct rtp_abst_socket *rtp_socket; } abis_ip; char *name; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index e77f602..f8c0017 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -41,8 +41,6 @@ #include <osmocom/codec/codec.h> -#include <osmocom/trau/osmo_ortp.h> - #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> #include <osmo-bts/l1sap.h> @@ -56,6 +54,7 @@ #include <osmo-bts/bts_model.h> #include <osmo-bts/handover.h> #include <osmo-bts/msg_utils.h> +#include <osmo-bts/rtp_abstract.h> #include <osmo-bts/rtp_input_preen.h> #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/cbch.h> @@ -1532,10 +1531,8 @@ OSMO_ASSERT(bits_per_20ms != 0); for (i = 0; i < ARRAY_SIZE(input_msg); i++) { - if (!lchan->loopback && lchan->abis_ip.rtp_socket) { - osmo_rtp_socket_poll(lchan->abis_ip.rtp_socket); - lchan->abis_ip.rtp_socket->rx_user_ts += GSM_RTP_DURATION; - } + if (!lchan->loopback && lchan->abis_ip.rtp_socket) + rtp_abst_socket_poll(lchan->abis_ip.rtp_socket); input_msg[i] = msgb_dequeue_count(&lchan->dl_tch_queue, &lchan->dl_tch_queue_len); } @@ -1621,10 +1618,8 @@ /* Input processing happens every 40 ms */ if (csd_tchf48_nt_e2_map[fn % 26] == 0) { for (i = 0; i < 2; i++) { - if (!lchan->loopback && lchan->abis_ip.rtp_socket) { - osmo_rtp_socket_poll(lchan->abis_ip.rtp_socket); - lchan->abis_ip.rtp_socket->rx_user_ts += GSM_RTP_DURATION; - } + if (!lchan->loopback && lchan->abis_ip.rtp_socket) + rtp_abst_socket_poll(lchan->abis_ip.rtp_socket); input_msg = msgb_dequeue_count(&lchan->dl_tch_queue, &lchan->dl_tch_queue_len); if (input_msg) { @@ -1735,16 +1730,8 @@ lchan->csd_mode == LCHAN_CSD_M_NT) return tch_rts_ind_tchf48_nt(trx, lchan, rts_ind); - if (!lchan->loopback && lchan->abis_ip.rtp_socket) { - osmo_rtp_socket_poll(lchan->abis_ip.rtp_socket); - /* FIXME: we _assume_ that we never miss TDMA - * frames and that we always get to this point - * for every to-be-transmitted voice frame. A - * better solution would be to compute - * rx_user_ts based on how many TDMA frames have - * elapsed since the last call */ - lchan->abis_ip.rtp_socket->rx_user_ts += GSM_RTP_DURATION; - } + if (!lchan->loopback && lchan->abis_ip.rtp_socket) + rtp_abst_socket_poll(lchan->abis_ip.rtp_socket); /* get a msgb from the dl_tx_queue */ resp_msg = msgb_dequeue_count(&lchan->dl_tch_queue, &lchan->dl_tch_queue_len); if (!resp_msg) { @@ -2101,8 +2088,9 @@ lchan_osmux_send_frame(lchan, rtp_pl, rtp_pl_len, fn_ms_adj(fn, lchan), lchan->rtp_tx_marker); } else if (lchan->abis_ip.rtp_socket != NULL) { - osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, - rtp_pl, rtp_pl_len, fn_ms_adj(fn, lchan), lchan->rtp_tx_marker); + fn_ms_adj(fn, lchan); /* for diagnostics only */ + rtp_abst_send_frame(lchan->abis_ip.rtp_socket, + rtp_pl, rtp_pl_len, lchan->rtp_tx_marker); rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL); if (lchan->rtp_tx_marker) rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER); @@ -2120,10 +2108,8 @@ struct gsm_bts *bts = lchan->ts->trx->bts; if (lchan->abis_ip.rtp_socket != NULL) { - osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, - rtp_pl, rtp_pl_len, - GSM_RTP_DURATION, - lchan->rtp_tx_marker); + rtp_abst_send_frame(lchan->abis_ip.rtp_socket, + rtp_pl, rtp_pl_len, lchan->rtp_tx_marker); rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_TOTAL); if (lchan->rtp_tx_marker) rate_ctr_inc2(bts->ctrs, BTS_CTR_RTP_TX_MARKER); @@ -2341,8 +2327,10 @@ "Skipping RTP frame with lost payload\n"); if (lchan->abis_ip.osmux.use) lchan_osmux_skipped_frame(lchan, fn_ms_adj(fn, lchan)); - else if (lchan->abis_ip.rtp_socket) - osmo_rtp_skipped_frame(lchan->abis_ip.rtp_socket, fn_ms_adj(fn, lchan)); + else if (lchan->abis_ip.rtp_socket) { + fn_ms_adj(fn, lchan); /* for diagnostics only */ + rtp_abst_skipped_frame(lchan->abis_ip.rtp_socket); + } lchan->rtp_tx_marker = true; } @@ -2881,7 +2869,7 @@ } /*! \brief call-back function for incoming RTP */ -void l1sap_rtp_rx_cb(struct osmo_rtp_socket *rs, const uint8_t *rtp_pl, +void l1sap_rtp_rx_cb(struct rtp_abst_socket *rs, const uint8_t *rtp_pl, unsigned int rtp_pl_len, uint16_t seq_number, uint32_t timestamp, bool marker) { diff --git a/src/common/lchan.c b/src/common/lchan.c index b115e1e..b5623e3 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -23,10 +23,9 @@ #include <osmocom/core/logging.h> -#include <osmocom/trau/osmo_ortp.h> - #include <osmo-bts/logging.h> #include <osmo-bts/lchan.h> +#include <osmo-bts/rtp_abstract.h> #include <osmo-bts/bts.h> #include <osmo-bts/rsl.h> #include <osmo-bts/pcu_if.h> @@ -216,8 +215,8 @@ if (lchan->abis_ip.rtp_socket) { rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); - osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, - "Closing RTP socket on Channel Release "); + rtp_abst_socket_log_stats(lchan->abis_ip.rtp_socket, + "Channel Release"); lchan_rtp_socket_free(lchan); } else if (lchan->abis_ip.osmux.use) { lchan_osmux_release(lchan); @@ -537,7 +536,7 @@ } } -static int bind_rtp(struct gsm_bts *bts, struct osmo_rtp_socket *rs, const char *ip) +static int bind_rtp(struct gsm_bts *bts, struct rtp_abst_socket *rs, const char *ip) { int rc; unsigned int i; @@ -549,7 +548,7 @@ if (bts->rtp_port_range_next >= bts->rtp_port_range_end) bts->rtp_port_range_next = bts->rtp_port_range_start; - rc = osmo_rtp_socket_bind(rs, ip, bts->rtp_port_range_next); + rc = rtp_abst_socket_bind(rs, ip, bts->rtp_port_range_next); bts->rtp_port_range_next += 2; @@ -557,12 +556,12 @@ continue; if (bts->rtp_ip_dscp != -1) { - if (osmo_rtp_socket_set_dscp(rs, bts->rtp_ip_dscp)) + if (rtp_abst_socket_set_dscp(rs, bts->rtp_ip_dscp)) LOGP(DRSL, LOGL_ERROR, "failed to set DSCP=%d: %s\n", bts->rtp_ip_dscp, strerror(errno)); } if (bts->rtp_priority != -1) { - if (osmo_rtp_socket_set_priority(rs, bts->rtp_priority)) + if (rtp_abst_socket_set_priority(rs, bts->rtp_priority)) LOGP(DRSL, LOGL_ERROR, "failed to set socket priority %d: %s\n", bts->rtp_priority, strerror(errno)); } @@ -587,8 +586,8 @@ /* FIXME: select default value depending on speech_mode */ //if (!payload_type) lchan->tch.last_fn = LCHAN_FN_DUMMY; - lchan->abis_ip.rtp_socket = osmo_rtp_socket_create(lchan->ts->trx, - OSMO_RTP_F_POLL); + lchan->abis_ip.rtp_socket = rtp_abst_socket_create(lchan->ts->trx, + false, bts->twjit_cfg); if (!lchan->abis_ip.rtp_socket) { LOGPLCHAN(lchan, DRTP, LOGL_ERROR, "IPAC Failed to create RTP/RTCP sockets\n"); @@ -599,10 +598,8 @@ return -ENOTCONN; } - rc = osmo_rtp_socket_set_param(lchan->abis_ip.rtp_socket, - bts->rtp_jitter_adaptive ? - OSMO_RTP_P_JIT_ADAP : - OSMO_RTP_P_JITBUF, + rc = rtp_abst_socket_set_param(lchan->abis_ip.rtp_socket, + bts->rtp_jitter_adaptive, bts->rtp_jitter_buf_ms); if (rc < 0) LOGPLCHAN(lchan, DRTP, LOGL_ERROR, @@ -626,7 +623,7 @@ /* Ensure RTCP SDES contains some useful information */ snprintf(cname, sizeof(cname), "bts@%s", bind_ip); - osmo_rtp_set_source_desc(lchan->abis_ip.rtp_socket, cname, + rtp_abst_set_source_desc(lchan->abis_ip.rtp_socket, cname, gsm_lchan_name(lchan), NULL, NULL, gsm_trx_unit_id(lchan->ts->trx), "OsmoBTS-" PACKAGE_VERSION, NULL); @@ -640,8 +637,8 @@ int bound_port = 0; int rc; - rc = osmo_rtp_socket_connect(lchan->abis_ip.rtp_socket, - inet_ntoa(*ia), connect_port); + rc = rtp_abst_socket_connect(lchan->abis_ip.rtp_socket, + ia, connect_port); if (rc < 0) { LOGPLCHAN(lchan, DRTP, LOGL_ERROR, "Failed to connect RTP/RTCP sockets\n"); return -ECONNREFUSED; @@ -650,7 +647,7 @@ lchan->abis_ip.connect_ip = ntohl(ia->s_addr); lchan->abis_ip.connect_port = connect_port; - rc = osmo_rtp_get_bound_ip_port(lchan->abis_ip.rtp_socket, + rc = rtp_abst_get_bound_ip_port(lchan->abis_ip.rtp_socket, &lchan->abis_ip.bound_ip, &bound_port); if (rc < 0) @@ -661,7 +658,7 @@ void lchan_rtp_socket_free(struct gsm_lchan *lchan) { - osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); + rtp_abst_socket_free(lchan->abis_ip.rtp_socket); lchan->abis_ip.rtp_socket = NULL; msgb_queue_free(&lchan->dl_tch_queue); lchan->dl_tch_queue_len = 0; diff --git a/src/common/msg_utils.c b/src/common/msg_utils.c index 04a0c34..113371f 100644 --- a/src/common/msg_utils.c +++ b/src/common/msg_utils.c @@ -24,13 +24,13 @@ #include <osmo-bts/amr.h> #include <osmo-bts/rsl.h> #include <osmo-bts/bts.h> +#include <osmo-bts/rtp_abstract.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/gsm/protocol/gsm_12_21.h> #include <osmocom/gsm/abis_nm.h> #include <osmocom/core/msgb.h> #include <osmocom/core/fsm.h> -#include <osmocom/trau/osmo_ortp.h> #include <arpa/inet.h> #include <errno.h> diff --git a/src/common/rsl.c b/src/common/rsl.c index 8d9dd56..88a5f17 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -39,7 +39,6 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/ipaccess.h> -#include <osmocom/trau/osmo_ortp.h> #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> @@ -55,6 +54,7 @@ #include <osmo-bts/cbch.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/bts_model.h> +#include <osmo-bts/rtp_abstract.h> #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/notification.h> #include <osmo-bts/asci.h> @@ -2756,7 +2756,7 @@ msgb_tv_put(msg, RSL_IE_IPAC_CONN_STAT, sizeof(uint32_t) * 7); if (lchan->abis_ip.rtp_socket) { - osmo_rtp_socket_stats(lchan->abis_ip.rtp_socket, + rtp_abst_socket_stats(lchan->abis_ip.rtp_socket, &packets_sent, &octets_sent, &packets_recv, &octets_recv, &packets_lost, &arrival_jitter); @@ -3144,13 +3144,13 @@ if (payload_type) { lchan->abis_ip.rtp_payload = *payload_type; if (lchan->abis_ip.rtp_socket) - osmo_rtp_socket_set_pt(lchan->abis_ip.rtp_socket, + rtp_abst_socket_set_pt(lchan->abis_ip.rtp_socket, *payload_type); } if (payload_type2) { lchan->abis_ip.rtp_payload2 = *payload_type2; if (lchan->abis_ip.rtp_socket) - osmo_rtp_socket_set_pt(lchan->abis_ip.rtp_socket, + rtp_abst_socket_set_pt(lchan->abis_ip.rtp_socket, *payload_type2); } if (speech_mode) @@ -3184,8 +3184,7 @@ rc = rsl_tx_ipac_dlcx_ack(lchan, inc_conn_id); if (lchan->abis_ip.rtp_socket) { - osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, - "Closing RTP socket on DLCX "); + rtp_abst_socket_log_stats(lchan->abis_ip.rtp_socket, "DLCX"); lchan_rtp_socket_free(lchan); } return rc; diff --git a/src/common/vty.c b/src/common/vty.c index 461e92f..0411060 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -42,7 +42,6 @@ #include <osmocom/core/gsmtap.h> #include <osmocom/core/utils.h> #include <osmocom/core/sockaddr_str.h> -#include <osmocom/trau/osmo_ortp.h> #include <osmocom/core/fsm.h> #include <osmocom/codec/codec.h> @@ -62,6 +61,7 @@ #include <osmo-bts/vty.h> #include <osmo-bts/l1sap.h> #include <osmo-bts/osmux.h> +#include <osmo-bts/rtp_abstract.h> #define VTY_STR "Configure the VTY\n" @@ -2562,9 +2562,8 @@ VTY_NEWLINE); return CMD_WARNING; } - rc = osmo_rtp_socket_set_param(lchan->abis_ip.rtp_socket, - lchan->ts->trx->bts->rtp_jitter_adaptive ? - OSMO_RTP_P_JIT_ADAP : OSMO_RTP_P_JITBUF, + rc = rtp_abst_socket_set_param(lchan->abis_ip.rtp_socket, + lchan->ts->trx->bts->rtp_jitter_adaptive, jitbuf_ms); if (rc < 0) vty_out(vty, "%% error setting jitter parameters: %s%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42166?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: I5e3de4f84e8e8875437cb94a9b8feeb07f9cc1cf Gerrit-Change-Number: 42166 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[L] Change in osmo-bts[master]: RTP: implement RTP socket abstraction layer
by falconia 22 Feb '26

22 Feb '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42165?usp=email ) Change subject: RTP: implement RTP socket abstraction layer ...................................................................... RTP: implement RTP socket abstraction layer This abstraction layer is another step toward supporting a choice between legacy Belledonne ortp and Osmocom-integrated twrtp. Related: OS#6474 Depends: Ibda74c0dbfb163f5d0e3fb13f593a6e2c6817673 (libosmo-netif.git) Change-Id: Ic945f6d753ec7f5c0ac5cecc9f71049464de7e8f --- M TODO-RELEASE M include/osmo-bts/Makefile.am A include/osmo-bts/rtp_abstract.h M src/common/Makefile.am A src/common/rtp_abstract.c 5 files changed, 529 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/42165/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..57c89e7 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-netif >1.7.0 soft_underruns added to struct osmo_twjit_stats diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 1922f0d..c7323b6 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -13,6 +13,7 @@ oml.h \ paging.h \ rsl.h \ + rtp_abstract.h \ rtp_input_preen.h \ signal.h \ vty.h \ diff --git a/include/osmo-bts/rtp_abstract.h b/include/osmo-bts/rtp_abstract.h new file mode 100644 index 0000000..995edcf --- /dev/null +++ b/include/osmo-bts/rtp_abstract.h @@ -0,0 +1,95 @@ +/* + * This header file defines the RTP abstraction layer inside osmo-bts, + * allowing a choice between two different RTP endpoint libraries: + * Belledonne ortp or Themyscira twrtp. + */ + +#pragma once + +#include <stdint.h> +#include <stdbool.h> +#include <netinet/in.h> + +/* The following preprocessor definitions are legacy from + * <osmocom/trau/osmo_ortp.h>. They have to be kept unchanged + * in order to allow the rest of OsmoBTS code to use the present + * abstraction header in the place of osmo_ortp.h - the latter + * may not exist if libosmo-abis is built with --disable-ortp - + * and to prevent conflicts when rtp_abstract.c has to include + * both osmo_ortp.h and the present header in the default + * ortp-enabled build config. + */ + +/*! \brief default duration of a 20ms GSM codec frame */ +#define GSM_RTP_DURATION 160 + +#define GSM_VOICE_SAMPLE_RATE_HZ 8000 +#define GSM_VOICE_SAMPLES_PER_MS (GSM_VOICE_SAMPLE_RATE_HZ / 1000) +#define GSM_VOICE_MULTIFRAME 26 +#define GSM_RTP_FRAME_DURATION_MS 20 +#define GSM_SAMPLES_PER_RTP_FRAME (GSM_RTP_FRAME_DURATION_MS * GSM_VOICE_SAMPLES_PER_MS) +#define GSM_TDMA_FRAME_MS (120 / GSM_VOICE_MULTIFRAME) +#define GSM_MS_TO_SAMPLES(ms) ((ms) * GSM_VOICE_SAMPLES_PER_MS) +#define GSM_FN_TO_MS(fn) ((fn) * GSM_TDMA_FRAME_MS) + +struct osmo_rtp_socket; +struct osmo_twrtp; +struct osmo_twjit_config; + +/*! \brief Abstracted RTP socket structure */ +struct rtp_abst_socket { + /* user fields */ + void (*rx_cb)(struct rtp_abst_socket *rs, const uint8_t *payload, + unsigned int payload_len, uint16_t seq_number, + uint32_t timestamp, bool marker); + void *priv; + + /* internal implementation */ + struct osmo_rtp_socket *ortp; + struct osmo_twrtp *twrtp; + struct sockaddr_in local_addr; + uint32_t twrtp_rx_ticks; + uint32_t twrtp_rx_pl_bytes; + uint32_t twrtp_rx_bad_hdr; + uint32_t twrtp_rx_wrong_pt; + uint32_t twrtp_pl_extr_errors; + uint8_t payload_type; +}; + +struct rtp_abst_socket * +rtp_abst_socket_create(void *talloc_ctx, bool use_twrtp, + struct osmo_twjit_config *twjit_cfg); +void rtp_abst_socket_free(struct rtp_abst_socket *rs); + +int rtp_abst_socket_bind(struct rtp_abst_socket *rs, const char *ipstr, + int port); +int rtp_abst_socket_connect(struct rtp_abst_socket *rs, + const struct in_addr *ip, uint16_t port); + +int rtp_abst_socket_set_pt(struct rtp_abst_socket *rs, int payload_type); +int rtp_abst_socket_set_dscp(struct rtp_abst_socket *rs, int dscp); +int rtp_abst_socket_set_priority(struct rtp_abst_socket *rs, uint8_t prio); + +void rtp_abst_socket_poll(struct rtp_abst_socket *rs); + +int rtp_abst_send_frame(struct rtp_abst_socket *rs, const uint8_t *payload, + unsigned int payload_len, bool marker); +int rtp_abst_skipped_frame(struct rtp_abst_socket *rs); + +int rtp_abst_get_bound_ip_port(struct rtp_abst_socket *rs, + uint32_t *ip, int *port); + +int rtp_abst_socket_set_param(struct rtp_abst_socket *rs, + bool jitter_adaptive, int jitter_ms); + +void rtp_abst_socket_log_stats(struct rtp_abst_socket *rs, const char *cause); + +void rtp_abst_socket_stats(struct rtp_abst_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter); + +void rtp_abst_set_source_desc(struct rtp_abst_socket *rs, const char *cname, + const char *name, const char *email, + const char *phone, const char *loc, + const char *tool, const char *note); diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 1a62e8e..df3a8dd 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -36,6 +36,7 @@ bts_sm.c \ bts_trx.c \ rsl.c \ + rtp_abstract.c \ rtp_input_preen.c \ vty.c \ paging.c \ diff --git a/src/common/rtp_abstract.c b/src/common/rtp_abstract.c new file mode 100644 index 0000000..7743596 --- /dev/null +++ b/src/common/rtp_abstract.c @@ -0,0 +1,431 @@ +/* + * Implementation of OsmoBTS-internal RTP abstraction layer, allowing + * both compile-time and runtime selection between ortp and twrtp. + */ + +#include <stdint.h> +#include <stdbool.h> +#include <string.h> +#include <errno.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> + +#define HAVE_ORTP + +#include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/netif/rtp.h> +#include <osmocom/netif/twrtp.h> +#include <osmocom/netif/twjit.h> +#ifdef HAVE_ORTP +#include <osmocom/trau/osmo_ortp.h> +#endif + +#include <osmo-bts/logging.h> +#include <osmo-bts/rtp_abstract.h> + +#ifdef HAVE_ORTP +/*! \brief call-back function for incoming RTP from libortp */ +static void ortp_rx_cb(struct osmo_rtp_socket *ors, const uint8_t *rtp_pl, + unsigned int rtp_pl_len, uint16_t seq_number, + uint32_t timestamp, bool marker) +{ + struct rtp_abst_socket *rs = ors->priv; + + if (rs->rx_cb) { + rs->rx_cb(rs, rtp_pl, rtp_pl_len, seq_number, timestamp, + marker); + } +} +#endif + +struct rtp_abst_socket * +rtp_abst_socket_create(void *talloc_ctx, bool use_twrtp, + struct osmo_twjit_config *twjit_cfg) +{ + struct rtp_abst_socket *rs; + + rs = talloc_zero(talloc_ctx, struct rtp_abst_socket); + if (rs == NULL) + return NULL; + +#ifdef HAVE_ORTP + if (!use_twrtp) { + rs->ortp = osmo_rtp_socket_create(rs, OSMO_RTP_F_POLL); + if (rs->ortp == NULL) { + talloc_free(rs); + return NULL; + } + rs->ortp->priv = rs; + rs->ortp->rx_cb = ortp_rx_cb; + return rs; + } +#endif + + rs->twrtp = osmo_twrtp_create(rs, 8, 20, true, twjit_cfg); + if (rs->twrtp == NULL) { + talloc_free(rs); + return NULL; + } + return rs; +} + +void rtp_abst_socket_free(struct rtp_abst_socket *rs) +{ +#ifdef HAVE_ORTP + if (rs->ortp) + osmo_rtp_socket_free(rs->ortp); +#endif + if (rs->twrtp) + osmo_twrtp_destroy(rs->twrtp); + talloc_free(rs); +} + +int rtp_abst_socket_bind(struct rtp_abst_socket *rs, const char *ipstr, + int port) +{ + int rc; + +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_socket_bind(rs->ortp, ipstr, port); +#endif + + rs->local_addr.sin_family = AF_INET; + rc = inet_aton(ipstr, &rs->local_addr.sin_addr); + if (!rc) + return -EINVAL; + rs->local_addr.sin_port = htons(port); + rc = osmo_twrtp_bind_local(rs->twrtp, + (const struct osmo_sockaddr *) &rs->local_addr, true); + if (rc < 0) + return rc; + return 0; +} + +int rtp_abst_socket_connect(struct rtp_abst_socket *rs, + const struct in_addr *ip, uint16_t port) +{ + struct sockaddr_in remote; + +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_socket_connect(rs->ortp, inet_ntoa(*ip), port); +#endif + + memset(&remote, 0, sizeof(remote)); + remote.sin_family = AF_INET; + memcpy(&remote.sin_addr, ip, sizeof(struct in_addr)); + remote.sin_port = htons(port); + return osmo_twrtp_set_remote(rs->twrtp, + (const struct osmo_sockaddr *) &remote); +} + +int rtp_abst_socket_set_pt(struct rtp_abst_socket *rs, int payload_type) +{ + rs->payload_type = payload_type; +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_socket_set_pt(rs->ortp, payload_type); +#endif + return 0; +} + +int rtp_abst_socket_set_dscp(struct rtp_abst_socket *rs, int dscp) +{ +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_socket_set_dscp(rs->ortp, dscp); +#endif + return osmo_twrtp_set_dscp(rs->twrtp, dscp); +} + +int rtp_abst_socket_set_priority(struct rtp_abst_socket *rs, uint8_t prio) +{ +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_socket_set_priority(rs->ortp, prio); +#endif + return osmo_twrtp_set_socket_prio(rs->twrtp, prio); +} + +void rtp_abst_socket_poll(struct rtp_abst_socket *rs) +{ + struct msgb *msg; + struct rtp_hdr *rtph; + const uint8_t *rtp_pl; + uint32_t rtp_pl_len; + +#ifdef HAVE_ORTP + if (rs->ortp) { + osmo_rtp_socket_poll(rs->ortp); + rs->ortp->rx_user_ts += GSM_RTP_DURATION; + return; + } +#endif + + osmo_twrtp_twjit_rx_ctrl(rs->twrtp, true); + rs->twrtp_rx_ticks++; + msg = osmo_twrtp_twjit_rx_poll(rs->twrtp); + if (!msg) + return; + + rtph = osmo_rtp_get_hdr(msg); + if (!rtph) { + rs->twrtp_rx_bad_hdr++; + msgb_free(msg); + return; + } + + if (rtph->payload_type != rs->payload_type) { + rs->twrtp_rx_wrong_pt++; + msgb_free(msg); + return; + } + + rtp_pl = osmo_rtp_get_payload(rtph, msg, &rtp_pl_len); + if (!rtp_pl) { + rs->twrtp_pl_extr_errors++; + msgb_free(msg); + return; + } + rs->twrtp_rx_pl_bytes += rtp_pl_len; + + if (rs->rx_cb) { + rs->rx_cb(rs, rtp_pl, rtp_pl_len, rtph->sequence, + rtph->timestamp, rtph->marker); + } + msgb_free(msg); +} + +int rtp_abst_send_frame(struct rtp_abst_socket *rs, const uint8_t *payload, + unsigned int payload_len, bool marker) +{ +#ifdef HAVE_ORTP + if (rs->ortp) { + return osmo_rtp_send_frame_ext(rs->ortp, payload, payload_len, + GSM_RTP_DURATION, marker); + } +#endif + return osmo_twrtp_tx_quantum(rs->twrtp, payload, payload_len, + rs->payload_type, marker, false, false); +} + +int rtp_abst_skipped_frame(struct rtp_abst_socket *rs) +{ +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_skipped_frame(rs->ortp, GSM_RTP_DURATION); +#endif + osmo_twrtp_tx_skip(rs->twrtp); + return 0; +} + +int rtp_abst_get_bound_ip_port(struct rtp_abst_socket *rs, + uint32_t *ip, int *port) +{ +#ifdef HAVE_ORTP + if (rs->ortp) + return osmo_rtp_get_bound_ip_port(rs->ortp, ip, port); +#endif + *ip = ntohl(rs->local_addr.sin_addr.s_addr); + *port = ntohs(rs->local_addr.sin_port); + return 0; +} + +int rtp_abst_socket_set_param(struct rtp_abst_socket *rs, + bool jitter_adaptive, int jitter_ms) +{ +#ifdef HAVE_ORTP + if (rs->ortp) { + return osmo_rtp_socket_set_param(rs->ortp, + jitter_adaptive ? OSMO_RTP_P_JIT_ADAP + : OSMO_RTP_P_JITBUF, + jitter_ms); + } +#endif + return 0; /* not applicable to twrtp */ +} + +void rtp_abst_socket_log_stats(struct rtp_abst_socket *rs, const char *cause) +{ + struct osmo_twjit *twjit; + const struct osmo_twrtp_stats *twrtp_stats; + const struct osmo_twjit_stats *twjit_stats; + +#ifdef HAVE_ORTP + if (rs->ortp) { + char prefix[80]; + + snprintf(prefix, sizeof(prefix), "Closing RTP socket on %s ", + cause); + osmo_rtp_socket_log_stats(rs->ortp, DRTP, LOGL_INFO, prefix); + return; + } +#endif + + twjit = osmo_twrtp_get_twjit(rs->twrtp); + twrtp_stats = osmo_twrtp_get_stats(rs->twrtp); + twjit_stats = osmo_twjit_get_stats(twjit); + + LOGP(DRTP, LOGL_INFO, "RTP session complete with %s\n", cause); + /* normal Rx stats */ + LOGP(DRTP, LOGL_INFO, "Rx active for %u ticks\n", rs->twrtp_rx_ticks); + LOGP(DRTP, LOGL_INFO, "twjit rx_packets=%u delivered_pkt=%u\n", + twjit_stats->rx_packets, twjit_stats->delivered_pkt); + if (twjit_stats->handovers_in || twjit_stats->handovers_out) { + LOGP(DRTP, LOGL_INFO, + "twjit handovers_in=%u handovers_out=%u\n", + twjit_stats->handovers_in, twjit_stats->handovers_out); + } + if (twjit_stats->too_old) { + LOGP(DRTP, LOGL_INFO, "twjit too_old=%u\n", + twjit_stats->too_old); + } + if (twjit_stats->underruns) { + LOGP(DRTP, LOGL_INFO, "twjit underruns=%u\n", + twjit_stats->underruns); + } + if (twjit_stats->ho_underruns) { + LOGP(DRTP, LOGL_INFO, "twjit ho_underruns=%u\n", + twjit_stats->ho_underruns); + } + if (twjit_stats->soft_underruns) { + LOGP(DRTP, LOGL_INFO, "twjit soft_underruns=%u\n", + twjit_stats->soft_underruns); + } + if (twjit_stats->output_gaps) { + LOGP(DRTP, LOGL_INFO, "twjit output_gaps=%u\n", + twjit_stats->output_gaps); + } + if (twjit_stats->thinning_drops) { + LOGP(DRTP, LOGL_INFO, "twjit thinning_drops=%u\n", + twjit_stats->thinning_drops); + } + if (twjit_stats->duplicate_ts) { + LOGP(DRTP, LOGL_INFO, "twjit duplicate_ts=%u\n", + twjit_stats->duplicate_ts); + } + if (twjit_stats->ssrc_changes) { + LOGP(DRTP, LOGL_INFO, "twjit ssrc_changes=%u\n", + twjit_stats->ssrc_changes); + } + if (twjit_stats->seq_skips) { + LOGP(DRTP, LOGL_INFO, "twjit seq_skips=%u\n", + twjit_stats->seq_skips); + } + if (twjit_stats->seq_backwards) { + LOGP(DRTP, LOGL_INFO, "twjit seq_backwards=%u\n", + twjit_stats->seq_backwards); + } + if (twjit_stats->seq_repeats) { + LOGP(DRTP, LOGL_INFO, "twjit seq_repeats=%u\n", + twjit_stats->seq_repeats); + } + if (twjit_stats->intentional_gaps) { + LOGP(DRTP, LOGL_INFO, "twjit intentional_gaps=%u\n", + twjit_stats->intentional_gaps); + } + if (twjit_stats->ts_resets) { + LOGP(DRTP, LOGL_INFO, "twjit ts_resets=%u\n", + twjit_stats->ts_resets); + } + LOGP(DRTP, LOGL_INFO, "Rx max jitter %u.%03u ms\n", + twjit_stats->jitter_max >> 3, (twjit_stats->jitter_max & 7) * 125); + /* Rx error stats */ + if (twrtp_stats->rx_rtp_badsrc) { + LOGP(DRTP, LOGL_ERROR, "Rx %u RTP packets from wrong src\n", + twrtp_stats->rx_rtp_badsrc); + } + if (twrtp_stats->rx_rtcp_badsrc) { + LOGP(DRTP, LOGL_ERROR, "Rx %u RTCP packets from wrong src\n", + twrtp_stats->rx_rtcp_badsrc); + } + if (twjit_stats->bad_packets) { + LOGP(DRTP, LOGL_ERROR, "Rx %u bad RTP packets (twjit)\n", + twjit_stats->bad_packets); + } + if (rs->twrtp_rx_bad_hdr) { + LOGP(DRTP, LOGL_ERROR, "Rx %u bad RTP packets (after twjit)\n", + rs->twrtp_rx_bad_hdr); + } + if (rs->twrtp_rx_wrong_pt) { + LOGP(DRTP, LOGL_ERROR, "Rx wrong pt number (%u times)\n", + rs->twrtp_rx_wrong_pt); + } + if (rs->twrtp_pl_extr_errors) { + LOGP(DRTP, LOGL_ERROR, + "Rx failed to extract payload (%u times)\n", + rs->twrtp_pl_extr_errors); + } + if (twrtp_stats->rx_rtcp_invalid) { + LOGP(DRTP, LOGL_ERROR, "Rx %u bad RTCP packets\n", + twrtp_stats->rx_rtcp_invalid); + } + if (twrtp_stats->rx_rtcp_wrong_ssrc) { + LOGP(DRTP, LOGL_ERROR, "Rx RTCP RR for wrong SSRC (%u times)\n", + twrtp_stats->rx_rtcp_wrong_ssrc); + } + /* Tx stats */ + LOGP(DRTP, LOGL_INFO, "Tx %u RTP packets\n", twrtp_stats->tx_rtp_pkt); +} + +static uint32_t compute_lost_count(struct osmo_twjit *twjit) +{ + const struct osmo_twjit_rr_info *rri; + int32_t cumulative_lost; + + rri = osmo_twjit_get_rr_info(twjit); + cumulative_lost = (int32_t)(rri->expected_pkt - rri->rx_packets); + if (cumulative_lost < 0) + cumulative_lost = 0; + return cumulative_lost; +} + +void rtp_abst_socket_stats(struct rtp_abst_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter) +{ + struct osmo_twjit *twjit; + const struct osmo_twrtp_stats *twrtp_stats; + const struct osmo_twjit_stats *twjit_stats; + +#ifdef HAVE_ORTP + if (rs->ortp) { + osmo_rtp_socket_stats(rs->ortp, sent_packets, sent_octets, + recv_packets, recv_octets, + recv_lost, last_jitter); + return; + } +#endif + + twjit = osmo_twrtp_get_twjit(rs->twrtp); + twrtp_stats = osmo_twrtp_get_stats(rs->twrtp); + twjit_stats = osmo_twjit_get_stats(twjit); + + *sent_packets = twrtp_stats->tx_rtp_pkt; + *sent_octets = twrtp_stats->tx_rtp_bytes; + *recv_packets = twjit_stats->rx_packets; + *recv_octets = rs->twrtp_rx_pl_bytes; + *recv_lost = compute_lost_count(twjit); + *last_jitter = twjit_stats->jitter_max; +} + +void rtp_abst_set_source_desc(struct rtp_abst_socket *rs, const char *cname, + const char *name, const char *email, + const char *phone, const char *loc, + const char *tool, const char *note) +{ +#ifdef HAVE_ORTP + if (rs->ortp) { + osmo_rtp_set_source_desc(rs->ortp, cname, name, email, phone, + loc, tool, note); + return; + } +#endif + osmo_twrtp_set_sdes(rs->twrtp, cname, name, email, phone, + loc, tool, note); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42165?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: Ic945f6d753ec7f5c0ac5cecc9f71049464de7e8f Gerrit-Change-Number: 42165 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in osmo-bts[master]: RTP: add vty configuration for twjit
by falconia 22 Feb '26

22 Feb '26

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/42164?usp=email ) Change subject: RTP: add vty configuration for twjit ...................................................................... RTP: add vty configuration for twjit This patch is the first step in the series adding the ability to use twrtp+twjit instead of Belledonne ortp. twjit requires vty config for tunable parameters - add this config. Actual use of this added config will happen in subsequent patches. Related: OS#6474 Change-Id: I9ccd060fce8416e01356fccd9ae465a7298a9ce5 --- M include/osmo-bts/bts.h M include/osmo-bts/vty.h M src/common/bts.c M src/common/vty.c 4 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/42164/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 8a5fb82..ec13d71 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -3,6 +3,7 @@ #include <osmocom/core/rate_ctr.h> #include <osmocom/core/socket.h> +#include <osmocom/netif/twjit.h> #include <osmo-bts/gsm_data.h> #include <osmo-bts/bts_trx.h> #include <osmo-bts/osmux.h> @@ -318,6 +319,7 @@ struct llist_head bsc_oml_hosts; unsigned int rtp_jitter_buf_ms; bool rtp_jitter_adaptive; + struct osmo_twjit_config *twjit_cfg; uint16_t rtp_port_range_start; uint16_t rtp_port_range_end; diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h index d326c5c..a33ccbb 100644 --- a/include/osmo-bts/vty.h +++ b/include/osmo-bts/vty.h @@ -13,6 +13,7 @@ BTS_NODE, TRX_NODE, OSMUX_NODE, + TWJIT_NODE, }; extern struct cmd_element cfg_bts_auto_band_cmd; diff --git a/src/common/bts.c b/src/common/bts.c index ea6b3d6..78ea417 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -337,7 +337,9 @@ /* configurable via VTY */ bts->paging_state = paging_init(bts, NUM_PAGING_MAX_DEFAULT, 0); + bts->rtp_jitter_buf_ms = 100; bts->rtp_jitter_adaptive = false; + bts->twjit_cfg = osmo_twjit_config_alloc(bts); bts->rtp_port_range_start = 16384; bts->rtp_port_range_end = 17407; bts->rtp_port_range_next = bts->rtp_port_range_start; @@ -353,7 +355,6 @@ bts->bsic = 0xff; /* invalid value, guarded by bsc_configured=false */ bts->bsic_configured = false; bts->load.ccch.load_ind_period = 112; - bts->rtp_jitter_buf_ms = 100; bts->max_ta = MAX_TA_DEF; bts->ny1 = 4; bts->ny2 = 4; diff --git a/src/common/vty.c b/src/common/vty.c index 62ebff2..461e92f 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -183,6 +183,12 @@ 1, }; +static struct cmd_node twjit_node = { + TWJIT_NODE, + "%s(twjit)# ", + 1, +}; + gDEFUN(cfg_bts_auto_band, cfg_bts_auto_band_cmd, "auto-band", "Automatically select band for ARFCN based on configured band\n") @@ -287,6 +293,18 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_bts_twjit, cfg_bts_twjit_cmd, + "twjit", + "Configure TW jitter buffer", + CMD_ATTR_IMMEDIATE) +{ + struct gsm_bts *bts = vty->index; + + vty->node = TWJIT_NODE; + vty->index = bts->twjit_cfg; + return CMD_SUCCESS; +} + DEFUN_ATTR(cfg_bts_trx, cfg_bts_trx_cmd, "trx <0-254>", "Select a TRX to configure\n" "TRX number\n", @@ -471,6 +489,8 @@ vty_out(vty, " smscb queue-hysteresis %d%s", bts->smscb_queue_hyst, VTY_NEWLINE); config_write_osmux(vty, " ", bts); + vty_out(vty, " twjit%s", VTY_NEWLINE); + osmo_twjit_config_write(vty, bts->twjit_cfg, " "); bts_model_config_write_bts(vty, bts); @@ -2808,6 +2828,11 @@ install_element(OSMUX_NODE, &cfg_bts_osmux_batch_size_cmd); install_element(OSMUX_NODE, &cfg_bts_osmux_dummy_padding_cmd); + /* twjit config node */ + install_element(BTS_NODE, &cfg_bts_twjit_cmd); + install_node(&twjit_node, config_write_dummy); + osmo_twjit_vty_init(TWJIT_NODE); + /* add and link to TRX config node */ install_element(BTS_NODE, &cfg_bts_trx_cmd); install_node(&trx_node, config_write_dummy); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/42164?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: I9ccd060fce8416e01356fccd9ae465a7298a9ce5 Gerrit-Change-Number: 42164 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error
by Hoernchen 21 Feb '26

21 Feb '26

Attention is currently required from: Hoernchen, lynxis lazus, pespin. Hello Jenkins Builder, lynxis lazus, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review-1 by lynxis lazus Change subject: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error ...................................................................... ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error The messages in the spec were different. Change-Id: I67d5cb876d20b29f4759d5b194606f34b8b966c4 --- M ccid_common/ccid_device.c M ccid_common/ccid_proto.h 2 files changed, 11 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/57/42157/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I67d5cb876d20b29f4759d5b194606f34b8b966c4 Gerrit-Change-Number: 42157 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error
by lynxis lazus 21 Feb '26

21 Feb '26

Attention is currently required from: Hoernchen. lynxis lazus has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email ) Change subject: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157/comment/1482dda3_2c… : PS1, Line 8: > It is not really important because this was never working and the rdr_to_pc_parameters is pointless […] Please describe your commit with more than just "fix message a and b". Please split this into 2 commits because you're fixing 2 messages in different places and fixing the protocol messages are quite important changes. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?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: I67d5cb876d20b29f4759d5b194606f34b8b966c4 Gerrit-Change-Number: 42157 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Feb 2026 19:33:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error
by Hoernchen 21 Feb '26

21 Feb '26

Attention is currently required from: lynxis lazus. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email ) Change subject: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157/comment/4d907793_f7… : PS1, Line 8: > What is wrong? "The messages in the spec were different. […] It is not really important because this was never working and the rdr_to_pc_parameters is pointless because we ignore the set message anyway and never change any parameters, so it was basically "working fine" since the octsim was created despite being wrong, and we do not have any bug reports about weird cards that don't work either. This just aligns it with the spec, that's it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?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: I67d5cb876d20b29f4759d5b194606f34b8b966c4 Gerrit-Change-Number: 42157 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 21 Feb 2026 16:43:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error
by lynxis lazus 21 Feb '26

21 Feb '26

Attention is currently required from: Hoernchen. lynxis lazus has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email ) Change subject: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157/comment/dead1962_d0… : PS1, Line 8: > Just to be clear, both messages were just plain wrong, there is no "different" wrong or "different" […] What is wrong? "The messages in the spec were different." should be also part of the commit messages. A commit message should explain why you did the change and gives the reader more information than "just read the code" and you know what's wrong. `fix "stuff"` can mean anything from filling the wrong data, from not sending the data at all This is such an important change (the part of rdr_to_pc_parameters) in difference to the rdr_to_pc_hardware_error, which is currently not in use. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?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: I67d5cb876d20b29f4759d5b194606f34b8b966c4 Gerrit-Change-Number: 42157 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Sat, 21 Feb 2026 16:13:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-ccid-firmware[master]: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error
by Hoernchen 21 Feb '26

21 Feb '26

Attention is currently required from: lynxis lazus. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?usp=email ) Change subject: ccid: fix rdr_to_pc_parameters and rdr_to_pc_hardware_error ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157/comment/8b9dd9ed_8d… : PS1, Line 8: > No. This patch stays exactly like this. Both messages were wrong, and now they agree with the spec. […] Just to be clear, both messages were just plain wrong, there is no "different" wrong or "different" problems, It absolutely does not matter how many bytes or which bytes were wrong, they didn't agree with the spec, there is no "a little bit" wrong when it comes to messages based on a spec, so those messages were just completely wrong, period. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42157?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: I67d5cb876d20b29f4759d5b194606f34b8b966c4 Gerrit-Change-Number: 42157 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 21 Feb 2026 15:28:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log February 2026