depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2025-01-08 04:45:31 +00:00
Code Issues Releases Wiki Activity

mm: call: Better debugging

Browse source 
Including the error domain should help in identifying errors.
Use the DBus object path as the primary identifier for a call.
This commit is contained in:
Evangelos Ribeiro Tzaras 2022-06-17 02:02:52 +02:00
parent 07aa990601
commit 6d7feec690
1 changed files with 57 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
plugins/mm/calls-mm-call.c
View file

@ -70,7 +70,7 @@ static const struct CallsMMCallStateReasonMap STATE_REASON_MAP[] = {
#define row(ENUMVALUE,DESCRIPTION) \ #define row(ENUMVALUE,DESCRIPTION) \
{ MM_CALL_STATE_REASON_##ENUMVALUE, DESCRIPTION } { MM_CALL_STATE_REASON_##ENUMVALUE, DESCRIPTION }
row (UNKNOWN, N_("Call disconnected (unknown reason)")), row (UNKNOWN, N_("Unknown reason")),
row (OUTGOING_STARTED, N_("Outgoing call started")), row (OUTGOING_STARTED, N_("Outgoing call started")),
row (INCOMING_NEW, N_("New incoming call")), row (INCOMING_NEW, N_("New incoming call")),
row (ACCEPTED, N_("Call accepted")), row (ACCEPTED, N_("Call accepted")),
@ -114,7 +114,7 @@ set_disconnect_reason (CallsMMCall *self,
struct CallsMMCallStateMap { struct CallsMMCallStateMap {
MMCallState mm; MMCallState mm;
CallsCallState calls; CallsCallState calls;
const gchar *name; const gchar *desc;
}; };
static const struct CallsMMCallStateMap STATE_MAP[] = { static const struct CallsMMCallStateMap STATE_MAP[] = {
@ -138,23 +138,40 @@ static const struct CallsMMCallStateMap STATE_MAP[] = {
static void static void
state_changed_cb (CallsMMCall *self, state_changed_cb (CallsMMCall *self,
MMCallState old, MMCallState old_state,
MMCallState mm_new, MMCallState new_state,
MMCallStateReason reason) MMCallStateReason reason)
{ {
const struct CallsMMCallStateMap *map_row; const struct CallsMMCallStateMap *state_map_row;
const struct CallsMMCallStateReasonMap *reason_map_row;
const char *state_str = "state unmatched";
const char *reason_str = "reason unmatched";
if (mm_new == MM_CALL_STATE_TERMINATED) if (new_state == MM_CALL_STATE_TERMINATED)
set_disconnect_reason (self, reason); set_disconnect_reason (self, reason);
for (map_row = STATE_MAP; map_row->mm != -1; ++map_row) {
if (map_row->mm == mm_new) { for (state_map_row = STATE_MAP; state_map_row->mm != -1; state_map_row++) {
g_debug ("MM call state changed to `%s'", if (state_map_row->mm == new_state) {
map_row->name); state_str = state_map_row->desc;
calls_call_set_state (CALLS_CALL (self), map_row->calls); break;
return;
} }
} }
g_assert_cmpint (state_map_row->mm, !=, -1);
for (reason_map_row = STATE_REASON_MAP; reason_map_row->value != -1; reason_map_row++) {
if (reason_map_row->value == reason) {
reason_str = gettext (reason_map_row->desc);
break;
}
}
g_assert_cmpint (reason_map_row->value, !=, -1);
g_debug ("MM call '%s' changed state to `%s': %s",
mm_call_get_path (self->mm_call),
state_str,
reason_str);
calls_call_set_state (CALLS_CALL (self), state_map_row->calls);
} }
@ -181,10 +198,12 @@ operation_cb (MMCall *mm_call,
ok = data->finish_func (mm_call, res, &error); ok = data->finish_func (mm_call, res, &error);
if (!ok) { if (!ok) {
g_warning ("Error %s ModemManager call to `%s': %s", g_warning ("Error %s MM call '%s': %s (domain: %s [%d])",
data->desc, data->desc,
calls_call_get_id (CALLS_CALL (data->self)), mm_call_get_path (mm_call),
error->message); error->message,
g_quark_to_string (error->domain),
error->code);
CALLS_ERROR (data->self, error); CALLS_ERROR (data->self, error);
} }
@ -263,13 +282,18 @@ constructed (GObject *object)
CallsMMCall *self = CALLS_MM_CALL (object); CallsMMCall *self = CALLS_MM_CALL (object);
MmGdbusCall *gdbus_call = MM_GDBUS_CALL (self->mm_call); MmGdbusCall *gdbus_call = MM_GDBUS_CALL (self->mm_call);
MMCallState state; MMCallState state;
MMCallDirection direction;
const char *number;
const char *path;
gboolean outgoing;
g_signal_connect_swapped (gdbus_call, "notify::number", g_signal_connect_swapped (gdbus_call, "notify::number",
G_CALLBACK (notify_id_cb), self); G_CALLBACK (notify_id_cb), self);
g_signal_connect_swapped (gdbus_call, "state-changed", g_signal_connect_swapped (gdbus_call, "state-changed",
G_CALLBACK (state_changed_cb), self); G_CALLBACK (state_changed_cb), self);
notify_id_cb (self, mm_call_get_number (self->mm_call)); number = mm_call_get_number (self->mm_call);
notify_id_cb (self, number);
state = mm_call_get_state (self->mm_call); state = mm_call_get_state (self->mm_call);
state_changed_cb (self, state_changed_cb (self,
@ -277,11 +301,26 @@ constructed (GObject *object)
state, state,
mm_call_get_state_reason (self->mm_call)); mm_call_get_state_reason (self->mm_call));
direction = mm_call_get_direction (self->mm_call);
outgoing = direction == MM_CALL_DIRECTION_OUTGOING;
/* Start outgoing call */ /* Start outgoing call */
if (state == MM_CALL_STATE_UNKNOWN if (state == MM_CALL_STATE_UNKNOWN &&
&& mm_call_get_direction (self->mm_call) == MM_CALL_DIRECTION_OUTGOING) outgoing)
calls_mm_call_start_call (CALLS_CALL (self)); calls_mm_call_start_call (CALLS_CALL (self));
path = mm_call_get_path (self->mm_call);
if (direction == MM_CALL_DIRECTION_UNKNOWN)
g_debug ("New call (%s) with '%s'",
path, number);
else
g_debug ("New %s call (%s) %s %s",
outgoing ? "outgoing" : "incoming",
path,
outgoing ? "to" : "from",
number);
G_OBJECT_CLASS (calls_mm_call_parent_class)->constructed (object); G_OBJECT_CLASS (calls_mm_call_parent_class)->constructed (object);
} }