Osmocom Open Build Service

osmo-bts.spec Changed

commit_5755946beb6d129b00c02d1d29c18463558427b1.txt Added

commit_8b306b6f93bcbabb46ed3b6faeff6bbaee45dbf7.txt Deleted

osmo-bts_1.6.0.114.8b30.dsc -> osmo-bts_1.6.0.115.5755.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.114.8b30
+Version: 1.6.0.115.5755
 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:
- 98c32858eef004fd9b7017b643acad4c76dc035a 469720 osmo-bts_1.6.0.114.8b30.tar.xz
+ 0ee015d3d4cbb1352207c9d8a805545ecbf16f1d 469828 osmo-bts_1.6.0.115.5755.tar.xz
 Checksums-Sha256:
- d19cd56ecc7b079fa3d01d005e4eabee443acf0ed6aa62d312e0ec2096df22c4 469720 osmo-bts_1.6.0.114.8b30.tar.xz
+ b096aa8234e19fe30ff173fde7ffe89b51c658aa2dd170b68398c3bdfaaff047 469828 osmo-bts_1.6.0.115.5755.tar.xz
 Files:
- b67945c349cbf78d6c73a6ae227abc1f 469720 osmo-bts_1.6.0.114.8b30.tar.xz
+ dd8fa77c80aa43a8773675718a4839dc 469828 osmo-bts_1.6.0.115.5755.tar.xz

osmo-bts_1.6.0.114.8b30.tar.xz/.tarball-version -> osmo-bts_1.6.0.115.5755.tar.xz/.tarball-version Changed

osmo-bts_1.6.0.114.8b30.tar.xz/debian/changelog -> osmo-bts_1.6.0.115.5755.tar.xz/debian/changelog Changed

osmo-bts_1.6.0.114.8b30.tar.xz/src/common/l1sap.c -> osmo-bts_1.6.0.115.5755.tar.xz/src/common/l1sap.c Changed

@@ -37,6 +37,8 @@
 #include <osmocom/core/gsmtap_util.h>
 #include <osmocom/core/utils.h>
 
+#include <osmocom/codec/codec.h>
+
 #include <osmocom/trau/osmo_ortp.h>
 
 #include <osmo-bts/logging.h>
@@ -1241,6 +1243,24 @@
 	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
@@ -1255,16 +1275,27 @@
 	if (resp_msg->len == 0)
 		return false;
 
-	/* Avoid forwarding bw-efficient AMR to lower layers, most bts models
-	 * don't support it. */
-	if (lchan->tch_mode == GSM48_CMODE_SPEECH_AMR &&
-		!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;
+	switch (lchan->tch_mode) {
+	case GSM48_CMODE_SPEECH_V1:
+		if (lchan->type == GSM_LCHAN_TCH_F)
+			return rtppayload_validate_fr(resp_msg);
+		else
+			return true;	/* FIXME: implement preening for HR1 */
+	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;
+	default:
+		return true;
 	}
-	return true;
 }
 
 /* TCH-RTS-IND prim received from bts model */

osmo-bts_1.6.0.114.8b30.tar.xz/src/osmo-bts-omldummy/Makefile.am -> osmo-bts_1.6.0.115.5755.tar.xz/src/osmo-bts-omldummy/Makefile.am Changed

Changes of Revision 98