colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error-helpers: port to use object logging

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-04 14:37:42 +02:00
parent bac9ed21cb
commit a2b57474dc
11 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/icera/mm-broadband-bearer-icera.c
View File

@@ -483,8 +483,11 @@ ier_query_ready (MMBaseModem *modem,
GAsyncResult *res, GAsyncResult *res,
GTask *task) GTask *task)
{ {
const gchar *response; MMBroadbandBearerIcera *self;
GError *activation_error = NULL; const gchar *response;
GError *activation_error = NULL;
self = g_task_get_source_object (task);
response = mm_base_modem_at_command_full_finish (modem, res, NULL); response = mm_base_modem_at_command_full_finish (modem, res, NULL);
if (response) { if (response) {
@@ -497,8 +500,7 @@ ier_query_ready (MMBaseModem *modem,
* 33 - Requested service option not subscribed * 33 - Requested service option not subscribed
*/ */
if (nw_activation_err == 27 || nw_activation_err == 33) if (nw_activation_err == 27 || nw_activation_err == 33)
activation_error = mm_mobile_equipment_error_for_code ( activation_error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_GPRS_SERVICE_OPTION_NOT_SUBSCRIBED, self);
MM_MOBILE_EQUIPMENT_ERROR_GPRS_SERVICE_OPTION_NOT_SUBSCRIBED);
} }
} }

2
src/mm-base-call.c
View File

@@ -169,7 +169,7 @@ handle_start_ready (MMBaseCall *self,
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) || if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) ||
g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED)) { g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_CANCELLED)) {
g_clear_error (&error); g_clear_error (&error);
error = mm_connection_error_for_code (MM_CONNECTION_ERROR_NO_DIALTONE); error = mm_connection_error_for_code (MM_CONNECTION_ERROR_NO_DIALTONE, self);
} }
/* Convert errors into call state updates */ /* Convert errors into call state updates */

6
src/mm-broadband-modem-mbim.c
View File

@@ -995,12 +995,12 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
* The MC7710 may use this while the SIM is not ready yet. */ * The MC7710 may use this while the SIM is not ready yet. */
break; break;
case MBIM_SUBSCRIBER_READY_STATE_BAD_SIM: case MBIM_SUBSCRIBER_READY_STATE_BAD_SIM:
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG, self);
break; break;
case MBIM_SUBSCRIBER_READY_STATE_FAILURE: case MBIM_SUBSCRIBER_READY_STATE_FAILURE:
case MBIM_SUBSCRIBER_READY_STATE_NOT_ACTIVATED: case MBIM_SUBSCRIBER_READY_STATE_NOT_ACTIVATED:
default: default:
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_FAILURE); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_FAILURE, self);
break; break;
} }
} }
@@ -1020,7 +1020,7 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
/* All retries consumed? issue error */ /* All retries consumed? issue error */
if (ctx->last_attempt) { if (ctx->last_attempt) {
if (ready_state == MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED) if (ready_state == MBIM_SUBSCRIBER_READY_STATE_SIM_NOT_INSERTED)
g_task_return_error (task, mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED)); g_task_return_error (task, mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_NOT_INSERTED, self));
else else
g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED, g_task_return_new_error (task, MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
"Error waiting for SIM to get initialized"); "Error waiting for SIM to get initialized");

2
src/mm-broadband-modem.c
View File

@@ -9682,7 +9682,7 @@ run_cdma_registration_checks_ready (MMBroadbandModem *self,
mm_iface_modem_cdma_update_access_technologies ( mm_iface_modem_cdma_update_access_technologies (
MM_IFACE_MODEM_CDMA (self), MM_IFACE_MODEM_CDMA (self),
MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN); MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN);
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT, self);
g_task_return_error (task, error); g_task_return_error (task, error);
g_object_unref (task); g_object_unref (task);
return; return;

25
src/mm-error-helpers.c
View File

