Hi Philippe, On 12/06/2017 09:35 AM, Philippe De Swert wrote: This patch really needs to be broken up into 4. See HACKING, 'Submitting patches'. It doesn't look like you actually implementing the CLIR modifier in the driver? E.g. the 'I' or 'i' suffix business. I think last time I played with this half the AG implementations didn't support the CLIR parameter anyway. Regards, -Denis

Add a new function to be able to dial numbers from memory/favourites. --- include/voicecall.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/voicecall.h b/include/voicecall.h index 79a64bb4..6c4f3f5f 100644 --- a/include/voicecall.h +++ b/include/voicecall.h @@ -61,6 +61,11 @@ struct ofono_voicecall_driver { const struct ofono_phone_number *number, enum ofono_clir_option clir, ofono_voicecall_cb_t cb, void *data); + /* dials a number at a given memory location */ + void (*dial_memory)(struct ofono_voicecall *vc, + long int memory_location, + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data); /* Dials the last number again, this handles the hfp profile last number * dialing with the +BLDN AT command */ -- 2.11.0

Fix an error message from dbus about the path supplied not being valid. Related to commit f58e7685b0078df470300b99cd89fb9b3c45d1c0 ofonod[19107]: src/voicecall.c:voicecall_dial_shortcut() check position ofonod[19107]: src/voicecall.c:synthesize_outgoing_call() Registering new call: 1 process 19107: arguments to dbus_message_iter_append_basic() were incorrect, assertion "_dbus_check_is_valid_path (*string_p)" failed in file ../../../dbus/dbus-message.c line 2759. This is normally a bug in some application using the D-Bus library. --- src/voicecall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/voicecall.c b/src/voicecall.c index 67384cf2..ed6ea83f 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -28,6 +28,7 @@ #include <time.h> #include <errno.h> #include <stdint.h> +#include <stdlib.h> #include <glib.h> #include <gdbus.h> @@ -1592,6 +1593,7 @@ static void manager_dial_shortcut_callback(const struct ofono_error *error, if (!v) goto error; + path = voicecall_build_path(vc, v->call); reply = dbus_message_new_method_return(vc->pending); dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); -- 2.11.0

