6:29 a.m.
Hi,
Following set of patch adds the emergency number list update from
the network/modem. Upon emergency number list update from modem, ofono
core will be updated which will result in dbus property change signal
as well. With this patch, even if the emergency number list maintained
in ofono matches with the received emergency number list from modem,
dbus property change will be signalled. If this should be avoided,
then it needs to be decided whether the check should be added in core
or for each modem.
Regards,
Jeevaka
Jeevaka Badrappan (4):
include: Add ofono_voicecall_en_list_notify api
voicecall: refactor emergency number list handling
voicecall: network emergency number list support
ifxmodem: emergency number list support
drivers/ifxmodem/voicecall.c | 99 +++++++++++++++++++++++++++++
include/voicecall.h | 3 +
src/voicecall.c | 142 ++++++++++++++++++++++--------------------
3 files changed, 177 insertions(+), 67 deletions(-)
6:29 a.m.
New subject: [PATCH v3 1/4] include: Add ofono_voicecall_en_list_notify api
---
include/voicecall.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/include/voicecall.h b/include/voicecall.h
index 5e6da02..73eee26 100644
--- a/include/voicecall.h
+++ b/include/voicecall.h
@@ -140,6 +140,9 @@ struct ofono_voicecall_driver {
ofono_voicecall_cb_t cb, void *data);
};
+void ofono_voicecall_en_list_notify(struct ofono_voicecall *vc,
+ char **nw_en_list);
+
void ofono_voicecall_notify(struct ofono_voicecall *vc,
const struct ofono_call *call);
void ofono_voicecall_disconnected(struct ofono_voicecall *vc, int id,
--
1.7.0.4
6:29 a.m.
New subject: [PATCH v3 2/4] voicecall: refactor emergency number list handling
---
src/voicecall.c | 135 ++++++++++++++++++++++++++++---------------------------
1 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index b1d5586..d7d8424 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -46,8 +46,9 @@ struct ofono_voicecall {
GSList *call_list;
GSList *release_list;
GSList *multiparty_list;
- GSList *en_list; /* emergency number list */
- GSList *new_en_list; /* Emergency numbers being read from SIM */
+ GHashTable *en_list; /* emergency number list */
+ GSList *sim_en_list; /* Emergency numbers being read from SIM */
+ char **new_en_list; /* Emergency numbers from modem/network/NO SIM */
DBusMessage *pending;
struct ofono_sim *sim;
struct ofono_sim_context *sim_context;
@@ -130,11 +131,12 @@ static gint call_compare(gconstpointer a, gconstpointer b)
return 0;
}
-static void add_to_en_list(GSList **l, const char **list)
+static void add_to_en_list(struct ofono_voicecall *vc, char **list)
{
int i = 0;
+
while (list[i])
- *l = g_slist_prepend(*l, g_strdup(list[i++]));
+ g_hash_table_insert(vc->en_list, g_strdup(list[i++]), NULL);
}
static const char *disconnect_reason_to_string(enum ofono_disconnect_reason r)
@@ -331,12 +333,6 @@ static void tone_request_finish(struct ofono_voicecall *vc,
g_free(entry);
}
-static gint number_compare(gconstpointer a, gconstpointer b)
-{
- const char *s1 = a, *s2 = b;
- return strcmp(s1, s2);
-}
-
static gboolean voicecall_is_emergency(struct voicecall *v)
{
struct ofono_call *call = v->call;
@@ -344,8 +340,8 @@ static gboolean voicecall_is_emergency(struct voicecall *v)
lineid_str = phone_number_to_string(&call->phone_number);
- return g_slist_find_custom(v->vc->en_list, lineid_str,
- number_compare) ? TRUE : FALSE;
+ return g_hash_table_lookup_extended(v->vc->en_list, lineid_str,
+ NULL, NULL);
}
static void append_voicecall_properties(struct voicecall *v,
@@ -1124,9 +1120,10 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
- int i;
- GSList *l;
+ int i = 0;
char **list;
+ GHashTableIter ht_iter;
+ gpointer key, value;
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
@@ -1139,10 +1136,12 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
&dict);
/* property EmergencyNumbers */
- list = g_new0(char *, g_slist_length(vc->en_list) + 1);
+ list = g_new0(char *, g_hash_table_size(vc->en_list) + 1);
+
+ g_hash_table_iter_init(&ht_iter, vc->en_list);
- for (i = 0, l = vc->en_list; l; l = l->next, i++)
- list[i] = g_strdup(l->data);
+ while (g_hash_table_iter_next(&ht_iter, &key, &value))
+ list[i++] = g_strdup(key);
ofono_dbus_dict_append_array(&dict, "EmergencyNumbers",
DBUS_TYPE_STRING, &list);
@@ -2054,12 +2053,16 @@ static void emit_en_list_changed(struct ofono_voicecall *vc)
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(vc->atom);
char **list;
- GSList *l;
- int i;
+ int i = 0;
+ GHashTableIter iter;
+ gpointer key, value;
- list = g_new0(char *, g_slist_length(vc->en_list) + 1);
- for (i = 0, l = vc->en_list; l; l = l->next, i++)
- list[i] = g_strdup(l->data);
+ list = g_new0(char *, g_hash_table_size(vc->en_list) + 1);
+
+ g_hash_table_iter_init (&iter, vc->en_list);
+
+ while (g_hash_table_iter_next(&iter, &key, &value))
+ list[i++] = g_strdup(key);
ofono_dbus_signal_array_property_changed(conn, path,
OFONO_VOICECALL_MANAGER_INTERFACE,
@@ -2070,30 +2073,25 @@ static void emit_en_list_changed(struct ofono_voicecall *vc)
static void set_new_ecc(struct ofono_voicecall *vc)
{
- int i = 0;
+ GSList *l;
- g_slist_foreach(vc->en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->en_list);
- vc->en_list = NULL;
+ g_hash_table_destroy(vc->en_list);
- vc->en_list = vc->new_en_list;
- vc->new_en_list = NULL;
+ vc->en_list = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
- while (default_en_list[i]) {
- GSList *l;
+ if (vc->new_en_list)
+ add_to_en_list(vc, vc->new_en_list);
- for (l = vc->en_list; l; l = l->next)
- if (!strcmp(l->data, default_en_list[i]))
- break;
+ vc->new_en_list = NULL;
- if (l == NULL)
- vc->en_list = g_slist_prepend(vc->en_list,
- g_strdup(default_en_list[i]));
+ /* Emergency numbers read from SIM */
+ for (l = vc->sim_en_list; l; l = l->next)
+ g_hash_table_insert(vc->en_list, g_strdup(l->data), NULL);
- i++;
- }
+ /* Default emergency numbers */
+ add_to_en_list(vc, (char **) default_en_list);
- vc->en_list = g_slist_reverse(vc->en_list);
emit_en_list_changed(vc);
}
@@ -2120,10 +2118,11 @@ static void ecc_g2_read_cb(int ok, int total_length, int record,
data += 3;
if (en[0] != '\0')
- vc->new_en_list = g_slist_prepend(vc->new_en_list,
+ vc->sim_en_list = g_slist_prepend(vc->sim_en_list,
g_strdup(en));
}
+ vc->sim_en_list = g_slist_reverse(vc->sim_en_list);
set_new_ecc(vc);
}
@@ -2149,16 +2148,17 @@ static void ecc_g3_read_cb(int ok, int total_length, int record,
extract_bcd_number(data, 3, en);
if (en[0] != '\0')
- vc->new_en_list = g_slist_prepend(vc->new_en_list,
+ vc->sim_en_list = g_slist_prepend(vc->sim_en_list,
g_strdup(en));
if (record != total)
return;
check:
- if (!ok && vc->new_en_list == NULL)
+ if (!ok && vc->sim_en_list == NULL)
return;
+ vc->sim_en_list = g_slist_reverse(vc->sim_en_list);
set_new_ecc(vc);
}
@@ -2189,11 +2189,27 @@ static void voicecall_unregister(struct ofono_atom *atom)
const char *path = __ofono_atom_get_path(atom);
GSList *l;
+ if (vc->sim_state_watch) {
+ ofono_sim_remove_state_watch(vc->sim, vc->sim_state_watch);
+ vc->sim_state_watch = 0;
+ }
+
if (vc->sim_watch) {
__ofono_modem_remove_atom_watch(modem, vc->sim_watch);
vc->sim_watch = 0;
}
+ vc->sim = NULL;
+
+ if (vc->sim_en_list) {
+ g_slist_foreach(vc->sim_en_list, (GFunc) g_free, NULL);
+ g_slist_free(vc->sim_en_list);
+ vc->sim_en_list = NULL;
+ }
+
+ g_hash_table_destroy(vc->en_list);
+ vc->en_list = NULL;
+
if (vc->dial_req)
dial_request_finish(vc);
@@ -2219,24 +2235,6 @@ static void voicecall_remove(struct ofono_atom *atom)
if (vc->driver && vc->driver->remove)
vc->driver->remove(vc);
- if (vc->en_list) {
- g_slist_foreach(vc->en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->en_list);
- vc->en_list = NULL;
- }
-
- if (vc->new_en_list) {
- g_slist_foreach(vc->new_en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->new_en_list);
- vc->new_en_list = NULL;
- }
-
- if (vc->sim_state_watch) {
- ofono_sim_remove_state_watch(vc->sim, vc->sim_state_watch);
- vc->sim_state_watch = 0;
- vc->sim = NULL;
- }
-
if (vc->tone_source) {
g_source_remove(vc->tone_source);
vc->tone_source = 0;
@@ -2330,13 +2328,13 @@ static void sim_state_watch(enum ofono_sim_state new_state, void
*user)
* Free the currently being read EN list, just in case the
* SIM is removed when we're still reading them
*/
- if (vc->new_en_list) {
- g_slist_foreach(vc->new_en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->new_en_list);
- vc->new_en_list = NULL;
+ if (vc->sim_en_list) {
+ g_slist_foreach(vc->sim_en_list, (GFunc) g_free, NULL);
+ g_slist_free(vc->sim_en_list);
+ vc->sim_en_list = NULL;
}
- add_to_en_list(&vc->new_en_list, default_en_list_no_sim);
+ vc->new_en_list = (char **) default_en_list_no_sim;
set_new_ecc(vc);
default:
break;
@@ -2382,12 +2380,15 @@ void ofono_voicecall_register(struct ofono_voicecall *vc)
ofono_modem_add_interface(modem, OFONO_VOICECALL_MANAGER_INTERFACE);
+ vc->en_list = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+
/*
* Start out with the 22.101 mandated numbers, if we have a SIM and
* the SIM contains EFecc, then we update the list once we've read them
*/
- add_to_en_list(&vc->en_list, default_en_list_no_sim);
- add_to_en_list(&vc->en_list, default_en_list);
+ add_to_en_list(vc, (char **) default_en_list_no_sim);
+ add_to_en_list(vc, (char **) default_en_list);
vc->sim_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_SIM,
--
1.7.0.4
6:29 a.m.
New subject: [PATCH v3 3/4] voicecall: network emergency number list support
---
src/voicecall.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index d7d8424..42ff6dc 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2162,6 +2162,13 @@ check:
set_new_ecc(vc);
}
+void ofono_voicecall_en_list_notify(struct ofono_voicecall *vc,
+ char **nw_en_list)
+{
+ vc->new_en_list = nw_en_list;
+ set_new_ecc(vc);
+}
+
int ofono_voicecall_driver_register(const struct ofono_voicecall_driver *d)
{
DBG("driver: %p, name: %s", d, d->name);
--
1.7.0.4
6:29 a.m.
New subject: [PATCH v3 4/4] ifxmodem: emergency number list support
---
drivers/ifxmodem/voicecall.c | 99 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
index 87a48e6..0841165 100644
--- a/drivers/ifxmodem/voicecall.c
+++ b/drivers/ifxmodem/voicecall.c
@@ -42,11 +42,13 @@
#include "ifxmodem.h"
static const char *none_prefix[] = { NULL };
+static const char *xlema_prefix[] = { "+XLEMA:", NULL };
struct voicecall_data {
GSList *calls;
unsigned int local_release;
GAtChat *chat;
+ char **en_list;
};
struct release_id_req {
@@ -786,6 +788,93 @@ static void xcolp_notify(GAtResult *result, gpointer user_data)
ofono_voicecall_notify(vc, call);
}
+static void xlema_notify(GAtResult *result, gpointer user_data)
+{
+ struct ofono_voicecall *vc = user_data;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ GAtResultIter iter;
+ int index, total_cnt;
+ const char *number;
+ int count = g_strv_length(vd->en_list);
+
+ g_at_result_iter_init(&iter, result);
+
+ if (!g_at_result_iter_next(&iter, "+XLEMA:"))
+ return;
+
+ if (!g_at_result_iter_next_number(&iter, &index))
+ return;
+
+ if (!g_at_result_iter_next_number(&iter, &total_cnt))
+ return;
+
+ if (!g_at_result_iter_next_string(&iter, &number))
+ return;
+
+ /* Skip the category, valid in simpresent and mcc fields */
+
+ if (vd->en_list == NULL)
+ vd->en_list = g_new0(char *, total_cnt + 1);
+
+ vd->en_list[count] = g_strdup(number);
+
+ if (index != total_cnt)
+ return;
+
+ ofono_voicecall_en_list_notify(vc, vd->en_list);
+
+ g_strfreev(vd->en_list);
+ vd->en_list = NULL;
+}
+
+static void xlema_read(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_voicecall *vc = user_data;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ GAtResultIter iter;
+ int num = 0;
+ int index, total_cnt;
+ const char *number;
+
+ if (!ok) {
+ DBG("Emergency number list read failed");
+ return;
+ }
+
+ g_at_result_iter_init(&iter, result);
+
+ while (g_at_result_iter_next(&iter, "+XLEMA:"))
+ num += 1;
+
+ vd->en_list = g_new0(char *, num + 1);
+
+ num = 0;
+ g_at_result_iter_init(&iter, result);
+
+ while (g_at_result_iter_next(&iter, "+XLEMA:")) {
+ if (!g_at_result_iter_next_number(&iter, &index))
+ continue;
+
+ if (!g_at_result_iter_next_number(&iter, &total_cnt))
+ continue;
+
+ if (!g_at_result_iter_next_string(&iter, &number))
+ continue;
+
+ /* Skip the category, valid in simpresent and mcc fields */
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+ g_at_result_iter_skip_next(&iter);
+
+ vd->en_list[num++] = g_strdup(number);
+ }
+
+ ofono_voicecall_en_list_notify(vc, vd->en_list);
+
+ g_strfreev(vd->en_list);
+ vd->en_list = NULL;
+}
+
static void ifx_voicecall_initialized(gboolean ok, GAtResult *result,
gpointer user_data)
{
@@ -803,7 +892,15 @@ static void ifx_voicecall_initialized(gboolean ok, GAtResult
*result,
FALSE, vc, NULL);
g_at_chat_register(vd->chat, "+XCOLP:", xcolp_notify, FALSE, vc, NULL);
+ g_at_chat_register(vd->chat, "+XLEMA:", xlema_notify, FALSE, vc, NULL);
+
+ /* Enable emergency number list notification */
+ g_at_chat_send(vd->chat, "AT+XLEMA=1", none_prefix, NULL, NULL, NULL);
+
ofono_voicecall_register(vc);
+
+ g_at_chat_send(vd->chat, "AT+XLEMA?", xlema_prefix, xlema_read, vc,
+ NULL);
}
static int ifx_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
@@ -840,6 +937,8 @@ static void ifx_voicecall_remove(struct ofono_voicecall *vc)
g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
g_slist_free(vd->calls);
+ g_strfreev(vd->en_list);
+
ofono_voicecall_set_data(vc, NULL);
g_at_chat_unref(vd->chat);
--
1.7.0.4
7:16 a.m.
New subject: [PATCH v3 4/4] ifxmodem: emergency number list support
Hi Jeevaka,
+ /* Enable emergency number list notification */
+ g_at_chat_send(vd->chat, "AT+XLEMA=1", none_prefix, NULL, NULL, NULL);
+
ofono_voicecall_register(vc);
+
+ g_at_chat_send(vd->chat, "AT+XLEMA?", xlema_prefix, xlema_read, vc,
+ NULL);
do you really need the XLEMA? read command? If this works like the other
commands (like XCALLSTAT) that enable notifications, then with sending
AT+XLEMA=1 it should send out unsolicited +XLEMA: notifications and no
extra read command is needed.
Regards
Marcel
11:48 a.m.
New subject: [PATCH v3 2/4] voicecall: refactor emergency number list handling
---
src/voicecall.c | 135 ++++++++++++++++++++++++++++---------------------------
1 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 3e8fa46..60b8db5 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -46,8 +46,9 @@ struct ofono_voicecall {
GSList *call_list;
GSList *release_list;
GSList *multiparty_list;
- GSList *en_list; /* emergency number list */
- GSList *new_en_list; /* Emergency numbers being read from SIM */
+ GHashTable *en_list; /* emergency number list */
+ GSList *sim_en_list; /* Emergency numbers being read from SIM */
+ char **new_en_list; /* Emergency numbers from modem/network/NO SIM */
DBusMessage *pending;
struct ofono_sim *sim;
struct ofono_sim_context *sim_context;
@@ -130,11 +131,12 @@ static gint call_compare(gconstpointer a, gconstpointer b)
return 0;
}
-static void add_to_en_list(GSList **l, const char **list)
+static void add_to_en_list(struct ofono_voicecall *vc, char **list)
{
int i = 0;
+
while (list[i])
- *l = g_slist_prepend(*l, g_strdup(list[i++]));
+ g_hash_table_insert(vc->en_list, g_strdup(list[i++]), NULL);
}
static const char *disconnect_reason_to_string(enum ofono_disconnect_reason r)
@@ -331,12 +333,6 @@ static void tone_request_finish(struct ofono_voicecall *vc,
g_free(entry);
}
-static gint number_compare(gconstpointer a, gconstpointer b)
-{
- const char *s1 = a, *s2 = b;
- return strcmp(s1, s2);
-}
-
static gboolean voicecall_is_emergency(struct voicecall *v)
{
struct ofono_call *call = v->call;
@@ -344,8 +340,8 @@ static gboolean voicecall_is_emergency(struct voicecall *v)
lineid_str = phone_number_to_string(&call->phone_number);
- return g_slist_find_custom(v->vc->en_list, lineid_str,
- number_compare) ? TRUE : FALSE;
+ return g_hash_table_lookup_extended(v->vc->en_list, lineid_str,
+ NULL, NULL);
}
static void append_voicecall_properties(struct voicecall *v,
@@ -1124,9 +1120,10 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
DBusMessage *reply;
DBusMessageIter iter;
DBusMessageIter dict;
- int i;
- GSList *l;
+ int i = 0;
char **list;
+ GHashTableIter ht_iter;
+ gpointer key, value;
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
@@ -1139,10 +1136,12 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
&dict);
/* property EmergencyNumbers */
- list = g_new0(char *, g_slist_length(vc->en_list) + 1);
+ list = g_new0(char *, g_hash_table_size(vc->en_list) + 1);
+
+ g_hash_table_iter_init(&ht_iter, vc->en_list);
- for (i = 0, l = vc->en_list; l; l = l->next, i++)
- list[i] = g_strdup(l->data);
+ while (g_hash_table_iter_next(&ht_iter, &key, &value))
+ list[i++] = g_strdup(key);
ofono_dbus_dict_append_array(&dict, "EmergencyNumbers",
DBUS_TYPE_STRING, &list);
@@ -2054,12 +2053,16 @@ static void emit_en_list_changed(struct ofono_voicecall *vc)
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(vc->atom);
char **list;
- GSList *l;
- int i;
+ int i = 0;
+ GHashTableIter iter;
+ gpointer key, value;
- list = g_new0(char *, g_slist_length(vc->en_list) + 1);
- for (i = 0, l = vc->en_list; l; l = l->next, i++)
- list[i] = g_strdup(l->data);
+ list = g_new0(char *, g_hash_table_size(vc->en_list) + 1);
+
+ g_hash_table_iter_init(&iter, vc->en_list);
+
+ while (g_hash_table_iter_next(&iter, &key, &value))
+ list[i++] = g_strdup(key);
ofono_dbus_signal_array_property_changed(conn, path,
OFONO_VOICECALL_MANAGER_INTERFACE,
@@ -2070,30 +2073,25 @@ static void emit_en_list_changed(struct ofono_voicecall *vc)
static void set_new_ecc(struct ofono_voicecall *vc)
{
- int i = 0;
+ GSList *l;
- g_slist_foreach(vc->en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->en_list);
- vc->en_list = NULL;
+ g_hash_table_destroy(vc->en_list);
- vc->en_list = vc->new_en_list;
- vc->new_en_list = NULL;
+ vc->en_list = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
- while (default_en_list[i]) {
- GSList *l;
+ if (vc->new_en_list)
+ add_to_en_list(vc, vc->new_en_list);
- for (l = vc->en_list; l; l = l->next)
- if (!strcmp(l->data, default_en_list[i]))
- break;
+ vc->new_en_list = NULL;
- if (l == NULL)
- vc->en_list = g_slist_prepend(vc->en_list,
- g_strdup(default_en_list[i]));
+ /* Emergency numbers read from SIM */
+ for (l = vc->sim_en_list; l; l = l->next)
+ g_hash_table_insert(vc->en_list, g_strdup(l->data), NULL);
- i++;
- }
+ /* Default emergency numbers */
+ add_to_en_list(vc, (char **) default_en_list);
- vc->en_list = g_slist_reverse(vc->en_list);
emit_en_list_changed(vc);
}
@@ -2120,10 +2118,11 @@ static void ecc_g2_read_cb(int ok, int total_length, int record,
data += 3;
if (en[0] != '\0')
- vc->new_en_list = g_slist_prepend(vc->new_en_list,
+ vc->sim_en_list = g_slist_prepend(vc->sim_en_list,
g_strdup(en));
}
+ vc->sim_en_list = g_slist_reverse(vc->sim_en_list);
set_new_ecc(vc);
}
@@ -2149,16 +2148,17 @@ static void ecc_g3_read_cb(int ok, int total_length, int record,
extract_bcd_number(data, 3, en);
if (en[0] != '\0')
- vc->new_en_list = g_slist_prepend(vc->new_en_list,
+ vc->sim_en_list = g_slist_prepend(vc->sim_en_list,
g_strdup(en));
if (record != total)
return;
check:
- if (!ok && vc->new_en_list == NULL)
+ if (!ok && vc->sim_en_list == NULL)
return;
+ vc->sim_en_list = g_slist_reverse(vc->sim_en_list);
set_new_ecc(vc);
}
@@ -2189,11 +2189,27 @@ static void voicecall_unregister(struct ofono_atom *atom)
const char *path = __ofono_atom_get_path(atom);
GSList *l;
+ if (vc->sim_state_watch) {
+ ofono_sim_remove_state_watch(vc->sim, vc->sim_state_watch);
+ vc->sim_state_watch = 0;
+ }
+
if (vc->sim_watch) {
__ofono_modem_remove_atom_watch(modem, vc->sim_watch);
vc->sim_watch = 0;
}
+ vc->sim = NULL;
+
+ if (vc->sim_en_list) {
+ g_slist_foreach(vc->sim_en_list, (GFunc) g_free, NULL);
+ g_slist_free(vc->sim_en_list);
+ vc->sim_en_list = NULL;
+ }
+
+ g_hash_table_destroy(vc->en_list);
+ vc->en_list = NULL;
+
if (vc->dial_req)
dial_request_finish(vc);
@@ -2220,24 +2236,6 @@ static void voicecall_remove(struct ofono_atom *atom)
if (vc->driver && vc->driver->remove)
vc->driver->remove(vc);
- if (vc->en_list) {
- g_slist_foreach(vc->en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->en_list);
- vc->en_list = NULL;
- }
-
- if (vc->new_en_list) {
- g_slist_foreach(vc->new_en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->new_en_list);
- vc->new_en_list = NULL;
- }
-
- if (vc->sim_state_watch) {
- ofono_sim_remove_state_watch(vc->sim, vc->sim_state_watch);
- vc->sim_state_watch = 0;
- vc->sim = NULL;
- }
-
if (vc->tone_source) {
g_source_remove(vc->tone_source);
vc->tone_source = 0;
@@ -2331,13 +2329,13 @@ static void sim_state_watch(enum ofono_sim_state new_state, void
*user)
* Free the currently being read EN list, just in case the
* SIM is removed when we're still reading them
*/
- if (vc->new_en_list) {
- g_slist_foreach(vc->new_en_list, (GFunc) g_free, NULL);
- g_slist_free(vc->new_en_list);
- vc->new_en_list = NULL;
+ if (vc->sim_en_list) {
+ g_slist_foreach(vc->sim_en_list, (GFunc) g_free, NULL);
+ g_slist_free(vc->sim_en_list);
+ vc->sim_en_list = NULL;
}
- add_to_en_list(&vc->new_en_list, default_en_list_no_sim);
+ vc->new_en_list = (char **) default_en_list_no_sim;
set_new_ecc(vc);
default:
break;
@@ -2382,12 +2380,15 @@ void ofono_voicecall_register(struct ofono_voicecall *vc)
ofono_modem_add_interface(modem, OFONO_VOICECALL_MANAGER_INTERFACE);
+ vc->en_list = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+
/*
* Start out with the 22.101 mandated numbers, if we have a SIM and
* the SIM contains EFecc, then we update the list once we've read them
*/
- add_to_en_list(&vc->en_list, default_en_list_no_sim);
- add_to_en_list(&vc->en_list, default_en_list);
+ add_to_en_list(vc, (char **) default_en_list_no_sim);
+ add_to_en_list(vc, (char **) default_en_list);
vc->sim_watch = __ofono_modem_add_atom_watch(modem,
OFONO_ATOM_TYPE_SIM,
--
1.7.0.4
4145
days inactive
4146
days old
6 comments
2 participants
participants (2)
-
Jeevaka Badrappan -
Marcel Holtmann