@@ -29,7 +29,8 @@ typedef struct {
/* --- Connection errors --- */ /* --- Connection errors --- */
GError * GError *
mm_connection_error_for_code (MMConnectionError code) mm_connection_error_for_code (MMConnectionError code,
gpointer log_object)
{ {
const gchar *msg; const gchar *msg;
@@ -51,7 +52,7 @@ mm_connection_error_for_code (MMConnectionError code)
break; break;
default: default:
mm_dbg ("Invalid connection error code: %u", code); mm_obj_dbg (log_object, "invalid connection error code: %u", code);
/* uhm... make something up (yes, ok, lie!). */ /* uhm... make something up (yes, ok, lie!). */
code = MM_CONNECTION_ERROR_NO_CARRIER; code = MM_CONNECTION_ERROR_NO_CARRIER;
msg = "No carrier"; msg = "No carrier";
@@ -149,7 +150,8 @@ static ErrorTable me_errors[] = {
}; };
GError * GError *
mm_mobile_equipment_error_for_code (MMMobileEquipmentError code) mm_mobile_equipment_error_for_code (MMMobileEquipmentError code,
gpointer log_object)
{ {
guint i; guint i;
@@ -162,14 +164,15 @@ mm_mobile_equipment_error_for_code (MMMobileEquipmentError code)
} }
/* Not found? Then, default */ /* Not found? Then, default */
mm_dbg ("Invalid mobile equipment error code: %u", (guint)code); mm_obj_dbg (log_object, "invalid mobile equipment error code: %u", (guint)code);
return g_error_new (MM_MOBILE_EQUIPMENT_ERROR, return g_error_new (MM_MOBILE_EQUIPMENT_ERROR,
MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN,
"Unknown error"); "Unknown error");
} }
GError * GError *
mm_mobile_equipment_error_for_string (const gchar *str) mm_mobile_equipment_error_for_string (const gchar *str,
gpointer log_object)
{ {
MMMobileEquipmentError code = MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN; MMMobileEquipmentError code = MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN;
const gchar *msg = NULL; const gchar *msg = NULL;
@@ -198,7 +201,7 @@ mm_mobile_equipment_error_for_string (const gchar *str)
/* Not found? Then, default */ /* Not found? Then, default */
if (!msg) { if (!msg) {
mm_dbg ("Invalid mobile equipment error string: '%s' (%s)", str, buf); mm_obj_dbg (log_object, "invalid mobile equipment error string: '%s' (%s)", str, buf);
code = MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN; code = MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN;
msg = "Unknown error"; msg = "Unknown error";
} }
@@ -236,7 +239,8 @@ static ErrorTable msg_errors[] = {
}; };
GError * GError *
mm_message_error_for_code (MMMessageError code) mm_message_error_for_code (MMMessageError code,
gpointer log_object)
{ {
guint i; guint i;
@@ -249,14 +253,15 @@ mm_message_error_for_code (MMMessageError code)
} }
/* Not found? Then, default */ /* Not found? Then, default */
mm_dbg ("Invalid message error code: %u", (guint)code); mm_obj_dbg (log_object, "invalid message error code: %u", (guint)code);
return g_error_new (MM_MESSAGE_ERROR, return g_error_new (MM_MESSAGE_ERROR,
MM_MESSAGE_ERROR_UNKNOWN, MM_MESSAGE_ERROR_UNKNOWN,
"Unknown error"); "Unknown error");
} }
GError * GError *
mm_message_error_for_string (const gchar *str) mm_message_error_for_string (const gchar *str,
gpointer log_object)
{ {
MMMessageError code = MM_MESSAGE_ERROR_UNKNOWN; MMMessageError code = MM_MESSAGE_ERROR_UNKNOWN;
const gchar *msg = NULL; const gchar *msg = NULL;
@@ -285,7 +290,7 @@ mm_message_error_for_string (const gchar *str)
/* Not found? Then, default */ /* Not found? Then, default */
if (!msg) { if (!msg) {
mm_dbg ("Invalid message error string: '%s' (%s)", str, buf); mm_obj_dbg (log_object, "invalid message error string: '%s' (%s)", str, buf);
code = MM_MESSAGE_ERROR_UNKNOWN; code = MM_MESSAGE_ERROR_UNKNOWN;
msg = "Unknown error"; msg = "Unknown error";
} }

10
src/mm-error-helpers.h
View File

@@ -23,10 +23,10 @@
#include <ModemManager.h> #include <ModemManager.h>
#include <libmm-glib.h> #include <libmm-glib.h>
GError *mm_connection_error_for_code (MMConnectionError code); GError *mm_connection_error_for_code (MMConnectionError code, gpointer log_object);
GError *mm_mobile_equipment_error_for_code (MMMobileEquipmentError code); GError *mm_mobile_equipment_error_for_code (MMMobileEquipmentError code, gpointer log_object);
GError *mm_mobile_equipment_error_for_string (const gchar *str); GError *mm_mobile_equipment_error_for_string (const gchar *str, gpointer log_object);
GError *mm_message_error_for_code (MMMessageError code); GError *mm_message_error_for_code (MMMessageError code, gpointer log_object);
GError *mm_message_error_for_string (const gchar *str); GError *mm_message_error_for_string (const gchar *str, gpointer log_object);
#endif /* MM_ERROR_HELPERS_H */ #endif /* MM_ERROR_HELPERS_H */

4
src/mm-iface-modem-3gpp.c
View File

@@ -311,7 +311,7 @@ run_registration_checks_ready (MMIfaceModem3gpp *self,
mm_obj_dbg (self, "registration denied"); mm_obj_dbg (self, "registration denied");
register_in_network_context_complete_failed ( register_in_network_context_complete_failed (
task, task,
mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_NOT_ALLOWED)); mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_NOT_ALLOWED, self));
return; return;
} }
@@ -333,7 +333,7 @@ run_registration_checks_ready (MMIfaceModem3gpp *self,
mm_obj_dbg (self, "3GPP registration check timed out"); mm_obj_dbg (self, "3GPP registration check timed out");
register_in_network_context_complete_failed ( register_in_network_context_complete_failed (
task, task,
mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT)); mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT, self));
return; return;
} }