Now we can also dial favourites/quick contacts over bluetooth. --- src/voicecall.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/src/voicecall.c b/src/voicecall.c index ed6ea83f..f35047f8 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1607,10 +1607,11 @@ error: __ofono_error_failed(vc->pending)); } -static int voicecall_dial_shortcut(struct ofono_voicecall *vc, enum ofono_clir_option clir, - ofono_voicecall_cb_t cb, void *data) +static int voicecall_dial_shortcut(struct ofono_voicecall *vc, const char *position, + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, void *data) { struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom); + long int memory_position; if (g_slist_length(vc->call_list) >= MAX_VOICE_CALLS) return -EPERM; @@ -1618,9 +1619,6 @@ static int voicecall_dial_shortcut(struct ofono_voicecall *vc, enum ofono_clir_o if (ofono_modem_get_online(modem) == FALSE) return -ENETDOWN; - if (vc->driver->dial_last == NULL) - return -ENOTSUP; - if (voicecalls_have_incoming(vc)) return -EBUSY; @@ -1631,7 +1629,19 @@ static int voicecall_dial_shortcut(struct ofono_voicecall *vc, enum ofono_clir_o if (voicecalls_have_active(vc) && voicecalls_have_held(vc)) return -EBUSY; - vc->driver->dial_last(vc, clir, cb, vc); + /* when position is not given we dial the last called number */ + if(position == NULL) { + if (vc->driver->dial_last == NULL) + return -ENOTSUP; + + vc->driver->dial_last(vc, clir, cb, vc); + } else { + memory_position = strtol(position, NULL, 10); + if(vc->driver->dial_memory == NULL ) + return -ENOTSUP; + + vc->driver->dial_memory(vc, memory_position, clir, cb, vc); + } return 0; } @@ -1656,7 +1666,7 @@ static DBusMessage *manager_dial_last(DBusConnection *conn, vc->pending = dbus_message_ref(msg); - err = voicecall_dial_shortcut(vc, clir, manager_dial_shortcut_callback, vc); + err = voicecall_dial_shortcut(vc, NULL, clir, manager_dial_shortcut_callback, vc); if (err >= 0) return NULL; @@ -1678,6 +1688,50 @@ static DBusMessage *manager_dial_last(DBusConnection *conn, return __ofono_error_failed(msg); } +static DBusMessage *manager_dial_memory(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_voicecall *vc = data; + const char *memory_location; + const char *clirstr; + enum ofono_clir_option clir; + int err; + + if (vc->pending || vc->dial_req || vc->pending_em) + return __ofono_error_busy(msg); + + if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &memory_location, + DBUS_TYPE_STRING, &clirstr, + DBUS_TYPE_INVALID) == FALSE) + return __ofono_error_invalid_args(msg); + + if (clir_string_to_clir(clirstr, &clir) == FALSE) + return __ofono_error_invalid_format(msg); + + vc->pending = dbus_message_ref(msg); + + err = voicecall_dial_shortcut(vc, memory_location, clir, manager_dial_shortcut_callback, vc); + + if (err >= 0) + return NULL; + + vc->pending = NULL; + dbus_message_unref(msg); + + switch (err) { + case -EINVAL: + return __ofono_error_invalid_format(msg); + + case -ENETDOWN: + return __ofono_error_not_available(msg); + + case -ENOTSUP: + return __ofono_error_not_implemented(msg); + } + + return __ofono_error_failed(msg); +} + static DBusMessage *manager_transfer(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -2236,6 +2290,10 @@ static const GDBusMethodTable manager_methods[] = { manager_dial) }, { GDBUS_ASYNC_METHOD("DialLast", GDBUS_ARGS({ "hide_callerid", "s" }), NULL, manager_dial_last)}, + { GDBUS_ASYNC_METHOD("DialMemory", + GDBUS_ARGS({ "memory_location", "s" },{ "hide_callerid", "s" }), + NULL, + manager_dial_memory) }, { GDBUS_ASYNC_METHOD("Transfer", NULL, NULL, manager_transfer) }, { GDBUS_ASYNC_METHOD("SwapCalls", NULL, NULL, manager_swap_calls) }, { GDBUS_ASYNC_METHOD("ReleaseAndAnswer", NULL, NULL, -- 2.11.0

Handle the request to dial from a memory index and send the correct ATD> sequence --- drivers/hfpmodem/voicecall.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index a32a3242..7d198af0 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -422,6 +422,31 @@ static void hfp_dial_last(struct ofono_voicecall *vc, enum ofono_clir_option cli CALLBACK_WITH_FAILURE(cb, data); } + +static void hfp_dial_memory(struct ofono_voicecall *vc, + long int memory_location, + enum ofono_clir_option clir, ofono_voicecall_cb_t cb, + void *data) +{ + struct voicecall_data *vd = ofono_voicecall_get_data(vc); + struct cb_data *cbd = cb_data_new(cb, data); + char buf[256]; + + cbd->user = vc; + DBG("Calling memory location %ld\n", memory_location); + snprintf(buf, sizeof(buf), "ATD>%ld", memory_location); + + strcat(buf, ";"); + + if (g_at_chat_send(vd->chat, buf, none_prefix, + atd_cb, cbd, g_free) > 0) + return; + + g_free(cbd); + DBG("at_chat_failed"); + CALLBACK_WITH_FAILURE(cb, data); +} + static void hfp_template(const char *cmd, struct ofono_voicecall *vc, GAtResultFunc result_cb, unsigned int affected_types, ofono_voicecall_cb_t cb, void *data) @@ -1287,6 +1312,7 @@ static struct ofono_voicecall_driver driver = { .remove = hfp_voicecall_remove, .dial = hfp_dial, .dial_last = hfp_dial_last, + .dial_memory = hfp_dial_memory, .answer = hfp_answer, .hangup_active = hfp_hangup, .hold_all_active = hfp_hold_all_active, -- 2.11.0