Osmocom Open Build Service

commit_00cb24d73e56a67c6d32ba6c607bbcea344a42f3.txt Deleted

commit_a980c57a610484f5dd657c7b6a2198d4c22cd345.txt Added

osmo-msc_1.12.1.1.a980.dsc Added

@@ -0,0 +1,21 @@
+Format: 3.0 (native)
+Source: osmo-msc
+Binary: osmo-msc, osmo-msc-dbg, osmo-msc-doc
+Architecture: any all
+Version: 1.12.1.1.a980
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://osmocom.org/projects/osmomsc
+Standards-Version: 3.9.8
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-msc
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-msc
+Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, libsqlite3-dev, libsctp-dev, libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), libosmocore-dev (>= 1.10.0), libosmo-sigtran-dev (>= 2.0.0), libosmo-abis-dev (>= 1.6.0), libosmo-mgcp-client-dev (>= 1.13.0), libosmo-gsup-client-dev (>= 1.8.0), libosmo-netif-dev (>= 1.5.0), libosmo-ranap-dev (>= 1.6.0), osmo-gsm-manuals-dev (>= 1.6.0)
+Package-List:
+ osmo-msc deb net extra arch=any
+ osmo-msc-dbg deb debug extra arch=any
+ osmo-msc-doc deb doc optional arch=all
+Checksums-Sha1:
+ 6ccc0882f7066e35d8104437e451da0ecc3bb6c0 388644 osmo-msc_1.12.1.1.a980.tar.xz
+Checksums-Sha256:
+ decd641d37e7c447147ae10d6abb29e9ce8a6c1aee8b40d490f4c3e8466ca3ed 388644 osmo-msc_1.12.1.1.a980.tar.xz
+Files:
+ 21f4b02fd8314a6dfa9adc3a9cabebcb 388644 osmo-msc_1.12.1.1.a980.tar.xz

osmo-msc_1.12.1.tar.xz/.tarball-version -> osmo-msc_1.12.1.1.a980.tar.xz/.tarball-version Changed

osmo-msc_1.12.1.tar.xz/debian/changelog -> osmo-msc_1.12.1.1.a980.tar.xz/debian/changelog Changed

osmo-msc_1.12.1.tar.xz/include/osmocom/msc/codec_mapping.h -> osmo-msc_1.12.1.1.a980.tar.xz/include/osmocom/msc/codec_mapping.h Changed

osmo-msc_1.12.1.tar.xz/src/libmsc/codec_mapping.c -> osmo-msc_1.12.1.1.a980.tar.xz/src/libmsc/codec_mapping.c Changed

@@ -343,6 +343,37 @@
 	return 0;
 }
 
+/* Bearer capability for phase 1 mobile stations must not have a speech version list. It uses the the radio capability
+ * to select the codec. The speech version list is removed. If no phase 1 codec was in the speech version list, an
+ * error is returned also. */
+int bearer_cap_filter_rev_lev(struct gsm_mncc_bearer_cap *bearer_cap, uint8_t rev_lev)
+{
+	bool fr_present = false, hr_present = false;
+	int i;
+
+	if (rev_lev > 0)
+		return 0;
+
+
+	for (i = 0; bearer_cap->speech_veri >= 0; i++) {
+		switch (bearer_cap->speech_veri) {
+		case GSM48_BCAP_SV_FR:
+			fr_present = true;
+			break;
+		case GSM48_BCAP_SV_HR:
+			hr_present = true;
+			break;
+		}
+	}
+
+	bearer_cap->speech_ver0 = -1;
+
+	if (!fr_present && !hr_present)
+		return -ENOTSUP;
+
+	return 0;
+}
+
 /* Try to convert the SDP audio codec name to Speech Versions to append to Bearer Capabilities.
  * Return the number of Speech Version entries added (some may add more than one, others may be unknown/unapplicable and
  * return 0). */

osmo-msc_1.12.1.tar.xz/src/libmsc/gsm_04_08_cc.c -> osmo-msc_1.12.1.1.a980.tar.xz/src/libmsc/gsm_04_08_cc.c Changed

@@ -950,6 +950,13 @@
 			msgb_free(msg);
 			return rc;
 		}
