diff options
Diffstat (limited to 'src/mm-bearer-qmi.c')
-rw-r--r-- | src/mm-bearer-qmi.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index ef7ac1b1..2612316c 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -848,7 +848,7 @@ get_ipv4_config (MMBearerQmi *self, return NULL; } - mm_obj_info (self, "QMI IPv4 Settings:"); + mm_obj_msg (self, "QMI IPv4 Settings:"); config = mm_bearer_ip_config_new (); mm_bearer_ip_config_set_method (config, ip_method); @@ -857,15 +857,15 @@ get_ipv4_config (MMBearerQmi *self, qmi_inet4_ntop (addr, buf, sizeof (buf)); mm_bearer_ip_config_set_address (config, buf); mm_bearer_ip_config_set_prefix (config, prefix); - mm_obj_info (self, " address: %s/%d", buf, prefix); + mm_obj_msg (self, " address: %s/%d", buf, prefix); /* IPv4 gateway address */ if (qmi_message_wds_get_current_settings_output_get_ipv4_gateway_address (output, &addr, &error)) { qmi_inet4_ntop (addr, buf, sizeof (buf)); mm_bearer_ip_config_set_gateway (config, buf); - mm_obj_info (self, " gateway: %s", buf); + mm_obj_msg (self, " gateway: %s", buf); } else { - mm_obj_info (self, " gateway: failed (%s)", error->message); + mm_obj_msg (self, " gateway: failed (%s)", error->message); g_clear_error (&error); } @@ -873,9 +873,9 @@ get_ipv4_config (MMBearerQmi *self, if (qmi_message_wds_get_current_settings_output_get_primary_ipv4_dns_address (output, &addr, &error)) { qmi_inet4_ntop (addr, buf, sizeof (buf)); dns[dns_idx++] = buf; - mm_obj_info (self, " DNS #1: %s", buf); + mm_obj_msg (self, " DNS #1: %s", buf); } else { - mm_obj_info (self, " DNS #1: failed (%s)", error->message); + mm_obj_msg (self, " DNS #1: failed (%s)", error->message); g_clear_error (&error); } @@ -883,9 +883,9 @@ get_ipv4_config (MMBearerQmi *self, if (qmi_message_wds_get_current_settings_output_get_secondary_ipv4_dns_address (output, &addr, &error)) { qmi_inet4_ntop (addr, buf2, sizeof (buf2)); dns[dns_idx++] = buf2; - mm_obj_info (self, " DNS #2: %s", buf2); + mm_obj_msg (self, " DNS #2: %s", buf2); } else { - mm_obj_info (self, " DNS #2: failed (%s)", error->message); + mm_obj_msg (self, " DNS #2: failed (%s)", error->message); g_clear_error (&error); } @@ -894,7 +894,7 @@ get_ipv4_config (MMBearerQmi *self, if (mtu) { mm_bearer_ip_config_set_mtu (config, mtu); - mm_obj_info (self, " MTU: %d", mtu); + mm_obj_msg (self, " MTU: %d", mtu); } return config; @@ -941,7 +941,7 @@ get_ipv6_config (MMBearerQmi *self, return NULL; } - mm_obj_info (self, "QMI IPv6 Settings:"); + mm_obj_msg (self, "QMI IPv6 Settings:"); config = mm_bearer_ip_config_new (); mm_bearer_ip_config_set_method (config, ip_method); @@ -951,15 +951,15 @@ get_ipv6_config (MMBearerQmi *self, mm_bearer_ip_config_set_address (config, buf); mm_bearer_ip_config_set_prefix (config, prefix); - mm_obj_info (self, " address: %s/%d", buf, prefix); + mm_obj_msg (self, " address: %s/%d", buf, prefix); /* IPv6 gateway address */ if (qmi_message_wds_get_current_settings_output_get_ipv6_gateway_address (output, &array, &prefix, &error)) { qmi_inet6_ntop (array, buf, sizeof (buf)); mm_bearer_ip_config_set_gateway (config, buf); - mm_obj_info (self, " gateway: %s/%d", buf, prefix); + mm_obj_msg (self, " gateway: %s/%d", buf, prefix); } else { - mm_obj_info (self, " gateway: failed (%s)", error->message); + mm_obj_msg (self, " gateway: failed (%s)", error->message); g_clear_error (&error); } @@ -967,9 +967,9 @@ get_ipv6_config (MMBearerQmi *self, if (qmi_message_wds_get_current_settings_output_get_ipv6_primary_dns_address (output, &array, &error)) { qmi_inet6_ntop (array, buf, sizeof (buf)); dns[dns_idx++] = buf; - mm_obj_info (self, " DNS #1: %s", buf); + mm_obj_msg (self, " DNS #1: %s", buf); } else { - mm_obj_info (self, " DNS #1: failed (%s)", error->message); + mm_obj_msg (self, " DNS #1: failed (%s)", error->message); g_clear_error (&error); } @@ -977,9 +977,9 @@ get_ipv6_config (MMBearerQmi *self, if (qmi_message_wds_get_current_settings_output_get_ipv6_secondary_dns_address (output, &array, &error)) { qmi_inet6_ntop (array, buf2, sizeof (buf2)); dns[dns_idx++] = buf2; - mm_obj_info (self, " DNS #2: %s", buf2); + mm_obj_msg (self, " DNS #2: %s", buf2); } else { - mm_obj_info (self, " DNS #2: failed (%s)", error->message); + mm_obj_msg (self, " DNS #2: failed (%s)", error->message); g_clear_error (&error); } @@ -988,7 +988,7 @@ get_ipv6_config (MMBearerQmi *self, if (mtu) { mm_bearer_ip_config_set_mtu (config, mtu); - mm_obj_info (self, " MTU: %d", mtu); + mm_obj_msg (self, " MTU: %d", mtu); } return config; @@ -1215,11 +1215,11 @@ mobile_equipment_error_from_start_network_output (MMBearerQmi verbose_cer_type_str = qmi_wds_verbose_call_end_reason_type_get_string (verbose_cer_type); verbose_cer_reason_str = qmi_wds_verbose_call_end_reason_get_string (verbose_cer_type, verbose_cer_reason); - mm_obj_info (self, "verbose call end reason (%u,%d): [%s] %s", - verbose_cer_type, - verbose_cer_reason, - verbose_cer_type_str, - verbose_cer_reason_str); + mm_obj_msg (self, "verbose call end reason (%u,%d): [%s] %s", + verbose_cer_type, + verbose_cer_reason, + verbose_cer_type_str, + verbose_cer_reason_str); /* If we have a 3GPP verbose call end reason, we try to build an error * with the exact error code and message */ @@ -1237,7 +1237,7 @@ mobile_equipment_error_from_start_network_output (MMBearerQmi const gchar *cer_str; cer_str = qmi_wds_call_end_reason_get_string (cer); - mm_obj_info (self, "call end reason (%u): %s", cer, cer_str); + mm_obj_msg (self, "call end reason (%u): %s", cer, cer_str); return g_error_new (MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN, "Call failed: %s", cer_str); @@ -1277,7 +1277,7 @@ start_network_ready (QmiClientWds *client, ctx->packet_data_handle_ipv6 = GLOBAL_PACKET_DATA_HANDLE; /* Fall down to a successful connection */ } else { - mm_obj_info (self, "couldn't start network: %s", error->message); + mm_obj_msg (self, "couldn't start network: %s", error->message); if (g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_CALL_FAILED)) { g_clear_error (&error); error = mobile_equipment_error_from_start_network_output (self, output); @@ -1382,11 +1382,11 @@ packet_service_status_indication_cb (QmiClientWds *client, verbose_cer_type_str = qmi_wds_verbose_call_end_reason_type_get_string (verbose_cer_type); verbose_cer_reason_str = qmi_wds_verbose_call_end_reason_get_string (verbose_cer_type, verbose_cer_reason); - mm_obj_info (self, "verbose call end reason (%u,%d): [%s] %s", - verbose_cer_type, - verbose_cer_reason, - verbose_cer_type_str, - verbose_cer_reason_str); + mm_obj_msg (self, "verbose call end reason (%u,%d): [%s] %s", + verbose_cer_type, + verbose_cer_reason, + verbose_cer_type_str, + verbose_cer_reason_str); /* If we have a 3GPP verbose call end reason, we try to build an error * with the exact error code and message */ @@ -1402,7 +1402,7 @@ packet_service_status_indication_cb (QmiClientWds *client, const gchar *cer_str; cer_str = qmi_wds_call_end_reason_get_string (cer); - mm_obj_info (self, "call end reason (%u): %s", cer, cer_str); + mm_obj_msg (self, "call end reason (%u): %s", cer, cer_str); connection_error = g_error_new (MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_UNKNOWN, "Call failed: %s", cer_str); @@ -1761,7 +1761,7 @@ setup_link_ready (MMPortQmi *qmi, /* From now on link_name will be set, and we'll use that to know * whether we should cleanup the link upon a connection failure */ - mm_obj_info (ctx->self, "net link %s created (mux id %u)", ctx->link_name, ctx->mux_id); + mm_obj_msg (ctx->self, "net link %s created (mux id %u)", ctx->link_name, ctx->mux_id); /* Wait for the data port with the given interface name, which will be * added asynchronously */ |