Osmocom Open Build Service

osmo-bts.spec Changed

commit_05b46291669cbe8797279c9580098057c5c734a4.txt Deleted

commit_1160cabefb2326aaf7f17573ef36859c9bce0d38.txt Added

osmo-bts_1.6.0.122.05b4.dsc -> osmo-bts_1.6.0.124.1160.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bts
 Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc
 Architecture: any all
-Version: 1.6.0.122.05b4
+Version: 1.6.0.124.1160
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmobts
 Standards-Version: 3.9.8
@@ -17,8 +17,8 @@
  osmo-bts-virtual deb net optional arch=any
  osmo-bts-virtual-dbg deb debug extra arch=any
 Checksums-Sha1:
- 5157248ee0776285e2c1c915625b12ba5d57a834 469888 osmo-bts_1.6.0.122.05b4.tar.xz
+ 2786aa92f8d82884b0470f81651b6fd3715a8535 470892 osmo-bts_1.6.0.124.1160.tar.xz
 Checksums-Sha256:
- 7cf0ebcfbcd304b70894243ce90f471bd89187a88b823884522cafd796641deb 469888 osmo-bts_1.6.0.122.05b4.tar.xz
+ 7918ed99c3e25554df8d7e48fe4871e5de9268267c894614175b37e1c7afd644 470892 osmo-bts_1.6.0.124.1160.tar.xz
 Files:
- 151b7f69f14fe97cb792bff156ad9a21 469888 osmo-bts_1.6.0.122.05b4.tar.xz
+ accd48183d960447eef1997d05334335 470892 osmo-bts_1.6.0.124.1160.tar.xz

osmo-bts_1.6.0.122.05b4.tar.xz/.tarball-version -> osmo-bts_1.6.0.124.1160.tar.xz/.tarball-version Changed

osmo-bts_1.6.0.122.05b4.tar.xz/TODO-RELEASE -> osmo-bts_1.6.0.124.1160.tar.xz/TODO-RELEASE Changed

osmo-bts_1.6.0.122.05b4.tar.xz/debian/changelog -> osmo-bts_1.6.0.124.1160.tar.xz/debian/changelog Changed

osmo-bts_1.6.0.122.05b4.tar.xz/include/osmo-bts/Makefile.am -> osmo-bts_1.6.0.124.1160.tar.xz/include/osmo-bts/Makefile.am Changed

osmo-bts_1.6.0.124.1160.tar.xz/include/osmo-bts/rtp_input_preen.h Added

osmo-bts_1.6.0.122.05b4.tar.xz/src/common/Makefile.am -> osmo-bts_1.6.0.124.1160.tar.xz/src/common/Makefile.am Changed

osmo-bts_1.6.0.122.05b4.tar.xz/src/common/l1sap.c -> osmo-bts_1.6.0.124.1160.tar.xz/src/common/l1sap.c Changed

@@ -54,6 +54,7 @@
 #include <osmo-bts/bts_model.h>
 #include <osmo-bts/handover.h>
 #include <osmo-bts/msg_utils.h>
+#include <osmo-bts/rtp_input_preen.h>
 #include <osmo-bts/pcuif_proto.h>
 #include <osmo-bts/cbch.h>
 
@@ -1216,83 +1217,23 @@
 	return 1;
 }
 
