* [PATCH 1/4] [qmimodem][voicecall] Implement call dialing
@ 2024-03-25 22:16 Adam Pigg
2024-03-25 22:17 ` [PATCH 2/4] [qmimodem][voicecall] Implement call answer Adam Pigg
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Adam Pigg @ 2024-03-25 22:16 UTC (permalink / raw)
To: ofono; +Cc: Adam Pigg
Add voicecall dialling to the qmimodem driver
Includes required infratructure and setup of the QMI services
---
drivers/qmimodem/voice.h | 51 ++++
drivers/qmimodem/voicecall.c | 506 ++++++++++++++++++++++++++++++++++-
2 files changed, 555 insertions(+), 2 deletions(-)
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
index 917e72f7..1a584f10 100644
--- a/drivers/qmimodem/voice.h
+++ b/drivers/qmimodem/voice.h
@@ -15,6 +15,8 @@
*
*/
+#include <stdint.h>
+
#define QMI_VOICE_PARAM_USS_DATA 0x01
#define QMI_VOICE_PARAM_ASYNC_USSD_ERROR 0x10
@@ -25,6 +27,9 @@
#define QMI_VOICE_PARAM_USSD_IND_DATA 0x10
#define QMI_VOICE_PARAM_USSD_IND_UCS2 0x11
+#define QMI_VOICE_IND_ALL_STATUS 0x2e
+#define QMI_VOICE_GET_ALL_STATUS 0x2f
+
/* according to GSM TS 23.038 section 5
* coding group 1111, No message class, 8 bit data
*/
@@ -48,6 +53,7 @@ enum qmi_ussd_user_required {
/* QMI service voice. Using an enum to prevent doublicated entries */
enum voice_commands {
+ QMI_VOICE_DIAL_CALL = 0x20,
QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
QMI_VOICE_SET_SUPS_SERVICE = 0x33,
QMI_VOICE_GET_CALL_WAITING = 0x34,
@@ -66,6 +72,50 @@ enum voice_commands {
QMI_VOICE_GET_CNAP = 0x4d
};
+enum qmi_voice_call_state {
+ QMI_VOICE_CALL_STATE_IDLE = 0x0,
+ QMI_VOICE_CALL_STATE_ORIG,
+ QMI_VOICE_CALL_STATE_INCOMING,
+ QMI_VOICE_CALL_STATE_CONV,
+ QMI_VOICE_CALL_STATE_CC_IN_PROG,
+ QMI_VOICE_CALL_STATE_ALERTING,
+ QMI_VOICE_CALL_STATE_HOLD,
+ QMI_VOICE_CALL_STATE_WAITING,
+ QMI_VOICE_CALL_STATE_DISCONNECTING,
+ QMI_VOICE_CALL_STATE_END,
+ QMI_VOICE_CALL_STATE_SETUP
+};
+
+enum qmi_voice_call_dial_param {
+ QMI_VOICE_DIAL_CALL_NUMBER = 0x01,
+ QMI_VOICE_DIAL_CALL_TYPE = 0x10
+};
+
+enum qmi_voice_call_dial_return {
+ QMI_VOICE_DIAL_RETURN_CALL_ID = 0x10
+};
+
+enum qmi_voice_all_call_status_commands {
+ QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION = 0x01,
+ QMI_VOICE_ALL_CALL_STATUS_REMOTE_NUMBER = 0x10
+};
+
+enum qmi_voice_all_call_info_commands {
+ QMI_VOICE_ALL_CALL_INFO_CALL_INFORMATION = 0x10,
+ QMI_VOICE_ALL_CALL_INFO_REMOTE_NUMBER = 0x11
+};
+
+enum qmi_voice_call_type {
+ QMI_VOICE_CALL_TYPE_VOICE = 0x0,
+ QMI_VOICE_CALL_TYPE_VOICE_FORCE,
+};
+
+enum parse_error {
+ NONE = 0,
+ MISSING_MANDATORY = 1,
+ INVALID_LENGTH = 2,
+};
+
struct qmi_ussd_data {
uint8_t dcs;
uint8_t length;
@@ -98,3 +148,4 @@ enum qmi_ss_reason {
QMI_VOICE_SS_RSN_CLIP = 0x10,
QMI_VOICE_SS_RSN_CLIR = 0x11
};
+
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index 059edbae..ba5ed9e4 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2011-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2024 Adam Pigg <adam@piggz.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -26,6 +27,10 @@
#include <ofono/log.h>
#include <ofono/modem.h>
#include <ofono/voicecall.h>
+#include <src/common.h>
+#include <ell/ell.h>
+
+#include "voice.h"
#include "qmi.h"
@@ -35,8 +40,499 @@ struct voicecall_data {
struct qmi_service *voice;
uint16_t major;
uint16_t minor;
+ struct l_queue *call_list;
+ struct voicecall_static *vs;
+ struct ofono_phone_number dialed;
+};
+
+struct qmi_voice_all_call_status_ind {
+ bool call_information_set;
+ const struct qmi_voice_call_information *call_information;
+ bool remote_party_number_set;
+ uint8_t remote_party_number_size;
+ const struct qmi_voice_remote_party_number_instance
+ *remote_party_number[16];
+};
+
+enum parse_error
+qmi_voice_call_status(struct qmi_result *qmi_result,
+ struct qmi_voice_all_call_status_ind *result);
+
+struct qmi_voice_call_information_instance {
+ uint8_t id;
+ uint8_t state;
+ uint8_t type;
+ uint8_t direction;
+ uint8_t mode;
+ uint8_t multipart_indicator;
+ uint8_t als;
+} __attribute__((__packed__));
+
+struct qmi_voice_call_information {
+ uint8_t size;
+ struct qmi_voice_call_information_instance instance[0];
+} __attribute__((__packed__));
+
+struct qmi_voice_remote_party_number_instance {
+ uint8_t call_id;
+ uint8_t presentation_indicator;
+ uint8_t number_size;
+ char number[0];
+} __attribute__((__packed__));
+
+struct qmi_voice_remote_party_number {
+ uint8_t size;
+ struct qmi_voice_remote_party_number_instance instance[0];
+} __attribute__((__packed__));
+
+struct qmi_voice_dial_call_arg {
+ bool calling_number_set;
+ const char *calling_number;
+ bool call_type_set;
+ uint8_t call_type;
+};
+
+struct qmi_voice_dial_call_result {
+ bool call_id_set;
+ uint8_t call_id;
};
+int ofono_call_compare(const void *a, const void *b, void *data)
+{
+ const struct ofono_call *ca = a;
+ const struct ofono_call *cb = b;
+
+ if (ca->id < cb->id)
+ return -1;
+
+ if (ca->id > cb->id)
+ return 1;
+
+ return 0;
+}
+
+bool ofono_call_compare_by_status(const void *a, const void *b)
+{
+ const struct ofono_call *call = a;
+ int status = L_PTR_TO_INT(b);
+
+ return status == call->status;
+}
+
+bool ofono_call_compare_by_id(const void *a, const void *b)
+{
+ const struct ofono_call *call = a;
+ unsigned int id = L_PTR_TO_UINT(b);
+
+ return (call->id == id);
+}
+
+void ofono_call_list_dial_callback(struct ofono_voicecall *vc,
+ struct l_queue **call_list,
+ const struct ofono_phone_number *ph,
+ int call_id)
+{
+ struct ofono_call *call;
+
+ /* check if call_id already present */
+ call = l_queue_find(*call_list, ofono_call_compare_by_id,
+ L_UINT_TO_PTR(call_id));
+
+ if (call) {
+ return;
+ }
+
+ call = l_new(struct ofono_call, 1);
+ call->id = call_id;
+
+ memcpy(&call->called_number, ph, sizeof(*ph));
+ call->direction = CALL_DIRECTION_MOBILE_ORIGINATED;
+ call->status = CALL_STATUS_DIALING;
+ call->type = 0; /* voice */
+
+ l_queue_insert(*call_list, call, ofono_call_compare, NULL);
+
+ ofono_voicecall_notify(vc, call);
+}
+
+void ofono_call_list_notify(struct ofono_voicecall *vc,
+ struct l_queue **call_list, struct l_queue *calls)
+{
+ struct l_queue *old_calls = *call_list;
+ struct l_queue *new_calls = calls;
+ struct ofono_call *new_call, *old_call;
+ const struct l_queue_entry *old_entry, *new_entry;
+
+ uint loop_length =
+ MAX(l_queue_length(old_calls), l_queue_length(new_calls));
+
+ old_entry = l_queue_get_entries(old_calls);
+ new_entry = l_queue_get_entries(new_calls);
+
+ for (uint i = 0; i < loop_length; ++i) {
+ old_call = old_entry ? old_entry->data : NULL;
+ new_call = new_entry ? new_entry->data : NULL;
+
+ if (new_call && new_call->status == CALL_STATUS_DISCONNECTED) {
+ ofono_voicecall_disconnected(
+ vc, new_call->id,
+ OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
+
+ l_queue_remove(calls, new_call);
+ l_free(new_call);
+ continue;
+ }
+
+ if (old_call &&
+ (new_call == NULL || (new_call->id > old_call->id))) {
+ ofono_voicecall_disconnected(
+ vc, old_call->id,
+ OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
+ } else if (new_call && (old_call == NULL ||
+ (new_call->id < old_call->id))) {
+ DBG("Notify new call %d", new_call->id);
+ /* new call, signal it */
+ if (new_call->type == 0) {
+ ofono_voicecall_notify(vc, new_call);
+ }
+ } else {
+ if (memcmp(new_call, old_call, sizeof(*new_call)) &&
+ new_call->type == 0)
+ ofono_voicecall_notify(vc, new_call);
+ }
+ if (old_entry)
+ old_entry = old_entry->next;
+ if (new_entry)
+ new_entry = new_entry->next;
+ }
+
+ l_queue_destroy(*call_list, l_free);
+ *call_list = calls;
+}
+
+#define _(X) \
+ case X: \
+ return #X
+
+const char *qmi_voice_call_state_name(enum qmi_voice_call_state value)
+{
+ switch (value) {
+ _(QMI_VOICE_CALL_STATE_IDLE);
+ _(QMI_VOICE_CALL_STATE_ORIG);
+ _(QMI_VOICE_CALL_STATE_INCOMING);
+ _(QMI_VOICE_CALL_STATE_CONV);
+ _(QMI_VOICE_CALL_STATE_CC_IN_PROG);
+ _(QMI_VOICE_CALL_STATE_ALERTING);
+ _(QMI_VOICE_CALL_STATE_HOLD);
+ _(QMI_VOICE_CALL_STATE_WAITING);
+ _(QMI_VOICE_CALL_STATE_DISCONNECTING);
+ _(QMI_VOICE_CALL_STATE_END);
+ _(QMI_VOICE_CALL_STATE_SETUP);
+ }
+ return "QMI_CALL_STATE_<UNKNOWN>";
+}
+
+int qmi_to_ofono_status(uint8_t status, int *ret)
+{
+ int err = 0;
+
+ switch (status) {
+ case QMI_VOICE_CALL_STATE_IDLE:
+ case QMI_VOICE_CALL_STATE_END:
+ case QMI_VOICE_CALL_STATE_DISCONNECTING:
+ *ret = CALL_STATUS_DISCONNECTED;
+ break;
+ case QMI_VOICE_CALL_STATE_HOLD:
+ *ret = CALL_STATUS_HELD;
+ break;
+ case QMI_VOICE_CALL_STATE_WAITING:
+ *ret = CALL_STATUS_WAITING;
+ break;
+ case QMI_VOICE_CALL_STATE_ORIG:
+ *ret = CALL_STATUS_DIALING;
+ break;
+ case QMI_VOICE_CALL_STATE_SETUP:
+ case QMI_VOICE_CALL_STATE_INCOMING:
+ *ret = CALL_STATUS_INCOMING;
+ break;
+ case QMI_VOICE_CALL_STATE_CONV:
+ *ret = CALL_STATUS_ACTIVE;
+ break;
+ case QMI_VOICE_CALL_STATE_CC_IN_PROG:
+ *ret = CALL_STATUS_DIALING;
+ break;
+ case QMI_VOICE_CALL_STATE_ALERTING:
+ *ret = CALL_STATUS_ALERTING;
+ break;
+ default:
+ err = 1;
+ }
+ return err;
+}
+
+uint8_t ofono_to_qmi_direction(enum call_direction ofono_direction)
+{
+ return ofono_direction + 1;
+}
+enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction)
+{
+ return qmi_direction - 1;
+}
+
+enum parse_error
+qmi_voice_call_status(struct qmi_result *qmi_result,
+ struct qmi_voice_all_call_status_ind *result)
+{
+ int err = NONE;
+ int offset;
+ uint16_t len;
+ bool status = true;
+ const struct qmi_voice_remote_party_number *remote_party_number;
+ const struct qmi_voice_call_information *call_information;
+
+ /* mandatory */
+ call_information = qmi_result_get(
+ qmi_result, QMI_VOICE_ALL_CALL_STATUS_CALL_INFORMATION, &len);
+
+ /* This is so ugly! but TLV for indicator and response is different */
+ if (!call_information) {
+ call_information = qmi_result_get(
+ qmi_result, QMI_VOICE_ALL_CALL_INFO_CALL_INFORMATION,
+ &len);
+ status = false;
+ }
+
+ if (call_information) {
+ /* verify the length */
+ if (len < sizeof(call_information->size))
+ return INVALID_LENGTH;
+
+ if (len != call_information->size *
+ sizeof(struct qmi_voice_call_information_instance) +
+ sizeof(call_information->size)) {
+ return INVALID_LENGTH;
+ }
+ result->call_information_set = 1;
+ result->call_information = call_information;
+ } else
+ return MISSING_MANDATORY;
+
+ /* mandatory */
+ remote_party_number = qmi_result_get(
+ qmi_result,
+ status ? QMI_VOICE_ALL_CALL_STATUS_REMOTE_NUMBER :
+ QMI_VOICE_ALL_CALL_INFO_REMOTE_NUMBER,
+ &len);
+
+ if (remote_party_number) {
+ const struct qmi_voice_remote_party_number_instance *instance;
+ int instance_size =
+ sizeof(struct qmi_voice_remote_party_number_instance);
+ int i;
+
+ /* verify the length */
+ if (len < sizeof(remote_party_number->size))
+ return INVALID_LENGTH;
+
+ for (i = 0, offset = sizeof(remote_party_number->size);
+ offset <= len && i < 16 && i < remote_party_number->size;
+ i++) {
+ if (offset == len) {
+ break;
+ } else if (offset + instance_size > len) {
+ return INVALID_LENGTH;
+ }
+
+ instance = (void *)remote_party_number + offset;
+ result->remote_party_number[i] = instance;
+ offset +=
+ sizeof(struct qmi_voice_remote_party_number_instance) +
+ instance->number_size;
+ }
+ result->remote_party_number_set = 1;
+ result->remote_party_number_size = remote_party_number->size;
+ } else
+ return MISSING_MANDATORY;
+
+ return err;
+}
+
+static void all_call_status_ind(struct qmi_result *result, void *user_data)
+{
+ struct ofono_voicecall *vc = user_data;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct l_queue *calls = NULL;
+ int i;
+ int size = 0;
+ struct qmi_voice_all_call_status_ind status_ind;
+
+ calls = l_queue_new();
+
+ DBG("");
+ if (qmi_voice_call_status(result, &status_ind) != NONE) {
+ DBG("Parsing of all call status indication failed");
+ return;
+ }
+
+ if (!status_ind.remote_party_number_set ||
+ !status_ind.call_information_set) {
+ DBG("Some required fields are not set");
+ return;
+ }
+
+ size = status_ind.call_information->size;
+ if (!size) {
+ DBG("No call informations received!");
+ return;
+ }
+
+ /* expect we have valid fields for every call */
+ if (size != status_ind.remote_party_number_size) {
+ DBG("Not all fields have the same size");
+ return;
+ }
+
+ for (i = 0; i < size; i++) {
+ struct qmi_voice_call_information_instance call_info;
+ struct ofono_call *call;
+ const struct qmi_voice_remote_party_number_instance
+ *remote_party = status_ind.remote_party_number[i];
+ int number_size;
+
+ call_info = status_ind.call_information->instance[i];
+ call = l_new(struct ofono_call, 1);
+ call->id = call_info.id;
+ call->direction = qmi_to_ofono_direction(call_info.direction);
+
+ if (qmi_to_ofono_status(call_info.state, &call->status)) {
+ DBG("Ignore call id %d, because can not convert QMI state 0x%x to ofono.",
+ call_info.id, call_info.state);
+ continue;
+ }
+ DBG("Call %d in state %s(%d)", call_info.id,
+ qmi_voice_call_state_name(call_info.state),
+ call_info.state);
+
+ call->type = 0; /* always voice */
+ number_size = remote_party->number_size;
+ if (number_size > OFONO_MAX_PHONE_NUMBER_LENGTH)
+ number_size = OFONO_MAX_PHONE_NUMBER_LENGTH;
+ strncpy(call->phone_number.number, remote_party->number,
+ number_size);
+ /* FIXME: set phone_number_type */
+
+ if (strlen(call->phone_number.number) > 0)
+ call->clip_validity = 0;
+ else
+ call->clip_validity = 2;
+
+ l_queue_push_tail(calls, call);
+ DBG("%d", l_queue_length(calls));
+ }
+
+ ofono_call_list_notify(vc, &vd->call_list, calls);
+}
+
+enum parse_error
+qmi_voice_dial_call_parse(struct qmi_result *qmi_result,
+ struct qmi_voice_dial_call_result *result)
+{
+ int err = NONE;
+
+ /* mandatory */
+ if (qmi_result_get_uint8(qmi_result, QMI_VOICE_DIAL_RETURN_CALL_ID,
+ &result->call_id))
+ result->call_id_set = 1;
+ else
+ err = MISSING_MANDATORY;
+
+ return err;
+}
+
+static void dial_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ struct ofono_voicecall *vc = cbd->user;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ ofono_voicecall_cb_t cb = cbd->cb;
+ uint16_t error;
+ struct qmi_voice_dial_call_result dial_result;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ if (qmi_voice_dial_call_parse(result, &dial_result) != NONE) {
+ DBG("Received invalid Result");
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ if (!dial_result.call_id_set) {
+ DBG("Didn't receive a call id");
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ DBG("New call QMI id %d", dial_result.call_id);
+ ofono_call_list_dial_callback(vc, &vd->call_list, &vd->dialed,
+ dial_result.call_id);
+
+ /* FIXME: create a timeout on this call_id */
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void dial(struct ofono_voicecall *vc,
+ const struct ofono_phone_number *ph,
+ 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);
+ struct qmi_voice_dial_call_arg arg;
+ struct qmi_param *param = NULL;
+
+ DBG("");
+
+ cbd->user = vc;
+ arg.calling_number_set = true;
+ arg.calling_number = phone_number_to_string(ph);
+ memcpy(&vd->dialed, ph, sizeof(*ph));
+
+ arg.call_type_set = true;
+ arg.call_type = QMI_VOICE_CALL_TYPE_VOICE;
+
+ param = qmi_param_new();
+ if (!param)
+ goto error;
+
+ if (arg.calling_number_set) {
+ if (!qmi_param_append(param, QMI_VOICE_DIAL_CALL_NUMBER,
+ strlen(arg.calling_number),
+ arg.calling_number)) {
+ goto error;
+ }
+ }
+
+ if (arg.call_type_set)
+ qmi_param_append_uint8(param, QMI_VOICE_DIAL_CALL_TYPE,
+ arg.call_type);
+
+ if (qmi_service_send(vd->voice, QMI_VOICE_DIAL_CALL, param, dial_cb,
+ cbd, l_free) > 0) {
+ return;
+ }
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ l_free(cbd);
+ l_free(param);
+}
+
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -58,6 +554,9 @@ static void create_voice_cb(struct qmi_service *service, void *user_data)
data->voice = qmi_service_ref(service);
+ qmi_service_register(data->voice, QMI_VOICE_IND_ALL_STATUS,
+ all_call_status_ind, vc, NULL);
+
ofono_voicecall_register(vc);
}
@@ -69,7 +568,8 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc,
DBG("");
- data = g_new0(struct voicecall_data, 1);
+ data = l_new(struct voicecall_data, 1);
+ data->call_list = l_queue_new();
ofono_voicecall_set_data(vc, data);
@@ -92,13 +592,15 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc)
qmi_service_unref(data->voice);
- g_free(data);
+ l_free(data);
}
static const struct ofono_voicecall_driver driver = {
.probe = qmi_voicecall_probe,
.remove = qmi_voicecall_remove,
+ .dial = dial,
};
OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
+
--
2.44.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/4] [qmimodem][voicecall] Implement call answer
2024-03-25 22:16 [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Adam Pigg
@ 2024-03-25 22:17 ` Adam Pigg
2024-03-25 22:17 ` [PATCH 3/4] [qmimodem][voicecall] Implement active call hangup Adam Pigg
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Adam Pigg @ 2024-03-25 22:17 UTC (permalink / raw)
To: ofono; +Cc: Adam Pigg
---
drivers/qmimodem/voice.h | 9 ++++
drivers/qmimodem/voicecall.c | 100 ++++++++++++++++++++++++++++++++++-
2 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
index 1a584f10..9c31297b 100644
--- a/drivers/qmimodem/voice.h
+++ b/drivers/qmimodem/voice.h
@@ -54,6 +54,7 @@ enum qmi_ussd_user_required {
/* QMI service voice. Using an enum to prevent doublicated entries */
enum voice_commands {
QMI_VOICE_DIAL_CALL = 0x20,
+ QMI_VOICE_ANSWER_CALL = 0x22,
QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
QMI_VOICE_SET_SUPS_SERVICE = 0x33,
QMI_VOICE_GET_CALL_WAITING = 0x34,
@@ -110,6 +111,14 @@ enum qmi_voice_call_type {
QMI_VOICE_CALL_TYPE_VOICE_FORCE,
};
+enum qmi_voice_call_answer_param {
+ QMI_VOICE_ANSWER_CALL_ID = 0x01,
+};
+
+enum qmi_voice_call_answer_return {
+ QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10,
+};
+
enum parse_error {
NONE = 0,
MISSING_MANDATORY = 1,
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index ba5ed9e4..7c6bc113 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -97,6 +97,16 @@ struct qmi_voice_dial_call_result {
uint8_t call_id;
};
+struct qmi_voice_answer_call_arg {
+ bool call_id_set;
+ uint8_t call_id;
+};
+
+struct qmi_voice_answer_call_result {
+ bool call_id_set;
+ uint8_t call_id;
+};
+
int ofono_call_compare(const void *a, const void *b, void *data)
{
const struct ofono_call *ca = a;
@@ -533,6 +543,94 @@ error:
l_free(param);
}
+enum parse_error qmi_voice_answer_call_parse(
+ struct qmi_result *qmi_result,
+ struct qmi_voice_answer_call_result *result)
+{
+ int err = NONE;
+
+ /* optional */
+ if (qmi_result_get_uint8(qmi_result, QMI_VOICE_ANSWER_RETURN_CALL_ID, &result->call_id))
+ result->call_id_set = 1;
+
+ return err;
+}
+
+static void answer_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_voicecall_cb_t cb = cbd->cb;
+ uint16_t error;
+ struct qmi_voice_answer_call_result answer_result;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ /* TODO: what happens when calling it with no active call or wrong caller id? */
+ if (qmi_voice_answer_call_parse(result, &answer_result) != NONE) {
+ DBG("Received invalid Result");
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void answer(struct ofono_voicecall *vc, 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);
+ struct qmi_voice_answer_call_arg arg;
+ struct ofono_call *call;
+ struct qmi_param *param = NULL;
+
+ DBG("");
+
+ cbd->user = vc;
+
+ call = l_queue_find(vd->call_list,
+ ofono_call_compare_by_status,
+ L_UINT_TO_PTR(CALL_STATUS_INCOMING));
+
+ if (call == NULL) {
+ DBG("Can not find a call to answer");
+ goto error;
+ }
+
+ arg.call_id_set = true;
+ arg.call_id = call->id;
+
+ param = qmi_param_new();
+ if (!param)
+ goto error;
+
+ if (arg.call_id_set) {
+ if (!qmi_param_append_uint8(
+ param,
+ QMI_VOICE_ANSWER_CALL_ID,
+ arg.call_id))
+ goto error;
+ }
+
+ if (qmi_service_send(vd->voice,
+ QMI_VOICE_ANSWER_CALL,
+ param,
+ answer_cb,
+ cbd,
+ l_free) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ l_free(cbd);
+ l_free(param);
+}
+
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -577,7 +675,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc,
create_voice_cb, vc, NULL);
return 0;
-
}
static void qmi_voicecall_remove(struct ofono_voicecall *vc)
@@ -599,6 +696,7 @@ static const struct ofono_voicecall_driver driver = {
.probe = qmi_voicecall_probe,
.remove = qmi_voicecall_remove,
.dial = dial,
+ .answer = answer,
};
OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
--
2.44.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/4] [qmimodem][voicecall] Implement active call hangup
2024-03-25 22:16 [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Adam Pigg
2024-03-25 22:17 ` [PATCH 2/4] [qmimodem][voicecall] Implement call answer Adam Pigg
@ 2024-03-25 22:17 ` Adam Pigg
2024-03-25 22:17 ` [PATCH 4/4] [qmimodem][voicecall] Implement DTMF tones Adam Pigg
2024-03-25 23:05 ` [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Denis Kenzior
3 siblings, 0 replies; 10+ messages in thread
From: Adam Pigg @ 2024-03-25 22:17 UTC (permalink / raw)
To: ofono; +Cc: Adam Pigg
---
drivers/qmimodem/voice.h | 9 +++
drivers/qmimodem/voicecall.c | 113 +++++++++++++++++++++++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
index 9c31297b..244a6f85 100644
--- a/drivers/qmimodem/voice.h
+++ b/drivers/qmimodem/voice.h
@@ -54,6 +54,7 @@ enum qmi_ussd_user_required {
/* QMI service voice. Using an enum to prevent doublicated entries */
enum voice_commands {
QMI_VOICE_DIAL_CALL = 0x20,
+ QMI_VOICE_END_CALL = 0x21,
QMI_VOICE_ANSWER_CALL = 0x22,
QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
QMI_VOICE_SET_SUPS_SERVICE = 0x33,
@@ -119,6 +120,14 @@ enum qmi_voice_call_answer_return {
QMI_VOICE_ANSWER_RETURN_CALL_ID = 0x10,
};
+enum qmi_voice_call_end_param {
+ QMI_VOICE_END_CALL_ID = 0x01,
+};
+
+enum qmi_voice_call_end_return {
+ QMI_VOICE_END_RETURN_CALL_ID = 0x10,
+};
+
enum parse_error {
NONE = 0,
MISSING_MANDATORY = 1,
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index 7c6bc113..4ef8adc1 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -107,6 +107,16 @@ struct qmi_voice_answer_call_result {
uint8_t call_id;
};
+struct qmi_voice_end_call_arg {
+ bool call_id_set;
+ uint8_t call_id;
+};
+
+struct qmi_voice_end_call_result {
+ bool call_id_set;
+ uint8_t call_id;
+};
+
int ofono_call_compare(const void *a, const void *b, void *data)
{
const struct ofono_call *ca = a;
@@ -631,6 +641,107 @@ error:
l_free(param);
}
+enum parse_error
+qmi_voice_end_call_parse(struct qmi_result *qmi_result,
+ struct qmi_voice_end_call_result *result)
+{
+ int err = NONE;
+
+ /* optional */
+ if (qmi_result_get_uint8(qmi_result, QMI_VOICE_END_RETURN_CALL_ID, &result->call_id))
+ result->call_id_set = 1;
+
+ return err;
+}
+
+static void end_call_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_voicecall_cb_t cb = cbd->cb;
+ uint16_t error;
+ struct qmi_voice_end_call_result end_result;
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ if (qmi_voice_end_call_parse(result, &end_result) != NONE) {
+ DBG("Received invalid Result");
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void release_specific(struct ofono_voicecall *vc, int id,
+ 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);
+ struct qmi_voice_end_call_arg arg;
+ struct qmi_param *param = NULL;
+
+ DBG("");
+ cbd->user = vc;
+
+ arg.call_id_set = true;
+ arg.call_id = id;
+
+ param = qmi_param_new();
+ if (!param)
+ goto error;
+
+ if (arg.call_id_set) {
+ if (!qmi_param_append_uint8(param, QMI_VOICE_END_CALL_ID, arg.call_id)) {
+ goto error;
+ }
+ }
+
+ if (qmi_service_send(vd->voice, QMI_VOICE_END_CALL, param, end_call_cb, cbd, l_free) >
+ 0) {
+ return;
+ }
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ l_free(cbd);
+ l_free(param);
+}
+
+static void hangup_active(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb,
+ void *data)
+{
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct ofono_call *call;
+ enum call_status active[] = {
+ CALL_STATUS_ACTIVE,
+ CALL_STATUS_DIALING,
+ CALL_STATUS_ALERTING,
+ CALL_STATUS_INCOMING,
+ };
+ int i;
+
+ DBG("");
+ for (i = 0; i < L_ARRAY_SIZE(active); i++) {
+ call = l_queue_find(vd->call_list, ofono_call_compare_by_status,
+ L_INT_TO_PTR(active[i]));
+
+ if (call)
+ break;
+ }
+
+ if (call == NULL) {
+ DBG("Can not find a call to hang up");
+ CALLBACK_WITH_FAILURE(cb, data);
+ return;
+ }
+
+ release_specific(vc, call->id, cb, data);
+}
+
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -697,6 +808,8 @@ static const struct ofono_voicecall_driver driver = {
.remove = qmi_voicecall_remove,
.dial = dial,
.answer = answer,
+ .hangup_active = hangup_active,
+ .release_specific = release_specific,
};
OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
--
2.44.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/4] [qmimodem][voicecall] Implement DTMF tones
2024-03-25 22:16 [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Adam Pigg
2024-03-25 22:17 ` [PATCH 2/4] [qmimodem][voicecall] Implement call answer Adam Pigg
2024-03-25 22:17 ` [PATCH 3/4] [qmimodem][voicecall] Implement active call hangup Adam Pigg
@ 2024-03-25 22:17 ` Adam Pigg
2024-03-25 23:05 ` [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Denis Kenzior
3 siblings, 0 replies; 10+ messages in thread
From: Adam Pigg @ 2024-03-25 22:17 UTC (permalink / raw)
To: ofono; +Cc: Adam Pigg
---
drivers/qmimodem/voice.h | 6 ++
drivers/qmimodem/voicecall.c | 154 +++++++++++++++++++++++++++++++++++
2 files changed, 160 insertions(+)
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
index 244a6f85..42b6b9b6 100644
--- a/drivers/qmimodem/voice.h
+++ b/drivers/qmimodem/voice.h
@@ -56,6 +56,8 @@ enum voice_commands {
QMI_VOICE_DIAL_CALL = 0x20,
QMI_VOICE_END_CALL = 0x21,
QMI_VOICE_ANSWER_CALL = 0x22,
+ QMI_VOICE_START_CONTINUOUS_DTMF = 0x29,
+ QMI_VOICE_STOP_CONTINUOUS_DTMF = 0x2A,
QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
QMI_VOICE_SET_SUPS_SERVICE = 0x33,
QMI_VOICE_GET_CALL_WAITING = 0x34,
@@ -128,6 +130,10 @@ enum qmi_voice_call_end_return {
QMI_VOICE_END_RETURN_CALL_ID = 0x10,
};
+enum qmi_voice_call_dtmf_param {
+ QMI_VOICE_DTMF_DATA = 0x01,
+};
+
enum parse_error {
NONE = 0,
MISSING_MANDATORY = 1,
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index 4ef8adc1..ab4bd655 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -117,6 +117,21 @@ struct qmi_voice_end_call_result {
uint8_t call_id;
};
+struct send_one_dtmf_cb_data {
+ const char *full_dtmf;
+ const char *next_dtmf;
+ struct ofono_voicecall *vc;
+};
+
+struct qmi_voice_start_cont_dtmf_arg {
+ uint8_t call_id;
+ uint8_t dtmf_char;
+};
+
+struct qmi_voice_stop_cont_dtmf_arg {
+ uint8_t call_id;
+};
+
int ofono_call_compare(const void *a, const void *b, void *data)
{
const struct ofono_call *ca = a;
@@ -742,6 +757,144 @@ static void hangup_active(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb,
release_specific(vc, call->id, cb, data);
}
+static void stop_cont_dtmf_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_voicecall_cb_t cb = cbd->cb;
+
+ uint16_t error;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void start_cont_dtmf_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_voicecall_cb_t cb = cbd->cb;
+ struct ofono_voicecall *vc = cbd->user;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct qmi_voice_stop_cont_dtmf_arg arg;
+ uint16_t error;
+ struct qmi_param *param = NULL;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ arg.call_id = 0xff;
+
+ param = qmi_param_new();
+ if (!param) {
+ goto error;
+ }
+
+ if (!qmi_param_append_uint8(param, QMI_VOICE_DTMF_DATA, arg.call_id)) {
+ goto error;
+ }
+
+ if (qmi_service_send(vd->voice, QMI_VOICE_STOP_CONTINUOUS_DTMF, param,
+ stop_cont_dtmf_cb, cbd, NULL) > 0) {
+ return;
+ }
+
+error:
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ l_free(param);
+}
+
+static void send_one_dtmf(struct ofono_voicecall *vc, const char dtmf,
+ ofono_voicecall_cb_t cb, void *data)
+{
+ struct qmi_voice_start_cont_dtmf_arg arg;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct qmi_param *param = NULL;
+ uint8_t param_body[2];
+ struct cb_data *cbd = cb_data_new(cb, data);
+
+ DBG("");
+
+ arg.call_id = 0xff;
+ arg.dtmf_char = (uint8_t)dtmf;
+
+ cbd->user = vc;
+
+ param = qmi_param_new();
+ if (!param)
+ goto error;
+
+ param_body[0] = arg.call_id;
+ param_body[1] = arg.dtmf_char;
+
+ if (!qmi_param_append(param, QMI_VOICE_DTMF_DATA, sizeof(param_body),
+ param_body)) {
+ goto error;
+ }
+
+ if (qmi_service_send(vd->voice, QMI_VOICE_START_CONTINUOUS_DTMF, param,
+ start_cont_dtmf_cb, cbd, NULL) > 0) {
+ return;
+ }
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ l_free(cbd);
+ l_free(param);
+}
+
+static void send_one_dtmf_cb(const struct ofono_error *error, void *data)
+{
+ struct cb_data *cbd = data;
+ ofono_voicecall_cb_t cb = cbd->cb;
+ struct send_one_dtmf_cb_data *send_one_dtmf_cb_data = cbd->user;
+
+ DBG("");
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR ||
+ *send_one_dtmf_cb_data->next_dtmf == 0) {
+ if (error->type == OFONO_ERROR_TYPE_NO_ERROR) {
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+ } else {
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ }
+ l_free((void *)send_one_dtmf_cb_data->full_dtmf);
+ l_free(send_one_dtmf_cb_data);
+ l_free(cbd);
+ } else {
+ send_one_dtmf(send_one_dtmf_cb_data->vc,
+ *(send_one_dtmf_cb_data->next_dtmf++),
+ send_one_dtmf_cb, data);
+ }
+}
+
+static void send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
+ ofono_voicecall_cb_t cb, void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ struct send_one_dtmf_cb_data *send_one_dtmf_cb_data =
+ l_new(struct send_one_dtmf_cb_data, 1);
+
+ DBG("");
+
+ send_one_dtmf_cb_data->full_dtmf = l_strdup(dtmf);
+ send_one_dtmf_cb_data->next_dtmf = &send_one_dtmf_cb_data->full_dtmf[1];
+ send_one_dtmf_cb_data->vc = vc;
+ cbd->user = send_one_dtmf_cb_data;
+
+ send_one_dtmf(vc, *dtmf, send_one_dtmf_cb, cbd);
+}
+
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -810,6 +963,7 @@ static const struct ofono_voicecall_driver driver = {
.answer = answer,
.hangup_active = hangup_active,
.release_specific = release_specific,
+ .send_tones = send_dtmf,
};
OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
--
2.44.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] [qmimodem][voicecall] Implement call dialing
2024-03-25 22:16 [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Adam Pigg
` (2 preceding siblings ...)
2024-03-25 22:17 ` [PATCH 4/4] [qmimodem][voicecall] Implement DTMF tones Adam Pigg
@ 2024-03-25 23:05 ` Denis Kenzior
2024-03-25 23:32 ` piggz1
3 siblings, 1 reply; 10+ messages in thread
From: Denis Kenzior @ 2024-03-25 23:05 UTC (permalink / raw)
To: Adam Pigg, ofono
Hi Adam,
On 3/25/24 17:16, Adam Pigg wrote:
> Add voicecall dialling to the qmimodem driver
> Includes required infratructure and setup of the QMI services
> ---
> drivers/qmimodem/voice.h | 51 ++++
> drivers/qmimodem/voicecall.c | 506 ++++++++++++++++++++++++++++++++++-
> 2 files changed, 555 insertions(+), 2 deletions(-)
>
Hmm, have you rebased on top of git HEAD?
CI seems unable to apply this series
Run git-pw series apply 838112
Failed to apply patch:
Applying: Implement call dialing
error: sha1 information is lacking or useless (drivers/qmimodem/voicecall.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Implement call dialing
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Also, I can't do it manually on my end due to:
[denkenz@archdev ofono]$ git pw series apply 838112
Failed to apply patch:
Applying: Implement call dialing
.git/rebase-apply/patch:92: new blank line at EOF.
+
.git/rebase-apply/patch:652: new blank line at EOF.
+
error: 2 lines add whitespace errors.
Regards,
-Denis
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] [qmimodem][voicecall] Implement call dialing
2024-03-25 23:05 ` [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Denis Kenzior
@ 2024-03-25 23:32 ` piggz1
0 siblings, 0 replies; 10+ messages in thread
From: piggz1 @ 2024-03-25 23:32 UTC (permalink / raw)
To: denkenz, adam, ofono
Ah ok, thanks, ill check this in the morning. It was against a branch from 2.5 which also contains the other changes i need for testing with sailfish. ill rebase it on HEAD and re-submit.
On Monday, 25 March 2024, Denis Kenzior wrote:
> Hi Adam,
>
> On 3/25/24 17:16, Adam Pigg wrote:
> > Add voicecall dialling to the qmimodem driver
> > Includes required infratructure and setup of the QMI services
> > ---
> > drivers/qmimodem/voice.h | 51 ++++
> > drivers/qmimodem/voicecall.c | 506 ++++++++++++++++++++++++++++++++++-
> > 2 files changed, 555 insertions(+), 2 deletions(-)
> >
>
> Hmm, have you rebased on top of git HEAD?
>
> CI seems unable to apply this series
>
> Run git-pw series apply 838112
> Failed to apply patch:
> Applying: Implement call dialing
> error: sha1 information is lacking or useless (drivers/qmimodem/voicecall.c).
> error: could not build fake ancestor
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Patch failed at 0001 Implement call dialing
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Also, I can't do it manually on my end due to:
>
> [denkenz@archdev ofono]$ git pw series apply 838112
> Failed to apply patch:
> Applying: Implement call dialing
> .git/rebase-apply/patch:92: new blank line at EOF.
> +
> .git/rebase-apply/patch:652: new blank line at EOF.
> +
> error: 2 lines add whitespace errors.
>
> Regards,
> -Denis
>
--
Sent from my Sailfish device
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] qmimodem: voicecall: Implement call dialing
2024-04-21 19:49 [PATCH 1/4] qmimodem: voicecall: " Adam Pigg
2024-04-21 20:06 ` Adam Pigg
2024-04-22 21:05 ` Denis Kenzior
@ 2024-04-22 21:10 ` patchwork-bot+ofono
2 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+ofono @ 2024-04-22 21:10 UTC (permalink / raw)
To: Adam Pigg; +Cc: ofono
Hello:
This series was applied to ofono.git (master)
by Denis Kenzior <denkenz@gmail.com>:
On Sun, 21 Apr 2024 20:49:03 +0100 you wrote:
> Add voicecall dialling to the qmimodem driver
> Includes required infrastructure and setup of the QMI services
>
> Call State Handling
> ===================
> On initialisation, register the all_call_status_ind callback to be
> called for QMI_VOICE_IND_ALL_STATUS. This will handle notification of
> call status to the rest of the system
>
> [...]
Here is the summary with links:
- [1/4] qmimodem: voicecall: Implement call dialing
(no matching commit)
- [2/4] qmimodem: voicecall: Implement call answer
https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=3680df684593
- [3/4] qmimodem: voicecall: Implement active call hangup
https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=752d286a5ce3
- [4/4] qmimodem: voicecall: Implement DTMF tones
(no matching commit)
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] qmimodem: voicecall: Implement call dialing
2024-04-21 19:49 [PATCH 1/4] qmimodem: voicecall: " Adam Pigg
2024-04-21 20:06 ` Adam Pigg
@ 2024-04-22 21:05 ` Denis Kenzior
2024-04-22 21:10 ` patchwork-bot+ofono
2 siblings, 0 replies; 10+ messages in thread
From: Denis Kenzior @ 2024-04-22 21:05 UTC (permalink / raw)
To: Adam Pigg, ofono
On 4/21/24 14:49, Adam Pigg wrote:
> Add voicecall dialling to the qmimodem driver
> Includes required infrastructure and setup of the QMI services
>
> Call State Handling
> ===================
> On initialisation, register the all_call_status_ind callback to be
> called for QMI_VOICE_IND_ALL_STATUS. This will handle notification of
> call status to the rest of the system
>
> Dial Handling
> =============
> The dial function sets up the parameters for the QMI_VOICE_DIAL_CALL
> service. The parameters are the number to be called and the call type,
> which is currently hard coded to be QMI_VOICE_CALL_TYPE_VOICE. The
> dial_cb callback will then be called and will receive the call-id.
>
> ---
> Changes in V4
> -merged qmi_voice_call_status and all_call_status_ind
> -several minor structure/formate changes
>
> Changes in V5
> -renames ofono_call_compare_by_id to ofono_call_match_by_id
> -updated new_entry pointer to fix use-after-free in
> ofono_call_list_notify
> -Renamed several constants
> -in all_call_status_ind removed error label/gotos after restructuring
> -When creating the call list, ensure an upper bound of 16
> -Fix out-of-mound-read on remote number due to QMI string not being null
> terminated
> ---
> ---
> drivers/qmimodem/voice.h | 17 ++
> drivers/qmimodem/voicecall.c | 426 ++++++++++++++++++++++++++++++++++-
> 2 files changed, 442 insertions(+), 1 deletion(-)
>
I had the following when this patch was applied:
[denkenz@archdev ofono]$ make
make --no-print-directory all-am
CC drivers/qmimodem/voicecall.o
vdrivers/qmimodem/voicecall.c: In function ‘all_call_status_ind’:
drivers/qmimodem/voicecall.c:348:9: error: ISO C90 forbids mixed declarations
and code [-Werror=declaration-after-statement]
348 | struct l_queue *calls = l_queue_new();
| ^~~~~~
drivers/qmimodem/voicecall.c:364:17: error: ISO C90 forbids mixed declarations
and code [-Werror=declaration-after-statement]
364 | char *tmp = l_strndup(remote_party->number, number_size);
| ^~~~
icc1: all warnings being treated as errors
I fixed this up manually to declare calls & tmp in the variable block to avoid
ISO C90 warning.
Patches 1-3 applied, thanks.
Regards,
-Denis
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] qmimodem: voicecall: Implement call dialing
2024-04-21 19:49 [PATCH 1/4] qmimodem: voicecall: " Adam Pigg
@ 2024-04-21 20:06 ` Adam Pigg
2024-04-22 21:05 ` Denis Kenzior
2024-04-22 21:10 ` patchwork-bot+ofono
2 siblings, 0 replies; 10+ messages in thread
From: Adam Pigg @ 2024-04-21 20:06 UTC (permalink / raw)
To: ofono
Apologies, i missed the -v5 flag
On Sunday 21 April 2024 20:49:03 BST you wrote:
> Add voicecall dialling to the qmimodem driver
> Includes required infrastructure and setup of the QMI services
>
> Call State Handling
> ===================
> On initialisation, register the all_call_status_ind callback to be
> called for QMI_VOICE_IND_ALL_STATUS. This will handle notification of
> call status to the rest of the system
>
> Dial Handling
> =============
> The dial function sets up the parameters for the QMI_VOICE_DIAL_CALL
> service. The parameters are the number to be called and the call type,
> which is currently hard coded to be QMI_VOICE_CALL_TYPE_VOICE. The
> dial_cb callback will then be called and will receive the call-id.
>
> ---
> Changes in V4
> -merged qmi_voice_call_status and all_call_status_ind
> -several minor structure/formate changes
>
> Changes in V5
> -renames ofono_call_compare_by_id to ofono_call_match_by_id
> -updated new_entry pointer to fix use-after-free in
> ofono_call_list_notify
> -Renamed several constants
> -in all_call_status_ind removed error label/gotos after restructuring
> -When creating the call list, ensure an upper bound of 16
> -Fix out-of-mound-read on remote number due to QMI string not being null
> terminated
> ---
> ---
> drivers/qmimodem/voice.h | 17 ++
> drivers/qmimodem/voicecall.c | 426 ++++++++++++++++++++++++++++++++++-
> 2 files changed, 442 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
> index 917e72f7..2344fd50 100644
> --- a/drivers/qmimodem/voice.h
> +++ b/drivers/qmimodem/voice.h
> @@ -48,6 +48,9 @@ enum qmi_ussd_user_required {
>
> /* QMI service voice. Using an enum to prevent doublicated entries */
> enum voice_commands {
> + QMI_VOICE_DIAL_CALL = 0x20,
> + QMI_VOICE_ALL_CALL_STATUS_IND = 0x2e,
> + QMI_VOICE_GET_ALL_CALL_INFO = 0x2f,
> QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
> QMI_VOICE_SET_SUPS_SERVICE = 0x33,
> QMI_VOICE_GET_CALL_WAITING = 0x34,
> @@ -66,6 +69,20 @@ enum voice_commands {
> QMI_VOICE_GET_CNAP = 0x4d
> };
>
> +enum qmi_voice_call_state {
> + QMI_VOICE_CALL_STATE_IDLE = 0x0,
> + QMI_VOICE_CALL_STATE_ORIG,
> + QMI_VOICE_CALL_STATE_INCOMING,
> + QMI_VOICE_CALL_STATE_CONV,
> + QMI_VOICE_CALL_STATE_CC_IN_PROG,
> + QMI_VOICE_CALL_STATE_ALERTING,
> + QMI_VOICE_CALL_STATE_HOLD,
> + QMI_VOICE_CALL_STATE_WAITING,
> + QMI_VOICE_CALL_STATE_DISCONNECTING,
> + QMI_VOICE_CALL_STATE_END,
> + QMI_VOICE_CALL_STATE_SETUP
> +};
> +
> struct qmi_ussd_data {
> uint8_t dcs;
> uint8_t length;
> diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
> index aa34fc25..7b4813c9 100644
> --- a/drivers/qmimodem/voicecall.c
> +++ b/drivers/qmimodem/voicecall.c
> @@ -3,6 +3,7 @@
> * oFono - Open Source Telephony
> *
> * Copyright (C) 2011-2012 Intel Corporation. All rights reserved.
> + * Copyright (C) 2024 Adam Pigg <adam@piggz.co.uk>
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License version 2 as
> @@ -26,6 +27,10 @@
> #include <ofono/log.h>
> #include <ofono/modem.h>
> #include <ofono/voicecall.h>
> +#include <src/common.h>
> +#include <ell/ell.h>
> +
> +#include "voice.h"
>
> #include "qmi.h"
>
> @@ -35,8 +40,422 @@ struct voicecall_data {
> struct qmi_service *voice;
> uint16_t major;
> uint16_t minor;
> + struct l_queue *call_list;
> + struct ofono_phone_number dialed;
> };
>
> +struct qmi_voice_call_information_instance {
> + uint8_t id;
> + uint8_t state;
> + uint8_t type;
> + uint8_t direction;
> + uint8_t mode;
> + uint8_t multipart_indicator;
> + uint8_t als;
> +} __attribute__((__packed__));
> +
> +struct qmi_voice_call_information {
> + uint8_t size;
> + struct qmi_voice_call_information_instance instance[0];
> +} __attribute__((__packed__));
> +
> +struct qmi_voice_remote_party_number_instance {
> + uint8_t call_id;
> + uint8_t presentation_indicator;
> + uint8_t number_size;
> + char number[0];
> +} __attribute__((__packed__));
> +
> +struct qmi_voice_remote_party_number {
> + uint8_t size;
> + struct qmi_voice_remote_party_number_instance instance[0];
> +} __attribute__((__packed__));
> +
> +static int ofono_call_compare(const void *a, const void *b, void *data)
> +{
> + const struct ofono_call *ca = a;
> + const struct ofono_call *cb = b;
> +
> + if (ca->id < cb->id)
> + return -1;
> +
> + if (ca->id > cb->id)
> + return 1;
> +
> + return 0;
> +}
> +
> +static bool ofono_call_match_by_id(const void *a, const void *b)
> +{
> + const struct ofono_call *call = a;
> + unsigned int id = L_PTR_TO_UINT(b);
> +
> + return (call->id == id);
> +}
> +
> +static void ofono_call_list_dial_callback(struct ofono_voicecall *vc,
> + int call_id)
> +{
> + struct ofono_call *call;
> + struct voicecall_data *vd = ofono_voicecall_get_data(vc);
> + struct l_queue *call_list = vd->call_list;
> + const struct ofono_phone_number *ph = &vd->dialed;
> +
> + /* check if call_id already present */
> + call = l_queue_find(call_list, ofono_call_match_by_id,
> + L_UINT_TO_PTR(call_id));
> +
> + if (call)
> + return;
> +
> + call = l_new(struct ofono_call, 1);
> + call->id = call_id;
> +
> + memcpy(&call->called_number, ph, sizeof(*ph));
> + call->direction = CALL_DIRECTION_MOBILE_ORIGINATED;
> + call->status = CALL_STATUS_DIALING;
> + call->type = 0; /* voice */
> +
> + l_queue_insert(call_list, call, ofono_call_compare, NULL);
> +
> + ofono_voicecall_notify(vc, call);
> +}
> +
> +static void ofono_call_list_notify(struct ofono_voicecall *vc,
> + struct l_queue *calls)
> +{
> + struct voicecall_data *vd = ofono_voicecall_get_data(vc);
> + struct l_queue *old_calls = vd->call_list;
> + struct l_queue *new_calls = calls;
> + struct ofono_call *new_call, *old_call;
> + const struct l_queue_entry *old_entry, *new_entry;
> + uint i;
> +
> + uint loop_length =
> + MAX(l_queue_length(old_calls),
l_queue_length(new_calls));
> +
> + old_entry = l_queue_get_entries(old_calls);
> + new_entry = l_queue_get_entries(new_calls);
> +
> + for (i = 0; i < loop_length; ++i) {
> + old_call = old_entry ? old_entry->data : NULL;
> + new_call = new_entry ? new_entry->data : NULL;
> +
> + if (new_call && new_call->status ==
CALL_STATUS_DISCONNECTED) {
> + ofono_voicecall_disconnected(
> + vc, new_call->id,
> +
OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
> + new_entry = new_entry->next;
> + l_queue_remove(calls, new_call);
> + l_free(new_call);
> + continue;
> + }
> +
> + if (old_call &&
> + (!new_call || (new_call->id >
old_call->id)))
> + ofono_voicecall_disconnected(
> + vc, old_call->id,
> +
OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
> + else if (new_call &&
> + (!old_call || (new_call->id <
old_call->id))) {
> + DBG("Notify new call %d", new_call->id);
> + /* new call, signal it */
> + if (new_call->type == 0)
> + ofono_voicecall_notify(vc,
new_call);
> + } else if (memcmp(new_call, old_call, sizeof(*new_call))
&&
> + new_call->type == 0)
> + ofono_voicecall_notify(vc, new_call);
> +
> + if (old_entry)
> + old_entry = old_entry->next;
> + if (new_entry)
> + new_entry = new_entry->next;
> + }
> +
> + l_queue_destroy(old_calls, l_free);
> + vd->call_list = calls;
> +}
> +
> +static const char *qmi_voice_call_state_name(enum qmi_voice_call_state
> value) +{
> + switch (value) {
> + case QMI_VOICE_CALL_STATE_IDLE:
> + return "QMI_VOICE_CALL_STATE_IDLE";
> + case QMI_VOICE_CALL_STATE_ORIG:
> + return "QMI_VOICE_CALL_STATE_ORIG";
> + case QMI_VOICE_CALL_STATE_INCOMING:
> + return "QMI_VOICE_CALL_STATE_INCOMING";
> + case QMI_VOICE_CALL_STATE_CONV:
> + return "QMI_VOICE_CALL_STATE_CONV";
> + case QMI_VOICE_CALL_STATE_CC_IN_PROG:
> + return "QMI_VOICE_CALL_STATE_CC_IN_PROG";
> + case QMI_VOICE_CALL_STATE_ALERTING:
> + return "QMI_VOICE_CALL_STATE_ALERTING";
> + case QMI_VOICE_CALL_STATE_HOLD:
> + return "QMI_VOICE_CALL_STATE_HOLD";
> + case QMI_VOICE_CALL_STATE_WAITING:
> + return "QMI_VOICE_CALL_STATE_WAITING";
> + case QMI_VOICE_CALL_STATE_DISCONNECTING:
> + return "QMI_VOICE_CALL_STATE_DISCONNECTING";
> + case QMI_VOICE_CALL_STATE_END:
> + return "QMI_VOICE_CALL_STATE_END";
> + case QMI_VOICE_CALL_STATE_SETUP:
> + return "QMI_VOICE_CALL_STATE_SETUP";
> + }
> + return "QMI_CALL_STATE_<UNKNOWN>";
> +}
> +
> +static bool qmi_to_ofono_status(uint8_t status, int *ret)
> +{
> + int err = false;
> +
> + switch (status) {
> + case QMI_VOICE_CALL_STATE_IDLE:
> + case QMI_VOICE_CALL_STATE_END:
> + case QMI_VOICE_CALL_STATE_DISCONNECTING:
> + *ret = CALL_STATUS_DISCONNECTED;
> + break;
> + case QMI_VOICE_CALL_STATE_HOLD:
> + *ret = CALL_STATUS_HELD;
> + break;
> + case QMI_VOICE_CALL_STATE_WAITING:
> + *ret = CALL_STATUS_WAITING;
> + break;
> + case QMI_VOICE_CALL_STATE_ORIG:
> + *ret = CALL_STATUS_DIALING;
> + break;
> + case QMI_VOICE_CALL_STATE_SETUP:
> + case QMI_VOICE_CALL_STATE_INCOMING:
> + *ret = CALL_STATUS_INCOMING;
> + break;
> + case QMI_VOICE_CALL_STATE_CONV:
> + *ret = CALL_STATUS_ACTIVE;
> + break;
> + case QMI_VOICE_CALL_STATE_CC_IN_PROG:
> + *ret = CALL_STATUS_DIALING;
> + break;
> + case QMI_VOICE_CALL_STATE_ALERTING:
> + *ret = CALL_STATUS_ALERTING;
> + break;
> + default:
> + err = true;
> + }
> + return err;
> +}
> +
> +static enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction)
> +{
> + return qmi_direction - 1;
> +}
> +
> +static void all_call_status_ind(struct qmi_result *result, void *user_data)
> +{
> + struct ofono_voicecall *vc = user_data;
> +
> + int i;
> + int offset;
> + uint16_t len;
> + bool status = true;
> + int instance_size;
> + const struct qmi_voice_call_information *call_information;
> + const struct qmi_voice_remote_party_number *remote_party_number;
> + const struct qmi_voice_remote_party_number_instance
> *remote_party_number_inst[16]; +
> + static const uint8_t RESULT_CALL_STATUS_CALL_INFORMATION = 0x01;
> + static const uint8_t RESULT_CALL_STATUS_REMOTE_NUMBER = 0x10;
> + static const uint8_t RESULT_CALL_INFO_CALL_INFORMATION = 0x10;
> + static const uint8_t RESULT_CALL_INFO_REMOTE_NUMBER = 0x11;
> +
> + DBG("");
> +
> + /* mandatory */
> + call_information = qmi_result_get(
> + result, RESULT_CALL_STATUS_CALL_INFORMATION, &len);
> +
> + if (!call_information) {
> + call_information = qmi_result_get(
> + result, RESULT_CALL_INFO_CALL_INFORMATION,
> + &len);
> + status = false;
> + }
> +
> + if (!call_information || len < sizeof(call_information->size)) {
> + DBG("Parsing of all call status indication failed");
> + return;
> + }
> +
> + if (!call_information->size) {
> + DBG("No call informations received!");
> + return;
> + }
> +
> + if (len != call_information->size *
> + sizeof(struct
qmi_voice_call_information_instance) +
> + sizeof(call_information->size)) {
> + DBG("Call information size incorrect");
> + return;
> + }
> +
> + /* mandatory */
> + remote_party_number = qmi_result_get(
> + result,
> + status ? RESULT_CALL_STATUS_REMOTE_NUMBER :
> + RESULT_CALL_INFO_REMOTE_NUMBER,
> + &len);
> +
> + if (!remote_party_number) {
> + DBG("Unable to retrieve remote numbers");
> + return;
> + }
> +
> + /* verify the length */
> + if (len < sizeof(remote_party_number->size)) {
> + DBG("Parsing of remote numbers failed");
> + return;
> + }
> +
> + /* expect we have valid fields for every call */
> + if (call_information->size != remote_party_number->size) {
> + DBG("Not all fields have the same size");
> + return;
> + }
> +
> + /* pull the remote call info into a local array */
> + instance_size = sizeof(struct
qmi_voice_remote_party_number_instance);
> +
> + for (i = 0, offset = sizeof(remote_party_number->size);
> + offset < len && i < 16 && i <
remote_party_number->size;
> + i++) {
> + const struct qmi_voice_remote_party_number_instance
*instance;
> +
> + if (offset + instance_size > len) {
> + DBG("Error parsing remote numbers");
> + return;
> + }
> +
> + instance = (void *)remote_party_number + offset;
> + if (offset + instance_size + instance->number_size > len)
{
> + DBG("Error parsing remote numbers");
> + return;
> + }
> +
> + remote_party_number_inst[i] = instance;
> + offset +=
> + sizeof(struct
qmi_voice_remote_party_number_instance) +
> + instance->number_size;
> + }
> +
> + struct l_queue *calls = l_queue_new();
> +
> + for (i = 0; i < call_information->size && i < 16; i++) {
> + struct ofono_call *call = l_new(struct ofono_call, 1);
> + struct qmi_voice_call_information_instance call_info;
> + const struct qmi_voice_remote_party_number_instance
> + *remote_party = remote_party_number_inst[i];
> + int number_size;
> +
> + call_info = call_information->instance[i];
> +
> + call->id = call_info.id;
> + call->direction =
qmi_to_ofono_direction(call_info.direction);
> + call->type = 0; /* always voice */
> +
> + number_size = MIN(remote_party->number_size,
> OFONO_MAX_PHONE_NUMBER_LENGTH); + char *tmp =
> l_strndup(remote_party->number, number_size);
> + l_strlcpy(call->phone_number.number, tmp,
> sizeof(call->phone_number.number)); + l_free(tmp);
> +
> + if (strlen(call->phone_number.number) > 0)
> + call->clip_validity = 0;
> + else
> + call->clip_validity = 2;
> +
> + if (qmi_to_ofono_status(call_info.state, &call->status))
{
> + DBG("Ignore call id %d, because can not
convert QMI state 0x%x to
> ofono.", + call_info.id, call_info.state);
> + l_free(call);
> + continue;
> + }
> +
> + DBG("Call %d in state %s(%d)", call_info.id,
> + qmi_voice_call_state_name(call_info.state),
> + call_info.state);
> +
> + l_queue_push_tail(calls, call);
> + }
> +
> + ofono_call_list_notify(vc, calls);
> +}
> +
> +static void dial_cb(struct qmi_result *result, void *user_data)
> +{
> + struct cb_data *cbd = user_data;
> + struct ofono_voicecall *vc = cbd->user;
> + ofono_voicecall_cb_t cb = cbd->cb;
> + uint16_t error;
> + uint8_t call_id;
> +
> + static const uint8_t RESULT_CALL_ID = 0x10;
> +
> + DBG("");
> +
> + if (qmi_result_set_error(result, &error)) {
> + DBG("QMI Error %d", error);
> + CALLBACK_WITH_FAILURE(cb, cbd->data);
> + return;
> + }
> +
> + if (!qmi_result_get_uint8(result, RESULT_CALL_ID,
> + &call_id)) {
> + ofono_error("No call id in dial result");
> + CALLBACK_WITH_FAILURE(cb, cbd->data);
> + return;
> + }
> +
> + DBG("New call QMI id %d", call_id);
> + ofono_call_list_dial_callback(vc, call_id);
> +
> + CALLBACK_WITH_SUCCESS(cb, cbd->data);
> +}
> +
> +static void dial(struct ofono_voicecall *vc,
> + const struct ofono_phone_number *ph,
> + 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);
> + struct qmi_param *param;
> + const char *calling_number = phone_number_to_string(ph);
> +
> + static const uint8_t PARAM_CALL_NUMBER = 0x01;
> + static const uint8_t PARAM_CALL_TYPE = 0x10;
> + static const uint8_t QMI_VOICE_CALL_TYPE_VOICE = 0x00;
> +
> + DBG("");
> +
> + cbd->user = vc;
> + memcpy(&vd->dialed, ph, sizeof(*ph));
> +
> + param = qmi_param_new();
> +
> + if (!qmi_param_append(param, PARAM_CALL_NUMBER,
> + strlen(calling_number), calling_number))
> + goto error;
> +
> + qmi_param_append_uint8(param, PARAM_CALL_TYPE,
> + QMI_VOICE_CALL_TYPE_VOICE);
> +
> + if (qmi_service_send(vd->voice, QMI_VOICE_DIAL_CALL, param,
dial_cb,
> + cbd, l_free) > 0)
> + return;
> +
> +error:
> + CALLBACK_WITH_FAILURE(cb, data);
> + l_free(cbd);
> + l_free(param);
> +}
> +
> static void create_voice_cb(struct qmi_service *service, void *user_data)
> {
> struct ofono_voicecall *vc = user_data;
> @@ -58,6 +477,9 @@ static void create_voice_cb(struct qmi_service *service,
> void *user_data)
>
> data->voice = qmi_service_ref(service);
>
> + qmi_service_register(data->voice, QMI_VOICE_ALL_CALL_STATUS_IND,
> + all_call_status_ind, vc, NULL);
> +
> ofono_voicecall_register(vc);
> }
>
> @@ -70,6 +492,7 @@ static int qmi_voicecall_probe(struct ofono_voicecall
> *vc, DBG("");
>
> data = l_new(struct voicecall_data, 1);
> + data->call_list = l_queue_new();
>
> ofono_voicecall_set_data(vc, data);
>
> @@ -77,7 +500,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall
> *vc, create_voice_cb, vc, NULL);
>
> return 0;
> -
> }
>
> static void qmi_voicecall_remove(struct ofono_voicecall *vc)
> @@ -92,12 +514,14 @@ static void qmi_voicecall_remove(struct ofono_voicecall
> *vc)
>
> qmi_service_unref(data->voice);
>
> + l_queue_destroy(data->call_list, l_free);
> l_free(data);
> }
>
> static const struct ofono_voicecall_driver driver = {
> .probe = qmi_voicecall_probe,
> .remove = qmi_voicecall_remove,
> + .dial = dial,
> };
>
> OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/4] qmimodem: voicecall: Implement call dialing
@ 2024-04-21 19:49 Adam Pigg
2024-04-21 20:06 ` Adam Pigg
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Adam Pigg @ 2024-04-21 19:49 UTC (permalink / raw)
To: ofono; +Cc: Adam Pigg
Add voicecall dialling to the qmimodem driver
Includes required infrastructure and setup of the QMI services
Call State Handling
===================
On initialisation, register the all_call_status_ind callback to be
called for QMI_VOICE_IND_ALL_STATUS. This will handle notification of
call status to the rest of the system
Dial Handling
=============
The dial function sets up the parameters for the QMI_VOICE_DIAL_CALL
service. The parameters are the number to be called and the call type,
which is currently hard coded to be QMI_VOICE_CALL_TYPE_VOICE. The
dial_cb callback will then be called and will receive the call-id.
---
Changes in V4
-merged qmi_voice_call_status and all_call_status_ind
-several minor structure/formate changes
Changes in V5
-renames ofono_call_compare_by_id to ofono_call_match_by_id
-updated new_entry pointer to fix use-after-free in
ofono_call_list_notify
-Renamed several constants
-in all_call_status_ind removed error label/gotos after restructuring
-When creating the call list, ensure an upper bound of 16
-Fix out-of-mound-read on remote number due to QMI string not being null
terminated
---
---
drivers/qmimodem/voice.h | 17 ++
drivers/qmimodem/voicecall.c | 426 ++++++++++++++++++++++++++++++++++-
2 files changed, 442 insertions(+), 1 deletion(-)
diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
index 917e72f7..2344fd50 100644
--- a/drivers/qmimodem/voice.h
+++ b/drivers/qmimodem/voice.h
@@ -48,6 +48,9 @@ enum qmi_ussd_user_required {
/* QMI service voice. Using an enum to prevent doublicated entries */
enum voice_commands {
+ QMI_VOICE_DIAL_CALL = 0x20,
+ QMI_VOICE_ALL_CALL_STATUS_IND = 0x2e,
+ QMI_VOICE_GET_ALL_CALL_INFO = 0x2f,
QMI_VOICE_SUPS_NOTIFICATION_IND = 0x32,
QMI_VOICE_SET_SUPS_SERVICE = 0x33,
QMI_VOICE_GET_CALL_WAITING = 0x34,
@@ -66,6 +69,20 @@ enum voice_commands {
QMI_VOICE_GET_CNAP = 0x4d
};
+enum qmi_voice_call_state {
+ QMI_VOICE_CALL_STATE_IDLE = 0x0,
+ QMI_VOICE_CALL_STATE_ORIG,
+ QMI_VOICE_CALL_STATE_INCOMING,
+ QMI_VOICE_CALL_STATE_CONV,
+ QMI_VOICE_CALL_STATE_CC_IN_PROG,
+ QMI_VOICE_CALL_STATE_ALERTING,
+ QMI_VOICE_CALL_STATE_HOLD,
+ QMI_VOICE_CALL_STATE_WAITING,
+ QMI_VOICE_CALL_STATE_DISCONNECTING,
+ QMI_VOICE_CALL_STATE_END,
+ QMI_VOICE_CALL_STATE_SETUP
+};
+
struct qmi_ussd_data {
uint8_t dcs;
uint8_t length;
diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
index aa34fc25..7b4813c9 100644
--- a/drivers/qmimodem/voicecall.c
+++ b/drivers/qmimodem/voicecall.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2011-2012 Intel Corporation. All rights reserved.
+ * Copyright (C) 2024 Adam Pigg <adam@piggz.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -26,6 +27,10 @@
#include <ofono/log.h>
#include <ofono/modem.h>
#include <ofono/voicecall.h>
+#include <src/common.h>
+#include <ell/ell.h>
+
+#include "voice.h"
#include "qmi.h"
@@ -35,8 +40,422 @@ struct voicecall_data {
struct qmi_service *voice;
uint16_t major;
uint16_t minor;
+ struct l_queue *call_list;
+ struct ofono_phone_number dialed;
};
+struct qmi_voice_call_information_instance {
+ uint8_t id;
+ uint8_t state;
+ uint8_t type;
+ uint8_t direction;
+ uint8_t mode;
+ uint8_t multipart_indicator;
+ uint8_t als;
+} __attribute__((__packed__));
+
+struct qmi_voice_call_information {
+ uint8_t size;
+ struct qmi_voice_call_information_instance instance[0];
+} __attribute__((__packed__));
+
+struct qmi_voice_remote_party_number_instance {
+ uint8_t call_id;
+ uint8_t presentation_indicator;
+ uint8_t number_size;
+ char number[0];
+} __attribute__((__packed__));
+
+struct qmi_voice_remote_party_number {
+ uint8_t size;
+ struct qmi_voice_remote_party_number_instance instance[0];
+} __attribute__((__packed__));
+
+static int ofono_call_compare(const void *a, const void *b, void *data)
+{
+ const struct ofono_call *ca = a;
+ const struct ofono_call *cb = b;
+
+ if (ca->id < cb->id)
+ return -1;
+
+ if (ca->id > cb->id)
+ return 1;
+
+ return 0;
+}
+
+static bool ofono_call_match_by_id(const void *a, const void *b)
+{
+ const struct ofono_call *call = a;
+ unsigned int id = L_PTR_TO_UINT(b);
+
+ return (call->id == id);
+}
+
+static void ofono_call_list_dial_callback(struct ofono_voicecall *vc,
+ int call_id)
+{
+ struct ofono_call *call;
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct l_queue *call_list = vd->call_list;
+ const struct ofono_phone_number *ph = &vd->dialed;
+
+ /* check if call_id already present */
+ call = l_queue_find(call_list, ofono_call_match_by_id,
+ L_UINT_TO_PTR(call_id));
+
+ if (call)
+ return;
+
+ call = l_new(struct ofono_call, 1);
+ call->id = call_id;
+
+ memcpy(&call->called_number, ph, sizeof(*ph));
+ call->direction = CALL_DIRECTION_MOBILE_ORIGINATED;
+ call->status = CALL_STATUS_DIALING;
+ call->type = 0; /* voice */
+
+ l_queue_insert(call_list, call, ofono_call_compare, NULL);
+
+ ofono_voicecall_notify(vc, call);
+}
+
+static void ofono_call_list_notify(struct ofono_voicecall *vc,
+ struct l_queue *calls)
+{
+ struct voicecall_data *vd = ofono_voicecall_get_data(vc);
+ struct l_queue *old_calls = vd->call_list;
+ struct l_queue *new_calls = calls;
+ struct ofono_call *new_call, *old_call;
+ const struct l_queue_entry *old_entry, *new_entry;
+ uint i;
+
+ uint loop_length =
+ MAX(l_queue_length(old_calls), l_queue_length(new_calls));
+
+ old_entry = l_queue_get_entries(old_calls);
+ new_entry = l_queue_get_entries(new_calls);
+
+ for (i = 0; i < loop_length; ++i) {
+ old_call = old_entry ? old_entry->data : NULL;
+ new_call = new_entry ? new_entry->data : NULL;
+
+ if (new_call && new_call->status == CALL_STATUS_DISCONNECTED) {
+ ofono_voicecall_disconnected(
+ vc, new_call->id,
+ OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
+ new_entry = new_entry->next;
+ l_queue_remove(calls, new_call);
+ l_free(new_call);
+ continue;
+ }
+
+ if (old_call &&
+ (!new_call || (new_call->id > old_call->id)))
+ ofono_voicecall_disconnected(
+ vc, old_call->id,
+ OFONO_DISCONNECT_REASON_REMOTE_HANGUP, NULL);
+ else if (new_call &&
+ (!old_call || (new_call->id < old_call->id))) {
+ DBG("Notify new call %d", new_call->id);
+ /* new call, signal it */
+ if (new_call->type == 0)
+ ofono_voicecall_notify(vc, new_call);
+ } else if (memcmp(new_call, old_call, sizeof(*new_call)) &&
+ new_call->type == 0)
+ ofono_voicecall_notify(vc, new_call);
+
+ if (old_entry)
+ old_entry = old_entry->next;
+ if (new_entry)
+ new_entry = new_entry->next;
+ }
+
+ l_queue_destroy(old_calls, l_free);
+ vd->call_list = calls;
+}
+
+static const char *qmi_voice_call_state_name(enum qmi_voice_call_state value)
+{
+ switch (value) {
+ case QMI_VOICE_CALL_STATE_IDLE:
+ return "QMI_VOICE_CALL_STATE_IDLE";
+ case QMI_VOICE_CALL_STATE_ORIG:
+ return "QMI_VOICE_CALL_STATE_ORIG";
+ case QMI_VOICE_CALL_STATE_INCOMING:
+ return "QMI_VOICE_CALL_STATE_INCOMING";
+ case QMI_VOICE_CALL_STATE_CONV:
+ return "QMI_VOICE_CALL_STATE_CONV";
+ case QMI_VOICE_CALL_STATE_CC_IN_PROG:
+ return "QMI_VOICE_CALL_STATE_CC_IN_PROG";
+ case QMI_VOICE_CALL_STATE_ALERTING:
+ return "QMI_VOICE_CALL_STATE_ALERTING";
+ case QMI_VOICE_CALL_STATE_HOLD:
+ return "QMI_VOICE_CALL_STATE_HOLD";
+ case QMI_VOICE_CALL_STATE_WAITING:
+ return "QMI_VOICE_CALL_STATE_WAITING";
+ case QMI_VOICE_CALL_STATE_DISCONNECTING:
+ return "QMI_VOICE_CALL_STATE_DISCONNECTING";
+ case QMI_VOICE_CALL_STATE_END:
+ return "QMI_VOICE_CALL_STATE_END";
+ case QMI_VOICE_CALL_STATE_SETUP:
+ return "QMI_VOICE_CALL_STATE_SETUP";
+ }
+ return "QMI_CALL_STATE_<UNKNOWN>";
+}
+
+static bool qmi_to_ofono_status(uint8_t status, int *ret)
+{
+ int err = false;
+
+ switch (status) {
+ case QMI_VOICE_CALL_STATE_IDLE:
+ case QMI_VOICE_CALL_STATE_END:
+ case QMI_VOICE_CALL_STATE_DISCONNECTING:
+ *ret = CALL_STATUS_DISCONNECTED;
+ break;
+ case QMI_VOICE_CALL_STATE_HOLD:
+ *ret = CALL_STATUS_HELD;
+ break;
+ case QMI_VOICE_CALL_STATE_WAITING:
+ *ret = CALL_STATUS_WAITING;
+ break;
+ case QMI_VOICE_CALL_STATE_ORIG:
+ *ret = CALL_STATUS_DIALING;
+ break;
+ case QMI_VOICE_CALL_STATE_SETUP:
+ case QMI_VOICE_CALL_STATE_INCOMING:
+ *ret = CALL_STATUS_INCOMING;
+ break;
+ case QMI_VOICE_CALL_STATE_CONV:
+ *ret = CALL_STATUS_ACTIVE;
+ break;
+ case QMI_VOICE_CALL_STATE_CC_IN_PROG:
+ *ret = CALL_STATUS_DIALING;
+ break;
+ case QMI_VOICE_CALL_STATE_ALERTING:
+ *ret = CALL_STATUS_ALERTING;
+ break;
+ default:
+ err = true;
+ }
+ return err;
+}
+
+static enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction)
+{
+ return qmi_direction - 1;
+}
+
+static void all_call_status_ind(struct qmi_result *result, void *user_data)
+{
+ struct ofono_voicecall *vc = user_data;
+
+ int i;
+ int offset;
+ uint16_t len;
+ bool status = true;
+ int instance_size;
+ const struct qmi_voice_call_information *call_information;
+ const struct qmi_voice_remote_party_number *remote_party_number;
+ const struct qmi_voice_remote_party_number_instance *remote_party_number_inst[16];
+
+ static const uint8_t RESULT_CALL_STATUS_CALL_INFORMATION = 0x01;
+ static const uint8_t RESULT_CALL_STATUS_REMOTE_NUMBER = 0x10;
+ static const uint8_t RESULT_CALL_INFO_CALL_INFORMATION = 0x10;
+ static const uint8_t RESULT_CALL_INFO_REMOTE_NUMBER = 0x11;
+
+ DBG("");
+
+ /* mandatory */
+ call_information = qmi_result_get(
+ result, RESULT_CALL_STATUS_CALL_INFORMATION, &len);
+
+ if (!call_information) {
+ call_information = qmi_result_get(
+ result, RESULT_CALL_INFO_CALL_INFORMATION,
+ &len);
+ status = false;
+ }
+
+ if (!call_information || len < sizeof(call_information->size)) {
+ DBG("Parsing of all call status indication failed");
+ return;
+ }
+
+ if (!call_information->size) {
+ DBG("No call informations received!");
+ return;
+ }
+
+ if (len != call_information->size *
+ sizeof(struct qmi_voice_call_information_instance) +
+ sizeof(call_information->size)) {
+ DBG("Call information size incorrect");
+ return;
+ }
+
+ /* mandatory */
+ remote_party_number = qmi_result_get(
+ result,
+ status ? RESULT_CALL_STATUS_REMOTE_NUMBER :
+ RESULT_CALL_INFO_REMOTE_NUMBER,
+ &len);
+
+ if (!remote_party_number) {
+ DBG("Unable to retrieve remote numbers");
+ return;
+ }
+
+ /* verify the length */
+ if (len < sizeof(remote_party_number->size)) {
+ DBG("Parsing of remote numbers failed");
+ return;
+ }
+
+ /* expect we have valid fields for every call */
+ if (call_information->size != remote_party_number->size) {
+ DBG("Not all fields have the same size");
+ return;
+ }
+
+ /* pull the remote call info into a local array */
+ instance_size = sizeof(struct qmi_voice_remote_party_number_instance);
+
+ for (i = 0, offset = sizeof(remote_party_number->size);
+ offset < len && i < 16 && i < remote_party_number->size;
+ i++) {
+ const struct qmi_voice_remote_party_number_instance *instance;
+
+ if (offset + instance_size > len) {
+ DBG("Error parsing remote numbers");
+ return;
+ }
+
+ instance = (void *)remote_party_number + offset;
+ if (offset + instance_size + instance->number_size > len) {
+ DBG("Error parsing remote numbers");
+ return;
+ }
+
+ remote_party_number_inst[i] = instance;
+ offset +=
+ sizeof(struct qmi_voice_remote_party_number_instance) +
+ instance->number_size;
+ }
+
+ struct l_queue *calls = l_queue_new();
+
+ for (i = 0; i < call_information->size && i < 16; i++) {
+ struct ofono_call *call = l_new(struct ofono_call, 1);
+ struct qmi_voice_call_information_instance call_info;
+ const struct qmi_voice_remote_party_number_instance
+ *remote_party = remote_party_number_inst[i];
+ int number_size;
+
+ call_info = call_information->instance[i];
+
+ call->id = call_info.id;
+ call->direction = qmi_to_ofono_direction(call_info.direction);
+ call->type = 0; /* always voice */
+
+ number_size = MIN(remote_party->number_size, OFONO_MAX_PHONE_NUMBER_LENGTH);
+ char *tmp = l_strndup(remote_party->number, number_size);
+ l_strlcpy(call->phone_number.number, tmp, sizeof(call->phone_number.number));
+ l_free(tmp);
+
+ if (strlen(call->phone_number.number) > 0)
+ call->clip_validity = 0;
+ else
+ call->clip_validity = 2;
+
+ if (qmi_to_ofono_status(call_info.state, &call->status)) {
+ DBG("Ignore call id %d, because can not convert QMI state 0x%x to ofono.",
+ call_info.id, call_info.state);
+ l_free(call);
+ continue;
+ }
+
+ DBG("Call %d in state %s(%d)", call_info.id,
+ qmi_voice_call_state_name(call_info.state),
+ call_info.state);
+
+ l_queue_push_tail(calls, call);
+ }
+
+ ofono_call_list_notify(vc, calls);
+}
+
+static void dial_cb(struct qmi_result *result, void *user_data)
+{
+ struct cb_data *cbd = user_data;
+ struct ofono_voicecall *vc = cbd->user;
+ ofono_voicecall_cb_t cb = cbd->cb;
+ uint16_t error;
+ uint8_t call_id;
+
+ static const uint8_t RESULT_CALL_ID = 0x10;
+
+ DBG("");
+
+ if (qmi_result_set_error(result, &error)) {
+ DBG("QMI Error %d", error);
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ if (!qmi_result_get_uint8(result, RESULT_CALL_ID,
+ &call_id)) {
+ ofono_error("No call id in dial result");
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ return;
+ }
+
+ DBG("New call QMI id %d", call_id);
+ ofono_call_list_dial_callback(vc, call_id);
+
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void dial(struct ofono_voicecall *vc,
+ const struct ofono_phone_number *ph,
+ 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);
+ struct qmi_param *param;
+ const char *calling_number = phone_number_to_string(ph);
+
+ static const uint8_t PARAM_CALL_NUMBER = 0x01;
+ static const uint8_t PARAM_CALL_TYPE = 0x10;
+ static const uint8_t QMI_VOICE_CALL_TYPE_VOICE = 0x00;
+
+ DBG("");
+
+ cbd->user = vc;
+ memcpy(&vd->dialed, ph, sizeof(*ph));
+
+ param = qmi_param_new();
+
+ if (!qmi_param_append(param, PARAM_CALL_NUMBER,
+ strlen(calling_number), calling_number))
+ goto error;
+
+ qmi_param_append_uint8(param, PARAM_CALL_TYPE,
+ QMI_VOICE_CALL_TYPE_VOICE);
+
+ if (qmi_service_send(vd->voice, QMI_VOICE_DIAL_CALL, param, dial_cb,
+ cbd, l_free) > 0)
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, data);
+ l_free(cbd);
+ l_free(param);
+}
+
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
@@ -58,6 +477,9 @@ static void create_voice_cb(struct qmi_service *service, void *user_data)
data->voice = qmi_service_ref(service);
+ qmi_service_register(data->voice, QMI_VOICE_ALL_CALL_STATUS_IND,
+ all_call_status_ind, vc, NULL);
+
ofono_voicecall_register(vc);
}
@@ -70,6 +492,7 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc,
DBG("");
data = l_new(struct voicecall_data, 1);
+ data->call_list = l_queue_new();
ofono_voicecall_set_data(vc, data);
@@ -77,7 +500,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc,
create_voice_cb, vc, NULL);
return 0;
-
}
static void qmi_voicecall_remove(struct ofono_voicecall *vc)
@@ -92,12 +514,14 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc)
qmi_service_unref(data->voice);
+ l_queue_destroy(data->call_list, l_free);
l_free(data);
}
static const struct ofono_voicecall_driver driver = {
.probe = qmi_voicecall_probe,
.remove = qmi_voicecall_remove,
+ .dial = dial,
};
OFONO_ATOM_DRIVER_BUILTIN(voicecall, qmimodem, &driver)
--
2.44.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-04-22 21:10 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-25 22:16 [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Adam Pigg
2024-03-25 22:17 ` [PATCH 2/4] [qmimodem][voicecall] Implement call answer Adam Pigg
2024-03-25 22:17 ` [PATCH 3/4] [qmimodem][voicecall] Implement active call hangup Adam Pigg
2024-03-25 22:17 ` [PATCH 4/4] [qmimodem][voicecall] Implement DTMF tones Adam Pigg
2024-03-25 23:05 ` [PATCH 1/4] [qmimodem][voicecall] Implement call dialing Denis Kenzior
2024-03-25 23:32 ` piggz1
2024-04-21 19:49 [PATCH 1/4] qmimodem: voicecall: " Adam Pigg
2024-04-21 20:06 ` Adam Pigg
2024-04-22 21:05 ` Denis Kenzior
2024-04-22 21:10 ` patchwork-bot+ofono
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).