+		rc = bearer_cap_filter_rev_lev(&bearer_cap, trans->vsub->classmark.classmark1.rev_lev);
+		if (rc) {
+			LOG_TRANS(trans, LOGL_ERROR, "No codec offered is supported by phase 1 mobile.\n");
+			trans_free(trans);
+			msgb_free(msg);
+			return rc;
+		}
 		break;
 	case GSM48_BCAP_ITCAP_3k1_AUDIO:
 	case GSM48_BCAP_ITCAP_FAX_G3:
@@ -1136,6 +1143,7 @@
 				  trans->bearer_cap.transfer);
 			return -EINVAL;
 		}
+		bearer_cap_filter_rev_lev(&proceeding->bearer_cap, trans->vsub->classmark.classmark1.rev_lev);
 		gsm48_encode_bearer_cap(msg, 0, &proceeding->bearer_cap);
 		memcpy(&trans->bearer_cap, &proceeding->bearer_cap, sizeof(trans->bearer_cap));
 	}
@@ -1851,6 +1859,7 @@
 	gsm48_start_cc_timer(trans, 0x323, GSM48_T323);
 
 	/* bearer capability */
+	bearer_cap_filter_rev_lev(&modify->bearer_cap, trans->vsub->classmark.classmark1.rev_lev);
 	gsm48_encode_bearer_cap(msg, 1, &modify->bearer_cap);
 	memcpy(&trans->bearer_cap, &modify->bearer_cap, sizeof(trans->bearer_cap));
 
@@ -1898,6 +1907,7 @@
 	gh->msg_type = GSM48_MT_CC_MODIFY_COMPL;
 
 	/* bearer capability */
+	bearer_cap_filter_rev_lev(&modify->bearer_cap, trans->vsub->classmark.classmark1.rev_lev);
 	gsm48_encode_bearer_cap(msg, 1, &modify->bearer_cap);
 	memcpy(&trans->bearer_cap, &modify->bearer_cap, sizeof(trans->bearer_cap));
 
@@ -1951,6 +1961,7 @@
 	gh->msg_type = GSM48_MT_CC_MODIFY_REJECT;
 
 	/* bearer capability */
+	bearer_cap_filter_rev_lev(&modify->bearer_cap, trans->vsub->classmark.classmark1.rev_lev);
 	gsm48_encode_bearer_cap(msg, 1, &modify->bearer_cap);
 	memcpy(&trans->bearer_cap, &modify->bearer_cap, sizeof(trans->bearer_cap));
 	/* cause */

osmo-msc_1.12.1.dsc Deleted

@@ -1,21 +0,0 @@
-Format: 3.0 (native)
-Source: osmo-msc
-Binary: osmo-msc, osmo-msc-dbg, osmo-msc-doc
-Architecture: any all
-Version: 1.12.1
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://osmocom.org/projects/osmomsc
-Standards-Version: 3.9.8
-Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-msc
-Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-msc
-Build-Depends: debhelper (>= 10), dh-autoreconf, autotools-dev, autoconf, automake, libtool, pkg-config, libsqlite3-dev, libsctp-dev, libtalloc-dev, libsmpp34-dev (>= 1.14.0), libasn1c-dev (>= 0.9.30), libosmocore-dev (>= 1.10.0), libosmo-sigtran-dev (>= 2.0.0), libosmo-abis-dev (>= 1.6.0), libosmo-mgcp-client-dev (>= 1.13.0), libosmo-gsup-client-dev (>= 1.8.0), libosmo-netif-dev (>= 1.5.0), libosmo-ranap-dev (>= 1.6.0), osmo-gsm-manuals-dev (>= 1.6.0)
-Package-List:
- osmo-msc deb net extra arch=any
- osmo-msc-dbg deb debug extra arch=any
- osmo-msc-doc deb doc optional arch=all
-Checksums-Sha1:
- 9e8253fde17c400fc3b44ea11caadf55acd6ffe4 388384 osmo-msc_1.12.1.tar.xz
-Checksums-Sha256:
- ee6484bb722fd3147464d3aec807e13ac09e3d282562dc424ec255af36b4f215 388384 osmo-msc_1.12.1.tar.xz
-Files:
- b99f69e61b580cf8aabb196b3c2cfd67 388384 osmo-msc_1.12.1.tar.xz

Changes of Revision 118