[RFC PATCH 1/5] simfs: retrieve only EF-info without EF-contents

[RFC PATCH 1/5] simfs: retrieve only EF-info without EF-contents

[Petteri Tikander]

[-- Attachment #1: Type: text/plain, Size: 4106 bytes --]

---
 include/sim.h |    5 ++++
 src/simfs.c   |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/simfs.h   |    4 +++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/include/sim.h b/include/sim.h
index 7860e24..15e1ea0 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -102,6 +102,11 @@ typedef void (*ofono_sim_file_read_cb_t)(int ok, int total_length, int record,
 					const unsigned char *data,
 					int record_length, void *userdata);
 
+typedef void (*ofono_sim_fs_read_info_cb_t)(int ok,
+					unsigned char file_status,
+					int total_length,
+					int record_length, void *userdata);
+
 typedef void (*ofono_sim_file_write_cb_t)(int ok, void *userdata);
 
 typedef void (*ofono_sim_passwd_cb_t)(const struct ofono_error *error,
diff --git a/src/simfs.c b/src/simfs.c
index feca74f..7ff8c09 100644
--- a/src/simfs.c
+++ b/src/simfs.c
@@ -61,6 +61,7 @@ struct sim_fs_op {
 	unsigned char *buffer;
 	enum ofono_sim_file_structure structure;
 	unsigned short offset;
+	gboolean info_only;
 	int num_bytes;
 	int length;
 	int record_length;
@@ -482,11 +483,30 @@ static void sim_fs_op_info_cb(const struct ofono_error *error, int length,
 
 		op->record_length = length;
 		op->current = op->offset / 256;
-		fs->op_source = g_idle_add(sim_fs_op_read_block, fs);
+
+		if (!op->info_only)
+			fs->op_source = g_idle_add(sim_fs_op_read_block, fs);
 	} else {
 		op->record_length = record_length;
 		op->current = 1;
-		fs->op_source = g_idle_add(sim_fs_op_read_record, fs);
+
+		if (!op->info_only)
+			fs->op_source = g_idle_add(sim_fs_op_read_record, fs);
+	}
+
+	if (op->info_only) {
+		/*
+		 * It's info-only request. So there is no need to request
+		 * actual contents of the EF-files. Just return the EF-info.
+		 */
+		ofono_sim_fs_read_info_cb_t cb = op->cb;
+
+		cb(1, file_status, op->length,
+			 op->record_length, op->userdata);
+
+		sim_fs_end_current(fs);
+
+		return;
 	}
 
 	if (imsi == NULL || phase == OFONO_SIM_PHASE_UNKNOWN || cache == FALSE)
@@ -531,7 +551,7 @@ static gboolean sim_fs_op_check_cached(struct sim_fs *fs)
 	enum ofono_sim_file_structure structure;
 	int record_length;
 
-	if (!imsi)
+	if (!imsi || !op->info_only)
 		return FALSE;
 
 	path = g_strdup_printf(SIM_CACHE_PATH, imsi, phase, op->id);
@@ -642,6 +662,43 @@ static gboolean sim_fs_op_next(gpointer user_data)
 	return FALSE;
 }
 
+int sim_fs_read_info(struct sim_fs *fs, int id,
+		enum ofono_sim_file_structure expected_type,
+		ofono_sim_fs_read_info_cb_t cb, void *data)
+{
+	struct sim_fs_op *op;
+
+	if (!cb)
+		return -1;
+
+	if (!fs->driver)
+		return -1;
+
+	if (!fs->driver->read_file_info)
+		return -1;
+
+	if (!fs->op_q)
+		fs->op_q = g_queue_new();
+
+	op = g_new0(struct sim_fs_op, 1);
+
+	op->id = id;
+	op->structure = expected_type;
+	op->cb = cb;
+	op->userdata = data;
+	op->is_read = TRUE;
+	op->offset = 0;
+	op->num_bytes = 0;
+	op->info_only = TRUE;
+
+	g_queue_push_tail(fs->op_q, op);
+
+	if (g_queue_get_length(fs->op_q) == 1)
+		fs->op_source = g_idle_add(sim_fs_op_next, fs);
+
+	return 0;
+}
+
 int sim_fs_read(struct sim_fs *fs, int id,
 		enum ofono_sim_file_structure expected_type,
 		unsigned short offset, unsigned short num_bytes,
@@ -670,6 +727,7 @@ int sim_fs_read(struct sim_fs *fs, int id,
 	op->is_read = TRUE;
 	op->offset = offset;
 	op->num_bytes = num_bytes;
+	op->info_only = FALSE;
 
 	g_queue_push_tail(fs->op_q, op);
 
diff --git a/src/simfs.h b/src/simfs.h
index c0b4c51..f7851df 100644
--- a/src/simfs.h
+++ b/src/simfs.h
@@ -29,6 +29,10 @@ int sim_fs_read(struct sim_fs *fs, int id,
 		unsigned short offset, unsigned short num_bytes,
 		ofono_sim_file_read_cb_t cb, void *data);
 
+int sim_fs_read_info(struct sim_fs *fs, int id,
+		enum ofono_sim_file_structure expected_type,
+		ofono_sim_fs_read_info_cb_t cb, void *data);
+
 void sim_fs_check_version(struct sim_fs *fs);
 
 int sim_fs_write(struct sim_fs *fs, int id, ofono_sim_file_write_cb_t cb,
-- 
1.6.3.3

[RFC PATCH 2/5] sim: add function for retrieving only EF-info

[Petteri Tikander]

[-- Attachment #1: Type: text/plain, Size: 754 bytes --]

---
 src/sim.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/sim.c b/src/sim.c
index d87c71f..fe34188 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -1241,6 +1241,16 @@ static void sim_retrieve_imsi(struct ofono_sim *sim)
 	sim->driver->read_imsi(sim, sim_imsi_cb, sim);
 }
 
+int ofono_sim_read_info(struct ofono_sim *sim, int id,
+			enum ofono_sim_file_structure expected_type,
+			ofono_sim_fs_read_info_cb_t cb, void *data)
+{
+	if (sim == NULL)
+		return -1;
+
+	return sim_fs_read_info(sim->simfs, id, expected_type, cb, data);
+}
+
 static void sim_efsst_read_cb(int ok, int length, int record,
 				const unsigned char *data,
 				int record_length, void *userdata)
-- 
1.6.3.3

[RFC PATCH 3/5] sim: check if Fixed Dial is enabled in SIM-card

[Petteri Tikander]

[-- Attachment #1: Type: text/plain, Size: 3803 bytes --]

If SIM-card is inserted, status is checked from EFsst
(is FDN activated) and EFadn (is ADN invalidated).
If USIM-card is inserted, status is checked from EFest
(is FDN activated).

If FD is enabled, halt SIM initialization procedure.
New property (FixedDialing) is added. If FD is enabled,
this has been signalled via DBUS.
---
 src/sim.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/src/sim.c b/src/sim.c
index fe34188..ef2a237 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -72,6 +72,7 @@ struct ofono_sim {
 	unsigned char efest_length;
 	unsigned char *efsst;
 	unsigned char efsst_length;
+	gboolean fixed_dialing;
 
 	char *imsi;
 
@@ -310,6 +311,9 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
 		ofono_dbus_dict_append(&dict, "SubscriberIdentity",
 					DBUS_TYPE_STRING, &sim->imsi);
 
+	ofono_dbus_dict_append(&dict, "FixedDialing", DBUS_TYPE_BOOLEAN,
+				&sim->fixed_dialing);
+
 	if (sim->mnc_length) {
 		char mcc[OFONO_MAX_MCC_LENGTH + 1];
 		char mnc[OFONO_MAX_MNC_LENGTH + 1];
@@ -1241,6 +1245,33 @@ static void sim_retrieve_imsi(struct ofono_sim *sim)
 	sim->driver->read_imsi(sim, sim_imsi_cb, sim);
 }
 
+static void sim_efadn_info_read_cb(int ok, unsigned char file_status,
+					int total_length, int record_length,
+					void *userdata)
+{
+	struct ofono_sim *sim = userdata;
+
+	if (!ok)
+		goto out;
+
+	if (file_status != SIM_FILE_STATUS_VALID) {
+		DBusConnection *conn = ofono_dbus_get_connection();
+		const char *path = __ofono_atom_get_path(sim->atom);
+
+		sim->fixed_dialing = TRUE;
+
+		ofono_dbus_signal_property_changed(conn, path,
+					OFONO_SIM_MANAGER_INTERFACE,
+					"FixedDialing",
+					DBUS_TYPE_BOOLEAN,
+					&sim->fixed_dialing);
+		return;
+	}
+
+out:
+	sim_retrieve_imsi(sim);
+}
+
 int ofono_sim_read_info(struct ofono_sim *sim, int id,
 			enum ofono_sim_file_structure expected_type,
 			ofono_sim_fs_read_info_cb_t cb, void *data)
@@ -1268,6 +1299,21 @@ static void sim_efsst_read_cb(int ok, int length, int record,
 	sim->efsst = g_memdup(data, length);
 	sim->efsst_length = length;
 
+	/*
+	 * Check if Fixed Dialing is enabled in the SIM-card
+	 * (TS 11.11/TS 51.011, Section 11.5.1: FDN capability request).
+	 * If FDN is activated and ADN is invalidated,
+	 * don't continue initialization routine.
+	 */
+	if (sim_sst_is_active(sim->efsst, sim->efsst_length,
+				SIM_SST_SERVICE_FDN)) {
+
+		ofono_sim_read_info(sim, SIM_EFADN_FILEID,
+					OFONO_SIM_FILE_STRUCTURE_FIXED,
+					sim_efadn_info_read_cb, sim);
+		return;
+	}
+
 out:
 	sim_retrieve_imsi(sim);
 }
@@ -1289,6 +1335,26 @@ static void sim_efest_read_cb(int ok, int length, int record,
 	sim->efest = g_memdup(data, length);
 	sim->efest_length = length;
 
+	/*
+	 * Check if Fixed Dialing is enabled in the USIM-card
+	 * (TS 31.102, Section 5.3.2: FDN capability request).
+	 * If FDN is activated, don't continue initialization routine.
+	 */
+	if (sim_est_is_active(sim->efest, sim->efest_length,
+				SIM_EST_SERVICE_FDN)) {
+		DBusConnection *conn = ofono_dbus_get_connection();
+		const char *path = __ofono_atom_get_path(sim->atom);
+
+		sim->fixed_dialing = TRUE;
+
+		ofono_dbus_signal_property_changed(conn, path,
+						OFONO_SIM_MANAGER_INTERFACE,
+						"FixedDialing",
+						DBUS_TYPE_BOOLEAN,
+						&sim->fixed_dialing);
+		return;
+	}
+
 out:
 	sim_retrieve_imsi(sim);
 }
@@ -1867,6 +1933,8 @@ static void sim_free_state(struct ofono_sim *sim)
 
 	g_free(sim->iidf_image);
 	sim->iidf_image = NULL;
+
+	sim->fixed_dialing = FALSE;
 }
 
 void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
-- 
1.6.3.3

[RFC PATCH 4/5] modem: some debugs added for indicating modem state change

[Petteri Tikander]

[-- Attachment #1: Type: text/plain, Size: 711 bytes --]

---
 src/modem.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/modem.c b/src/modem.c
index 7a29edf..583b79f 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -330,6 +330,8 @@ static void flush_atoms(struct ofono_modem *modem, enum modem_state new_state)
 	GSList *prev;
 	GSList *tmp;
 
+	DBG("");
+
 	prev = NULL;
 	cur = modem->atoms;
 
@@ -367,6 +369,8 @@ static void modem_change_state(struct ofono_modem *modem,
 	enum modem_state old_state = modem->modem_state;
 	ofono_bool_t new_online = new_state == MODEM_STATE_ONLINE;
 
+	DBG("old state: %d, new state: %d", old_state, new_state);
+
 	if (old_state == new_state)
 		return;
 
-- 
1.6.3.3

[RFC PATCH 5/5] sim: check existence of imsi-code

[Petteri Tikander]

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]

For instance: when handling sim_get_properties
in PRE_SIM-state imsi is not received/stored.
---
 src/sim.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/sim.c b/src/sim.c
index ef2a237..a053759 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -314,7 +314,7 @@ static DBusMessage *sim_get_properties(DBusConnection *conn,
 	ofono_dbus_dict_append(&dict, "FixedDialing", DBUS_TYPE_BOOLEAN,
 				&sim->fixed_dialing);
 
-	if (sim->mnc_length) {
+	if (sim->mnc_length && sim->imsi) {
 		char mcc[OFONO_MAX_MCC_LENGTH + 1];
 		char mnc[OFONO_MAX_MNC_LENGTH + 1];
 		const char *str;
-- 
1.6.3.3

Re: [RFC PATCH 5/5] sim: check existence of imsi-code

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

Hi Petteri,

On 10/21/2010 09:58 AM, Petteri Tikander wrote:
> For instance: when handling sim_get_properties
> in PRE_SIM-state imsi is not received/stored.
> ---
>  src/sim.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Good catch!  Patch has been applied, thanks.

Regards,
-Denis

Re: [RFC PATCH 4/5] modem: some debugs added for indicating modem state change

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

Hi Petteri,

On 10/21/2010 09:58 AM, Petteri Tikander wrote:
> ---
>  src/modem.c |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [RFC PATCH 3/5] sim: check if Fixed Dial is enabled in SIM-card

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 968 bytes --]

Hi Petteri,

On 10/21/2010 09:58 AM, Petteri Tikander wrote:
> If SIM-card is inserted, status is checked from EFsst
> (is FDN activated) and EFadn (is ADN invalidated).
> If USIM-card is inserted, status is checked from EFest
> (is FDN activated).
> 
> If FD is enabled, halt SIM initialization procedure.
> New property (FixedDialing) is added. If FD is enabled,
> this has been signalled via DBUS.
> ---
>  src/sim.c |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 68 insertions(+), 0 deletions(-)
> 

Patch has been applied, but I made some style fixes afterwards.  Please
make sure that I haven't broken anything.  I tested this briefly with
phonesim and everything was working as expected, so I went ahead and
marked this task as done on the TODO list.

Can you test this on both 3G and 2G enabled FDN sims and report back if
everything is working as expected on real hardware?

Regards,
-Denis

Re: [RFC PATCH 2/5] sim: add function for retrieving only EF-info

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Hi Petteri,

On 10/21/2010 09:58 AM, Petteri Tikander wrote:
> ---
>  src/sim.c |   10 ++++++++++
>  1 files changed, 10 insertions(+), 0 deletions(-)
> 

I squashed this patch completely, there's no need to introduce public
API for this functionality at this time.

Regards,
-Denis

Re: [RFC PATCH 1/5] simfs: retrieve only EF-info without EF-contents

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

Hi Petteri,

On 10/21/2010 09:58 AM, Petteri Tikander wrote:
> ---
>  include/sim.h |    5 ++++
>  src/simfs.c   |   64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>  src/simfs.h   |    4 +++
>  3 files changed, 70 insertions(+), 3 deletions(-)

I applied this patch but did some evil amending, see my comments below:

> 
> diff --git a/include/sim.h b/include/sim.h
> index 7860e24..15e1ea0 100644
> --- a/include/sim.h
> +++ b/include/sim.h
> @@ -102,6 +102,11 @@ typedef void (*ofono_sim_file_read_cb_t)(int ok, int total_length, int record,
>  					const unsigned char *data,
>  					int record_length, void *userdata);
>  
> +typedef void (*ofono_sim_fs_read_info_cb_t)(int ok,
> +					unsigned char file_status,
> +					int total_length,
> +					int record_length, void *userdata);
> +

I actually wanted this completely out of the public API and limited to
simfs.h.  The reason is that only sim.c will be accessing this one, so
no need to expose it to the rest of the system.

> -	if (!imsi)
> +	if (!imsi || !op->info_only)

This introduced a bug with the caching which I had to fix separately.

Regards,
-Denis