-static bool rtppayload_is_octet_aligned(const uint8_t *rtp_pl, uint8_t payload_len)
+/* This helper function for l1sap_tch_rts_ind() preens incoming RTP frames
+ * for FR/EFR SID: if the received frame is a valid SID per the rules of
+ * GSM 06.31/06.81 section 6.1.1, it needs to be rejuvenated by clearing
+ * all reserved bits and resetting the SID code word to error-free 95 zeros
+ * for FR or 95 ones for EFR, and if the received frame is an invalid SID
+ * per the same rules, then we need to drop it.  We return false if
+ * l1sap_tch_rts_ind() needs to drop this frame, otherwise true. */
+static bool rtppayload_sid_preen(struct gsm_lchan *lchan, struct msgb *msg)
 {
-	/*
-	 * Logic: If 1st bit padding is not zero, packet is either:
-	 * - bandwidth-efficient AMR payload.
-	 * - malformed packet.
-	 * However, Bandwidth-efficient AMR 4,75 frame last in payload(F=0, FT=0)
-	 * with 4th,5ht,6th AMR payload to 0 matches padding==0.
-	 * Furthermore, both AMR 4,75 bw-efficient and octet alignment are 14 bytes long (AMR 4,75 encodes 95b):
-	 * bw-efficient: 95b, + 4b hdr + 6b ToC = 105b, + padding = 112b = 14B.
-	 * octet-aligned: 1B hdr + 1B ToC + 95b = 111b, + padding = 112b = 14B.
-	 * We cannot use other fields to match since they are inside the AMR
-	 * payload bits which are unknown.
-	 * As a result, this function may return false positive (true) for some AMR
-	 * 4,75 AMR frames, but given the length, CMR and FT read is the same as a
-	 * consequence, the damage in here is harmless other than being unable to
-	 * decode the audio at the other side.
-	 */
-	#define AMR_PADDING1(rtp_pl) (rtp_pl0 & 0x0f)
-	#define AMR_PADDING2(rtp_pl) (rtp_pl1 & 0x03)
-
-	if (payload_len < 2 || AMR_PADDING1(rtp_pl) || AMR_PADDING2(rtp_pl))
-		return false;
-
-	return true;
-}
-
-static bool rtppayload_validate_fr(struct msgb *msg)
-{
-	if (msg->len != GSM_FR_BYTES)
-		return false;
-	if ((msg->data0 & 0xF0) != 0xD0)
-		return false;
-	return osmo_fr_sid_preen(msg->data);
-}
-
-static bool rtppayload_validate_efr(struct msgb *msg)
-{
-	if (msg->len != GSM_EFR_BYTES)
-		return false;
-	if ((msg->data0 & 0xF0) != 0xC0)
-		return false;
-	return osmo_efr_sid_preen(msg->data);
-}
-
-static bool rtppayload_is_valid(struct gsm_lchan *lchan, struct msgb *resp_msg)
-{
-	/* If rtp continuous-streaming is enabled, we shall emit RTP packets
-	 * with zero-length payloads as BFI markers. In a TrFO scenario such
-	 * RTP packets sent by call leg A will be received by call leg B,
-	 * hence we need to handle them gracefully. For the purposes of a BTS
-	 * that runs on its own TDMA timing and does not need timing ticks from
-	 * an incoming RTP stream, the correct action upon receiving such
-	 * timing-tick-only RTP packets should be the same as when receiving
-	 * no RTP packet at all. The simplest way to produce that behavior
-	 * is to treat zero-length RTP payloads as invalid. */
-	if (resp_msg->len == 0)
-		return false;
-
 	switch (lchan->tch_mode) {
 	case GSM48_CMODE_SPEECH_V1:
 		if (lchan->type == GSM_LCHAN_TCH_F)
-			return rtppayload_validate_fr(resp_msg);
+			return osmo_fr_sid_preen(msg->data);
 		else
-			return true;	/* FIXME: implement preening for HR1 */
+			return true;	/* FIXME: see OS#6036 */
 	case GSM48_CMODE_SPEECH_EFR:
-		return rtppayload_validate_efr(resp_msg);
-	case GSM48_CMODE_SPEECH_AMR:
-		/* Avoid forwarding bw-efficient AMR to lower layers,
-		 * most bts models don't support it. */
-		if (!rtppayload_is_octet_aligned(resp_msg->data, resp_msg->len)) {
-			LOGPLCHAN(lchan, DL1P, LOGL_NOTICE,
-				  "RTP->L1: Dropping unexpected AMR encoding (bw-efficient?) %s\n",
-				  osmo_hexdump(resp_msg->data, resp_msg->len));
-			return false;
-		}
-		return true;
+		return osmo_efr_sid_preen(msg->data);
 	default:
 		return true;
 	}
@@ -1337,7 +1278,7 @@
 	if (!resp_msg) {
 		LOGPLCGT(lchan, &g_time, DL1P, LOGL_DEBUG, "DL TCH Tx queue underrun\n");
 		resp_l1sap = &empty_l1sap;
-	} else if (!rtppayload_is_valid(lchan, resp_msg)) {
+	} else if (!rtppayload_sid_preen(lchan, resp_msg)) {
 		msgb_free(resp_msg);
 		resp_msg = NULL;
 		resp_l1sap = &empty_l1sap;
@@ -1943,6 +1884,20 @@
 	if (lchan->loopback)
 		return;
 
+	/* initial preen */
+	switch (rtp_payload_input_preen(lchan, rtp_pl, rtp_pl_len)) {
+	case PL_DECISION_DROP:
+		return;
+	case PL_DECISION_ACCEPT:
+		break;
+	case PL_DECISION_STRIP_HDR_OCTET:
+		rtp_pl++;
+		rtp_pl_len--;
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+
 	msg = l1sap_msgb_alloc(rtp_pl_len);
 	if (!msg)
 		return;

osmo-bts_1.6.0.124.1160.tar.xz/src/common/rtp_input_preen.c Added

@@ -0,0 +1,137 @@
+/*
+ * This module implements a helper function for the RTP input path:
+ * validates incoming RTP payloads, makes the accept-or-drop decision,
+ * and for some codecs signals additional required actions such as
+ * dropping one header octet.
+ *
+ * Author: Mychaela N. Falconia <falcon@freecalypso.org>, 2023 - however,
+ * Mother Mychaela's contributions are NOT subject to copyright.
+ * No rights reserved, all rights relinquished.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
+
+#include <osmocom/codec/codec.h>
+
+#include <osmo-bts/lchan.h>
+#include <osmo-bts/logging.h>
+#include <osmo-bts/rtp_input_preen.h>
+
+static bool amr_is_octet_aligned(const uint8_t *rtp_pl, unsigned payload_len)
+{
+	/*
+	 * Logic: If 1st bit padding is not zero, packet is either:
+	 * - bandwidth-efficient AMR payload.
+	 * - malformed packet.
+	 * However, Bandwidth-efficient AMR 4,75 frame last in payload(F=0, FT=0)
+	 * with 4th,5ht,6th AMR payload to 0 matches padding==0.
+	 * Furthermore, both AMR 4,75 bw-efficient and octet alignment are 14 bytes long (AMR 4,75 encodes 95b):
+	 * bw-efficient: 95b, + 4b hdr + 6b ToC = 105b, + padding = 112b = 14B.
+	 * octet-aligned: 1B hdr + 1B ToC + 95b = 111b, + padding = 112b = 14B.
+	 * We cannot use other fields to match since they are inside the AMR
+	 * payload bits which are unknown.
+	 * As a result, this function may return false positive (true) for some AMR
+	 * 4,75 AMR frames, but given the length, CMR and FT read is the same as a
+	 * consequence, the damage in here is harmless other than being unable to
+	 * decode the audio at the other side.
+	 */
+	#define AMR_PADDING1(rtp_pl) (rtp_pl0 & 0x0f)
+	#define AMR_PADDING2(rtp_pl) (rtp_pl1 & 0x03)
+
+	if (payload_len < 2 || AMR_PADDING1(rtp_pl) || AMR_PADDING2(rtp_pl))
+		return false;
+
+	return true;
+}
+
+static enum pl_input_decision
+input_preen_fr(const uint8_t *rtp_pl, unsigned rtp_pl_len)
+{
+	if (rtp_pl_len != GSM_FR_BYTES)
+		return PL_DECISION_DROP;
+	if ((rtp_pl0 & 0xF0) != 0xD0)
+		return PL_DECISION_DROP;
+	return PL_DECISION_ACCEPT;
+}
+
+static enum pl_input_decision
+input_preen_efr(const uint8_t *rtp_pl, unsigned rtp_pl_len)
+{
+	if (rtp_pl_len != GSM_EFR_BYTES)
+		return PL_DECISION_DROP;
+	if ((rtp_pl0 & 0xF0) != 0xC0)
+		return PL_DECISION_DROP;
+	return PL_DECISION_ACCEPT;
+}
+
+static enum pl_input_decision
+input_preen_hr(const uint8_t *rtp_pl, unsigned rtp_pl_len)
+{
+	switch (rtp_pl_len) {
+	case GSM_HR_BYTES:
+		/* RTP input matches our internal format - we are good */
+		return PL_DECISION_ACCEPT;
+	case GSM_HR_BYTES_RTP_RFC5993:
+		/* Strip ToC octet, leaving only "pure" TS 101 318 payload. */
+		return PL_DECISION_STRIP_HDR_OCTET;
+	default:
+		/* invalid payload */
+		return PL_DECISION_DROP;
+	}
+}
+
+enum pl_input_decision
+rtp_payload_input_preen(struct gsm_lchan *lchan, const uint8_t *rtp_pl,
+			unsigned rtp_pl_len)
+{
+	/* If rtp continuous-streaming is enabled, we shall emit RTP packets
+	 * with zero-length payloads as BFI markers. In a TrFO scenario such
+	 * RTP packets sent by call leg A will be received by call leg B,
+	 * hence we need to handle them gracefully. For the purposes of a BTS
+	 * that runs on its own TDMA timing and does not need timing ticks from
+	 * an incoming RTP stream, the correct action upon receiving such
+	 * timing-tick-only RTP packets should be the same as when receiving
+	 * no RTP packet at all. The simplest way to produce that behavior
+	 * is to treat zero-length RTP payloads as invalid. */
+	if (rtp_pl_len == 0)
+		return PL_DECISION_DROP;
+
+	switch (lchan->tch_mode) {
+	case GSM48_CMODE_SPEECH_V1:
+		if (lchan->type == GSM_LCHAN_TCH_F)
+			return input_preen_fr(rtp_pl, rtp_pl_len);
+		else
+			return input_preen_hr(rtp_pl, rtp_pl_len);
+	case GSM48_CMODE_SPEECH_EFR:
+		return input_preen_efr(rtp_pl, rtp_pl_len);
+	case GSM48_CMODE_SPEECH_AMR:
+		/* Avoid forwarding bw-efficient AMR to lower layers,
+		 * most bts models don't support it. */
+		if (!amr_is_octet_aligned(rtp_pl, rtp_pl_len)) {
+			LOGPLCHAN(lchan, DL1P, LOGL_NOTICE,
+				  "RTP->L1: Dropping unexpected AMR encoding (bw-efficient?) %s\n",
+				  osmo_hexdump(rtp_pl, rtp_pl_len));
+			return PL_DECISION_DROP;
+		}
+		return PL_DECISION_ACCEPT;
+	default:
+		return PL_DECISION_ACCEPT;
+	}
+}

Changes of Revision 106