---
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
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
