Osmocom Open Build Service

osmo-bts.spec Changed

commit_405368b6974e4da9b0775f557330833e13f069d4.txt Added

commit_a84b9a02610448be60de40f8ea490d4e5fa7ac60.txt Deleted

osmo-bts_1.6.0.130.a84b.dsc -> osmo-bts_1.6.0.132.4053.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.130.a84b
+Version: 1.6.0.132.4053
 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:
- 433efdf33bf567e3c03295f85dd09309e610dbb3 473084 osmo-bts_1.6.0.130.a84b.tar.xz
+ 9c696bdab8c043de9b3fcfb873a961796491cefb 473912 osmo-bts_1.6.0.132.4053.tar.xz
 Checksums-Sha256:
- 5242031b64e9add51ea5b61f6c1b983ada53cdf6630426763b25980991470c85 473084 osmo-bts_1.6.0.130.a84b.tar.xz
+ f9d65c48937ded20718cb4fc94448a25ac9c3bc3df173a41b841816308a0f993 473912 osmo-bts_1.6.0.132.4053.tar.xz
 Files:
- 14cb29d1708715870405f0e973aafdf8 473084 osmo-bts_1.6.0.130.a84b.tar.xz
+ dceea4498bb1032248f5d23304c74b39 473912 osmo-bts_1.6.0.132.4053.tar.xz

osmo-bts_1.6.0.130.a84b.tar.xz/.tarball-version -> osmo-bts_1.6.0.132.4053.tar.xz/.tarball-version Changed

osmo-bts_1.6.0.130.a84b.tar.xz/debian/changelog -> osmo-bts_1.6.0.132.4053.tar.xz/debian/changelog Changed

osmo-bts_1.6.0.130.a84b.tar.xz/include/osmo-bts/msg_utils.h -> osmo-bts_1.6.0.132.4053.tar.xz/include/osmo-bts/msg_utils.h Changed

osmo-bts_1.6.0.130.a84b.tar.xz/include/osmo-bts/rtp_input_preen.h -> osmo-bts_1.6.0.132.4053.tar.xz/include/osmo-bts/rtp_input_preen.h Changed

osmo-bts_1.6.0.130.a84b.tar.xz/src/common/l1sap.c -> osmo-bts_1.6.0.132.4053.tar.xz/src/common/l1sap.c Changed

@@ -1314,9 +1314,17 @@
 			 * directly coupled to the GSM 05.03 channel decoder,
 			 * and cannot be reconstructed downstream from frame
 			 * payload bits.  The only kind of SID we can detect
-			 * here is the perfect, error-free kind. */
-			is_sid = osmo_hr_check_sid(msgb_l2(resp_msg),
-						   msgb_l2len(resp_msg));
+			 * here is the perfect, error-free kind.  However,
+			 * if we received RFC 5993 payload and the sender
+			 * told us it is valid SID, honor that indication
+			 * and rejuvenate the SID codeword. */
+			if (rtpmsg_is_rfc5993_sid(resp_msg)) {
+				is_sid = true;
+				osmo_hr_sid_reset(msgb_l2(resp_msg));
+			} else {
+				is_sid = osmo_hr_check_sid(msgb_l2(resp_msg),
+							   msgb_l2len(resp_msg));
+			}
 		}
 		break;
 	case GSM48_CMODE_SPEECH_EFR:
@@ -2152,6 +2160,7 @@
 {
 	struct gsm_lchan *lchan = rs->priv;
 	struct msgb *msg;
+	bool rfc5993_sid = false;
 
 	/* if we're in loopback mode, we don't accept frames from the
 	 * RTP socket anymore */
@@ -2159,7 +2168,7 @@
 		return;
 
 	/* initial preen */
-	switch (rtp_payload_input_preen(lchan, rtp_pl, rtp_pl_len)) {
+	switch (rtp_payload_input_preen(lchan, rtp_pl, rtp_pl_len, &rfc5993_sid)) {
 	case PL_DECISION_DROP:
 		return;
 	case PL_DECISION_ACCEPT:
@@ -2184,6 +2193,8 @@
 	rtpmsg_seq(msg) = seq_number;
 	/* Store RTP header Timestamp in control buffer */
 	rtpmsg_ts(msg) = timestamp;
+	/* Store RFC 5993 SID flag likewise */
+	rtpmsg_is_rfc5993_sid(msg) = rfc5993_sid;
 
 	/* make sure the queue doesn't get too long */
 	lchan_dl_tch_queue_enqueue(lchan, msg, 1);

osmo-bts_1.6.0.130.a84b.tar.xz/src/common/rtp_input_preen.c -> osmo-bts_1.6.0.132.4053.tar.xz/src/common/rtp_input_preen.c Changed

@@ -82,13 +82,27 @@
 }
 
 static enum pl_input_decision
-input_preen_hr(const uint8_t *rtp_pl, unsigned rtp_pl_len)
+input_preen_hr(const uint8_t *rtp_pl, unsigned rtp_pl_len,
+		bool *rfc5993_sid_flag)
 {
 	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:
+		/* Validate ToC octet: for payload of this length to be valid,
+		 * the F bit must be 0 and the FT field must be either 0 (good
+		 * speech) or 2 (good SID). */
+		switch (rtp_pl0 & 0xF0) {
+		case 0x00:
+			break;
+		case 0x20:
+			*rfc5993_sid_flag = true;
+			break;
+		default:
+			/* invalid payload */
+			return PL_DECISION_DROP;
+		}
 		/* Strip ToC octet, leaving only "pure" TS 101 318 payload. */
 		return PL_DECISION_STRIP_HDR_OCTET;
 	default:
@@ -99,7 +113,7 @@
 
 enum pl_input_decision
 rtp_payload_input_preen(struct gsm_lchan *lchan, const uint8_t *rtp_pl,
-			unsigned rtp_pl_len)
+			unsigned rtp_pl_len, bool *rfc5993_sid_flag)
 {
 	/* If rtp continuous-streaming is enabled, we shall emit RTP packets
 	 * with zero-length payloads as BFI markers. In a TrFO scenario such
@@ -118,7 +132,7 @@
 		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);
+			return input_preen_hr(rtp_pl, rtp_pl_len, rfc5993_sid_flag);
 	case GSM48_CMODE_SPEECH_EFR:
 		return input_preen_efr(rtp_pl, rtp_pl_len);
 	case GSM48_CMODE_SPEECH_AMR:

Changes of Revision 111