Merge pull request #3 from jusa/jb55276

Be less pedantic about ordering of speech codecs.
[bluetooth] Be less pedantic about ordering of speech codecs. Fixes JB#55276
2025-12-01 23:21:04 +08:00 · 2021-08-25 17:00:06 +03:00 · 2021-08-25 16:32:55 +03:00 · 2021-08-25 16:02:24 +03:00 · 2021-08-24 13:29:18 +03:00 · 2021-07-30 15:12:59 +03:00
3 changed files with 17 additions and 9 deletions
--- a/ofono/drivers/ril/ril_data.c
+++ b/ofono/drivers/ril/ril_data.c
@@ -960,6 +960,12 @@ static gboolean ril_data_call_setup_submit(struct ril_data_request *req)
 			RADIO_TECH_LTE : priv->network->data.ril_tech;
 	if (tech > 2) {
 		tech += 2;
+	} else {
+		/*
+		 * This value used to be hardcoded, let's keep using it
+		 * as the default.
+		 */
+		tech = RADIO_TECH_HSPA;
 	}

 	if (setup->username && setup->username[0]) {
--- a/ofono/src/simfs.c
+++ b/ofono/src/simfs.c
@@ -405,18 +405,18 @@ static void sim_fs_op_read_block_cb(const struct ofono_error *error,
 	}

 	start_block = op->offset / 256;
-	end_block = (op->offset + (op->num_bytes - 1)) / 256;
+	end_block = op->num_bytes ? (op->offset + op->num_bytes - 1) / 256 :
+								start_block;

 	if (op->current == start_block) {
 		bufoff = 0;
 		dataoff = op->offset % 256;
-		tocopy = MIN(256 - op->offset % 256,
-				op->num_bytes - op->current * 256);
+		tocopy = MIN(256 - dataoff, op->num_bytes);
 	} else {
-		bufoff = (op->current - start_block - 1) * 256 +
+		bufoff = (op->current - start_block) * 256 -
 				op->offset % 256;
 		dataoff = 0;
-		tocopy = MIN(256, op->num_bytes - op->current * 256);
+		tocopy = MIN(256, op->num_bytes - bufoff);
 	}

 	DBG("bufoff: %d, dataoff: %d, tocopy: %d",
@@ -485,13 +485,12 @@ static gboolean sim_fs_op_read_block(gpointer user_data)
 			bufoff = 0;
 			seekoff = SIM_CACHE_HEADER_SIZE + op->current * 256 +
 				op->offset % 256;
-			toread = MIN(256 - op->offset % 256,
-					op->num_bytes - op->current * 256);
+			toread = MIN(256 - op->offset % 256, op->num_bytes);
 		} else {
-			bufoff = (op->current - start_block - 1) * 256 +
+			bufoff = (op->current - start_block) * 256 -
 					op->offset % 256;
 			seekoff = SIM_CACHE_HEADER_SIZE + op->current * 256;
-			toread = MIN(256, op->num_bytes - op->current * 256);
+			toread = MIN(256, op->num_bytes - bufoff);
 		}

 		DBG("bufoff: %d, seekoff: %d, toread: %d",
--- a/rpm/ofono.spec
+++ b/rpm/ofono.spec
@@ -130,6 +130,9 @@ systemctl daemon-reload ||:
 %postun
 systemctl daemon-reload ||:

+%transfiletriggerin -- %{_libdir}/ofono/plugins
+systemctl try-restart ofono.service ||:
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
Author	SHA1	Message	Date
Juho Hämäläinen	1c0f5094a6	Merge pull request #3 from jusa/jb55276 Be less pedantic about ordering of speech codecs.	2021-08-25 17:00:06 +03:00
Juho Hämäläinen	4208b6d9ea	[bluetooth] Be less pedantic about ordering of speech codecs. Fixes JB#55276 HFP spec 1.7.1 (4.34.1) says: The Codec ID for the mandatory narrow band codec (CVSD) shall always be included. If wide band speech is supported, then the mandatory codec (mSBC) shall be included unless it is temporarily unavailable. Any other optional wide band speech codecs may also be included in this list as long as the mandatory codec is included first. --- The wording in spec is slightly vague on what the ordering of mandatory narrow band codec (CVSD) and - IF wide band speech is supported - mandatory wide band coded (mSBC) should be. oFono's take is that the mandatory narrow band codec should be listed first, and when mSBC is there oFono will abort the connection. To fix this we can be less pedantic about the ordering of codecs - as long as the mandatory ones are there.	2021-08-25 16:32:55 +03:00
Frajo	59e304d474	Merge pull request #2 from krnlyng/jb55233 [packaging] Use transfiletriggerin to restart ofono when a plugin is installed. JB#55233	2021-08-25 16:02:24 +03:00
Frajo Haider	30a2424507	[packaging] Use transfiletriggerin to restart ofono when a plugin is installed. JB#55233	2021-08-24 13:29:18 +03:00
Slava Monich	e4f3ec6322	Merge pull request #1 from monich/start_block Fix SIM I/O mess	2021-07-30 15:12:59 +03:00
Slava Monich	95fd4efc37	[simfs] Fix SIM I/O mess. JB#54380 Apparently all simfs reads from any blocks other than the very first one were badly broken and could even cause a crash :\|	2021-07-30 01:50:07 +03:00