2
src/mm-iface-modem-simple.c
View File

@@ -164,7 +164,7 @@ check_next_registration (GTask *task)
/* No more tries of anything */ /* No more tries of anything */
g_task_return_error ( g_task_return_error (
task, task,
mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT)); mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT, self));
g_object_unref (task); g_object_unref (task);
} }

16
src/mm-serial-parsers.c
View File

@@ -239,7 +239,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_mobile_equipment_error_for_code (atoi (str)); local_error = mm_mobile_equipment_error_for_code (atoi (str), log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -252,7 +252,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_mobile_equipment_error_for_code (atoi (str)); local_error = mm_mobile_equipment_error_for_code (atoi (str), log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -264,7 +264,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_message_error_for_code (atoi (str)); local_error = mm_message_error_for_code (atoi (str), log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -276,7 +276,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_mobile_equipment_error_for_string (str); local_error = mm_mobile_equipment_error_for_string (str, log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -288,7 +288,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_message_error_for_string (str); local_error = mm_message_error_for_string (str, log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -300,7 +300,7 @@ mm_serial_parser_v1_parse (gpointer data,
if (found) { if (found) {
str = g_match_info_fetch (match_info, 1); str = g_match_info_fetch (match_info, 1);
g_assert (str); g_assert (str);
local_error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN); local_error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN, log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -310,7 +310,7 @@ mm_serial_parser_v1_parse (gpointer data,
response->str, response->len, response->str, response->len,
0, 0, &match_info, NULL); 0, 0, &match_info, NULL);
if (found) { if (found) {
local_error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN); local_error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN, log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);
@@ -338,7 +338,7 @@ mm_serial_parser_v1_parse (gpointer data,
code = MM_CONNECTION_ERROR_NO_CARRIER; code = MM_CONNECTION_ERROR_NO_CARRIER;
} }
local_error = mm_connection_error_for_code (code); local_error = mm_connection_error_for_code (code, log_object);
goto done; goto done;
} }
g_match_info_free (match_info); g_match_info_free (match_info);

8
src/mm-sim-mbim.c
View File

@@ -382,10 +382,10 @@ pin_set_enter_ready (MbimDevice *device,
/* Sending PIN failed, build a better error to report */ /* Sending PIN failed, build a better error to report */
if (pin_type == MBIM_PIN_TYPE_PIN1 && pin_state == MBIM_PIN_STATE_LOCKED) { if (pin_type == MBIM_PIN_TYPE_PIN1 && pin_state == MBIM_PIN_STATE_LOCKED) {
g_error_free (error); g_error_free (error);
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_INCORRECT_PASSWORD); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_INCORRECT_PASSWORD, self);
} else if (pin_type == MBIM_PIN_TYPE_PUK1 && pin_state == MBIM_PIN_STATE_LOCKED) { } else if (pin_type == MBIM_PIN_TYPE_PUK1 && pin_state == MBIM_PIN_STATE_LOCKED) {
g_error_free (error); g_error_free (error);
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_PUK); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_PUK, self);
} }
} }
} }
@@ -480,9 +480,9 @@ puk_set_enter_ready (MbimDevice *device,
if (pin_type == MBIM_PIN_TYPE_PUK1 && pin_state == MBIM_PIN_STATE_LOCKED) { if (pin_type == MBIM_PIN_TYPE_PUK1 && pin_state == MBIM_PIN_STATE_LOCKED) {
g_error_free (error); g_error_free (error);
if (remaining_attempts == 0) if (remaining_attempts == 0)
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_SIM_WRONG, self);
else else
error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_INCORRECT_PASSWORD); error = mm_mobile_equipment_error_for_code (MM_MOBILE_EQUIPMENT_ERROR_INCORRECT_PASSWORD, self);
} }
} }
} }

2
src/tests/test-error-helpers.c
View File

@@ -38,7 +38,7 @@
\ \
enum_value = g_enum_get_value (enum_class, i); \ enum_value = g_enum_get_value (enum_class, i); \
if (enum_value) { \ if (enum_value) { \
error = mm_## ERROR_SMALL ## _for_code ((MM##ERROR_CAMEL)i); \ error = mm_## ERROR_SMALL ## _for_code ((MM##ERROR_CAMEL)i, NULL); \
g_assert_error (error, MM_ ## ERROR_CAPS, i); \ g_assert_error (error, MM_ ## ERROR_CAPS, i); \
g_error_free (error); \ g_error_free (error); \
} \ } \