Signed-off-by: Denis 'GNUtoo' Carikli <[email protected]>
---
call.c | 141 ++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 95 insertions(+), 46 deletions(-)
diff --git a/call.c b/call.c
index ef4814f..c3cee65 100644
--- a/call.c
+++ b/call.c
@@ -92,20 +92,25 @@ int ril_request_dial(void *data, size_t size, RIL_Token
token)
goto error;
identity = ril2ipc_call_identity(dial->clir);
- prefix = dial->address[0] == '+' ? IPC_CALL_PREFIX_INTL :
IPC_CALL_PREFIX_NONE;
+ prefix = dial->address[0] ==
+ '+' ? IPC_CALL_PREFIX_INTL : IPC_CALL_PREFIX_NONE;
- rc = ipc_call_outgoing_setup(&request_data, IPC_CALL_TYPE_VOICE,
identity, prefix, dial->address);
+ rc = ipc_call_outgoing_setup(&request_data, IPC_CALL_TYPE_VOICE,
+ identity, prefix, dial->address);
if (rc < 0)
goto error;
free(dial->address);
dial = NULL;
- rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
IPC_CALL_OUTGOING);
+ rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
+ IPC_CALL_OUTGOING);
if (rc < 0)
goto error;
- rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_OUTGOING,
IPC_TYPE_EXEC, (void *) &request_data, sizeof(request_data));
+ rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_OUTGOING,
+ IPC_TYPE_EXEC, (void *) &request_data,
+ sizeof(request_data));
if (rc < 0)
goto error;
@@ -146,11 +151,13 @@ int ril_request_hangup(__attribute__((unused)) void *data,
hangup = 1;
ril_request_data_set_uniq(RIL_REQUEST_HANGUP, &hangup, sizeof(hangup));
- rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
IPC_CALL_RELEASE);
+ rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
+ IPC_CALL_RELEASE);
if (rc < 0)
goto error;
- rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_RELEASE,
IPC_TYPE_EXEC, NULL, 0);
+ rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_RELEASE,
+ IPC_TYPE_EXEC, NULL, 0);
if (rc < 0)
goto error;
@@ -180,11 +187,13 @@ int ril_request_answer(__attribute__((unused)) void *data,
if (rc < 0)
return RIL_REQUEST_UNHANDLED;
- rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
IPC_CALL_ANSWER);
+ rc = ipc_gen_phone_res_expect_complete(ipc_fmt_request_seq(token),
+ IPC_CALL_ANSWER);
if (rc < 0)
goto error;
- rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_ANSWER,
IPC_TYPE_EXEC, NULL, 0);
+ rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_ANSWER,
+ IPC_TYPE_EXEC, NULL, 0);
if (rc < 0)
goto error;
@@ -209,7 +218,8 @@ int ipc_call_status(struct ipc_message *message)
void *hangup_data;
size_t hangup_size;
- if (message == NULL || message->data == NULL || message->size <
sizeof(struct ipc_call_status_data))
+ if (message == NULL || message->data == NULL ||
+ message->size < sizeof(struct ipc_call_status_data))
return -1;
data = (struct ipc_call_status_data *) message->data;
@@ -218,10 +228,12 @@ int ipc_call_status(struct ipc_message *message)
hangup_size = ril_request_data_size_get(RIL_REQUEST_HANGUP);
hangup_data = ril_request_data_get(RIL_REQUEST_HANGUP);
- if (data->status == IPC_CALL_STATUS_RELEASED && (hangup_data == NULL ||
hangup_size == 0)) {
+ if (data->status == IPC_CALL_STATUS_RELEASED && (hangup_data == NULL ||
+ hangup_size == 0)) {
fail_cause = ipc2ril_call_fail_cause(data->end_cause);
- ril_request_data_set_uniq(RIL_REQUEST_LAST_CALL_FAIL_CAUSE,
&fail_cause, sizeof(fail_cause));
+ ril_request_data_set_uniq(RIL_REQUEST_LAST_CALL_FAIL_CAUSE,
+ &fail_cause, sizeof(fail_cause));
} else if (hangup_data != NULL && hangup_size > 0) {
free(hangup_data);
}
@@ -244,8 +256,10 @@ int
ril_request_last_call_fail_cause(__attribute__((unused)) void *data,
if (rc < 0)
return RIL_REQUEST_UNHANDLED;
- fail_cause_size =
ril_request_data_size_get(RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
- fail_cause_data =
ril_request_data_get(RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
+ fail_cause_size = ril_request_data_size_get(
+ RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
+ fail_cause_data = ril_request_data_get(
+ RIL_REQUEST_LAST_CALL_FAIL_CAUSE);
if (fail_cause_data == NULL || fail_cause_size < sizeof(fail_cause)) {
ril_request_complete(token, RIL_E_GENERIC_FAILURE, NULL, 0);
@@ -254,7 +268,8 @@ int
ril_request_last_call_fail_cause(__attribute__((unused)) void *data,
fail_cause = *((int *) fail_cause_data);
- ril_request_complete(token, RIL_E_SUCCESS, &fail_cause,
sizeof(fail_cause));
+ ril_request_complete(token, RIL_E_SUCCESS, &fail_cause,
+ sizeof(fail_cause));
free(fail_cause_data);
@@ -271,7 +286,8 @@ int ipc_call_list(struct ipc_message *message)
unsigned char index;
char *number;
- if (message == NULL || message->data == NULL || message->size <
sizeof(struct ipc_call_list_header))
+ if (message == NULL || message->data == NULL ||
+ message->size < sizeof(struct ipc_call_list_header))
return -1;
if (message->type != IPC_TYPE_RESP || !ipc_seq_valid(message->aseq))
@@ -279,7 +295,8 @@ int ipc_call_list(struct ipc_message *message)
count = ipc_call_list_count_extract(message->data, message->size);
if (count == 0) {
- ril_request_complete(ipc_fmt_request_token(message->aseq),
RIL_E_SUCCESS, NULL, 0);
+ ril_request_complete(ipc_fmt_request_token(message->aseq),
+ RIL_E_SUCCESS, NULL, 0);
return 0;
}
@@ -287,7 +304,8 @@ int ipc_call_list(struct ipc_message *message)
calls = (RIL_Call **) calloc(1, calls_size);
for (index = 0; index < count; index++) {
- entry = ipc_call_list_entry_extract(message->data,
message->size, index);
+ entry = ipc_call_list_entry_extract(message->data,
+ message->size, index);
if (entry == NULL)
goto error;
@@ -296,7 +314,8 @@ int ipc_call_list(struct ipc_message *message)
goto error;
calls[index] = (RIL_Call *) calloc(1, sizeof(RIL_Call));
- calls[index]->state =
ipc2ril_call_list_entry_state(entry->status);
+ calls[index]->state =
+ ipc2ril_call_list_entry_state(entry->status);
calls[index]->index = entry->id;
calls[index]->isMpty = entry->mpty;
calls[index]->isMT = entry->term == IPC_CALL_TERM_MT;
@@ -304,12 +323,14 @@ int ipc_call_list(struct ipc_message *message)
calls[index]->isVoice = entry->type == IPC_CALL_TYPE_VOICE;
calls[index]->isVoicePrivacy = 0;
calls[index]->number = strdup(number);
- calls[index]->numberPresentation = (entry->number_length > 0) ?
0 : 2;
+ calls[index]->numberPresentation =
+ (entry->number_length > 0) ? 0 : 2;
calls[index]->name = NULL;
calls[index]->namePresentation = 2;
calls[index]->uusInfo = NULL;
- if (entry->number_length > 0 && number != NULL && number[0] ==
'+')
+ if (entry->number_length > 0 &&
+ number != NULL && number[0] == '+')
calls[index]->toa = 145;
else
calls[index]->toa = 129;
@@ -319,12 +340,14 @@ int ipc_call_list(struct ipc_message *message)
calls_size = calls_count * sizeof(RIL_Call *);
- ril_request_complete(ipc_fmt_request_token(message->aseq),
RIL_E_SUCCESS, (void *) calls, calls_size);
+ ril_request_complete(ipc_fmt_request_token(message->aseq),
+ RIL_E_SUCCESS, (void *) calls, calls_size);
goto complete;
error:
- ril_request_complete(ipc_fmt_request_token(message->aseq),
RIL_E_GENERIC_FAILURE, NULL, 0);
+ ril_request_complete(ipc_fmt_request_token(message->aseq),
+ RIL_E_GENERIC_FAILURE, NULL, 0);
complete:
if (calls != NULL && calls_size > 0) {
@@ -356,7 +379,8 @@ int ril_request_get_current_calls(__attribute__((unused))
void *data,
return RIL_REQUEST_COMPLETED;
}
- rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_LIST,
IPC_TYPE_GET, NULL, 0);
+ rc = ipc_fmt_send(ipc_fmt_request_seq(token), IPC_CALL_LIST,
+ IPC_TYPE_GET, NULL, 0);
if (rc < 0) {
ril_request_complete(token, RIL_E_GENERIC_FAILURE, NULL, 0);
return RIL_REQUEST_COMPLETED;
@@ -373,7 +397,8 @@ int ipc_call_cont_dtmf_callback(struct ipc_message *message)
char tone;
int rc;
- if (message == NULL || message->data == NULL || message->size <
sizeof(struct ipc_gen_phone_res_data))
+ if (message == NULL || message->data == NULL ||
+ message->size < sizeof(struct ipc_gen_phone_res_data))
return -1;
data = (struct ipc_gen_phone_res_data *) message->data;
@@ -389,7 +414,8 @@ int ipc_call_cont_dtmf_callback(struct ipc_message *message)
tone = *((char *) dtmf_data);
// Register a new DTMF tone
- ril_request_data_set(RIL_REQUEST_DTMF_START, dtmf_data,
dtmf_size);
+ ril_request_data_set(RIL_REQUEST_DTMF_START, dtmf_data,
+ dtmf_size);
free(dtmf_data);
@@ -416,7 +442,8 @@ int ipc_call_cont_dtmf_callback(struct ipc_message *message)
goto complete;
error:
- ril_request_complete(ipc_fmt_request_token(message->aseq),
RIL_E_GENERIC_FAILURE, NULL, 0);
+ ril_request_complete(ipc_fmt_request_token(message->aseq),
+ RIL_E_GENERIC_FAILURE, NULL, 0);
complete:
return 0;
@@ -424,13 +451,15 @@ complete:
int ipc_call_burst_dtmf(struct ipc_message *message)
{
- if (message == NULL || message->data == NULL || message->size <
sizeof(struct ipc_call_burst_dtmf_response_data))
+ if (message == NULL || message->data == NULL ||
+ message->size < sizeof(struct ipc_call_burst_dtmf_response_data))
return -1;
if (!ipc_seq_valid(message->aseq))
return 0;
- ril_request_complete(ipc_fmt_request_token(message->aseq),
RIL_E_SUCCESS, NULL, 0);
+ ril_request_complete(ipc_fmt_request_token(message->aseq),
+ RIL_E_SUCCESS, NULL, 0);
return 0;
}
@@ -458,7 +487,8 @@ int ril_request_dtmf_complete(unsigned char aseq, char tone)
if (rc < 0)
goto error;
- rc = ipc_fmt_send(aseq, IPC_CALL_BURST_DTMF, IPC_TYPE_EXEC,
request_data, request_size);
+ rc = ipc_fmt_send(aseq, IPC_CALL_BURST_DTMF, IPC_TYPE_EXEC,
+ request_data, request_size);
if (rc < 0)
goto error;
@@ -490,15 +520,18 @@ int ril_request_dtmf(void *data, size_t size, RIL_Token
token)
if (rc < 0)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
@@ -511,10 +544,13 @@ int ril_request_dtmf(void *data, size_t size, RIL_Token
token)
if (dtmf_data != NULL && dtmf_size >= sizeof(tone)) {
free(dtmf_data);
- // Let the callback know what to do after completing the
previous DTMF tone
+ /* Let the callback know what to do after completing the
+ * previous DTMF tone
+ */
ril_request_data_set(RIL_REQUEST_DTMF, data, size);
- rc = ril_request_dtmf_stop_complete(ipc_fmt_request_seq(token),
1);
+ rc = ril_request_dtmf_stop_complete(ipc_fmt_request_seq(token),
+ 1);
if (rc < 0) {
ril_request_data_free(RIL_REQUEST_DTMF);
goto error;
@@ -553,7 +589,8 @@ int ril_request_dtmf_start_complete(unsigned char aseq,
char tone)
if (rc < 0)
return -1;
- rc = ipc_fmt_send(aseq, IPC_CALL_CONT_DTMF, IPC_TYPE_SET, (void *)
&request_data, sizeof(request_data));
+ rc = ipc_fmt_send(aseq, IPC_CALL_CONT_DTMF, IPC_TYPE_SET,
+ (void *) &request_data, sizeof(request_data));
if (rc < 0)
return -1;
@@ -575,15 +612,18 @@ int ril_request_dtmf_start(void *data, size_t size,
RIL_Token token)
if (rc < 0)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
@@ -596,10 +636,13 @@ int ril_request_dtmf_start(void *data, size_t size,
RIL_Token token)
if (dtmf_data != NULL && dtmf_size >= sizeof(tone)) {
free(dtmf_data);
- // Let the callback know what to do after completing the
previous DTMF tone
+ /* Let the callback know what to do after completing the
+ * previous DTMF tone
+ */
ril_request_data_set(RIL_REQUEST_DTMF_START, data, size);
- rc = ril_request_dtmf_stop_complete(ipc_fmt_request_seq(token),
1);
+ rc = ril_request_dtmf_stop_complete(ipc_fmt_request_seq(token),
+ 1);
if (rc < 0) {
ril_request_data_free(RIL_REQUEST_DTMF_START);
goto error;
@@ -640,14 +683,17 @@ int ril_request_dtmf_stop_complete(unsigned char aseq,
int callback)
request_data.tone = 0;
if (callback)
- rc = ipc_gen_phone_res_expect_callback(aseq,
IPC_CALL_CONT_DTMF, ipc_call_cont_dtmf_callback);
+ rc = ipc_gen_phone_res_expect_callback(
+ aseq, IPC_CALL_CONT_DTMF, ipc_call_cont_dtmf_callback);
else
- rc = ipc_gen_phone_res_expect_complete(aseq,
IPC_CALL_CONT_DTMF);
+ rc = ipc_gen_phone_res_expect_complete(
+ aseq, IPC_CALL_CONT_DTMF);
if (rc < 0)
return -1;
- rc = ipc_fmt_send(aseq, IPC_CALL_CONT_DTMF, IPC_TYPE_SET, (void *)
&request_data, sizeof(request_data));
+ rc = ipc_fmt_send(aseq, IPC_CALL_CONT_DTMF, IPC_TYPE_SET,
+ (void *) &request_data, sizeof(request_data));
if (rc < 0)
return -1;
@@ -663,15 +709,18 @@ int ril_request_dtmf_stop(__attribute__((unused)) void
*data,
size_t dtmf_size;
int rc;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_START,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
- request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
RIL_REQUEST_HANDLED);
+ request = ril_request_find_request_status(RIL_REQUEST_DTMF_STOP,
+ RIL_REQUEST_HANDLED);
if (request != NULL)
return RIL_REQUEST_UNHANDLED;
--
2.30.1
_______________________________________________
Replicant mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/replicant
