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

bearer-qmi: print IP details at 'info' log level

Browse Source
This commit is contained in:
Dan Williams
2016-01-19 17:19:22 -06:00
parent 3b97d7e3d7
commit 98c58ca64b
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mm-bearer-qmi.c
View File

@@ -451,7 +451,7 @@ get_ipv4_config (MMBearerQmi *self,
/* IPv4 subnet mask */ /* IPv4 subnet mask */
if (!qmi_message_wds_get_current_settings_output_get_ipv4_gateway_subnet_mask (output, &addr, &error)) { if (!qmi_message_wds_get_current_settings_output_get_ipv4_gateway_subnet_mask (output, &addr, &error)) {
mm_dbg ("Failed to read IPv4 netmask (%s)", error->message); mm_warn ("Failed to read IPv4 netmask (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
return NULL; return NULL;
} }
@@ -460,12 +460,12 @@ get_ipv4_config (MMBearerQmi *self,
/* IPv4 address */ /* IPv4 address */
if (!qmi_message_wds_get_current_settings_output_get_ipv4_address (output, &addr, &error)) { if (!qmi_message_wds_get_current_settings_output_get_ipv4_address (output, &addr, &error)) {
mm_dbg ("IPv4 family but no IPv4 address (%s)", error->message); mm_warn ("IPv4 family but no IPv4 address (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
return NULL; return NULL;
} }
mm_dbg ("QMI IPv4 Settings:"); mm_info ("QMI IPv4 Settings:");
config = mm_bearer_ip_config_new (); config = mm_bearer_ip_config_new ();
if (self->priv->force_dhcp) if (self->priv->force_dhcp)
@@ -478,15 +478,15 @@ get_ipv4_config (MMBearerQmi *self,
qmi_inet4_ntop (addr, buf, sizeof (buf)); qmi_inet4_ntop (addr, buf, sizeof (buf));
mm_bearer_ip_config_set_address (config, buf); mm_bearer_ip_config_set_address (config, buf);
mm_bearer_ip_config_set_prefix (config, prefix); mm_bearer_ip_config_set_prefix (config, prefix);
mm_dbg (" Address: %s/%d", buf, prefix); mm_info (" Address: %s/%d", buf, prefix);
/* IPv4 gateway address */ /* IPv4 gateway address */
if (qmi_message_wds_get_current_settings_output_get_ipv4_gateway_address (output, &addr, &error)) { if (qmi_message_wds_get_current_settings_output_get_ipv4_gateway_address (output, &addr, &error)) {
qmi_inet4_ntop (addr, buf, sizeof (buf)); qmi_inet4_ntop (addr, buf, sizeof (buf));
mm_bearer_ip_config_set_gateway (config, buf); mm_bearer_ip_config_set_gateway (config, buf);
mm_dbg (" Gateway: %s", buf); mm_info (" Gateway: %s", buf);
} else { } else {
mm_dbg (" Gateway: failed (%s)", error->message); mm_info (" Gateway: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -494,9 +494,9 @@ get_ipv4_config (MMBearerQmi *self,
if (qmi_message_wds_get_current_settings_output_get_primary_ipv4_dns_address (output, &addr, &error)) { if (qmi_message_wds_get_current_settings_output_get_primary_ipv4_dns_address (output, &addr, &error)) {
qmi_inet4_ntop (addr, buf, sizeof (buf)); qmi_inet4_ntop (addr, buf, sizeof (buf));
dns[dns_idx++] = buf; dns[dns_idx++] = buf;
mm_dbg (" DNS #1: %s", buf); mm_info (" DNS #1: %s", buf);
} else { } else {
mm_dbg (" DNS #1: failed (%s)", error->message); mm_info (" DNS #1: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -504,9 +504,9 @@ get_ipv4_config (MMBearerQmi *self,
if (qmi_message_wds_get_current_settings_output_get_secondary_ipv4_dns_address (output, &addr, &error)) { if (qmi_message_wds_get_current_settings_output_get_secondary_ipv4_dns_address (output, &addr, &error)) {
qmi_inet4_ntop (addr, buf2, sizeof (buf2)); qmi_inet4_ntop (addr, buf2, sizeof (buf2));
dns[dns_idx++] = buf2; dns[dns_idx++] = buf2;
mm_dbg (" DNS #2: %s", buf2); mm_info (" DNS #2: %s", buf2);
} else { } else {
mm_dbg (" DNS #2: failed (%s)", error->message); mm_info (" DNS #2: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -515,7 +515,7 @@ get_ipv4_config (MMBearerQmi *self,
if (mtu) { if (mtu) {
mm_bearer_ip_config_set_mtu (config, mtu); mm_bearer_ip_config_set_mtu (config, mtu);
mm_dbg (" MTU: %d", mtu); mm_info (" MTU: %d", mtu);
} }
return config; return config;
@@ -556,12 +556,12 @@ get_ipv6_config (MMBearerQmi *self,
/* If the message has an IPv6 address, create an IPv6 bearer config */ /* If the message has an IPv6 address, create an IPv6 bearer config */
if (!qmi_message_wds_get_current_settings_output_get_ipv6_address (output, &array, &prefix, &error)) { if (!qmi_message_wds_get_current_settings_output_get_ipv6_address (output, &array, &prefix, &error)) {
mm_dbg ("IPv6 family but no IPv6 address (%s)", error->message); mm_warn ("IPv6 family but no IPv6 address (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
return NULL; return NULL;
} }
mm_dbg ("QMI IPv6 Settings:"); mm_info ("QMI IPv6 Settings:");
config = mm_bearer_ip_config_new (); config = mm_bearer_ip_config_new ();
if (self->priv->force_dhcp) if (self->priv->force_dhcp)
@@ -575,15 +575,15 @@ get_ipv6_config (MMBearerQmi *self,
mm_bearer_ip_config_set_address (config, buf); mm_bearer_ip_config_set_address (config, buf);
mm_bearer_ip_config_set_prefix (config, prefix); mm_bearer_ip_config_set_prefix (config, prefix);
mm_dbg (" Address: %s/%d", buf, prefix); mm_info (" Address: %s/%d", buf, prefix);
/* IPv6 gateway address */ /* IPv6 gateway address */
if (qmi_message_wds_get_current_settings_output_get_ipv6_gateway_address (output, &array, &prefix, &error)) { if (qmi_message_wds_get_current_settings_output_get_ipv6_gateway_address (output, &array, &prefix, &error)) {
qmi_inet6_ntop (array, buf, sizeof (buf)); qmi_inet6_ntop (array, buf, sizeof (buf));
mm_bearer_ip_config_set_gateway (config, buf); mm_bearer_ip_config_set_gateway (config, buf);
mm_dbg (" Gateway: %s/%d", buf, prefix); mm_info (" Gateway: %s/%d", buf, prefix);
} else { } else {
mm_dbg (" Gateway: failed (%s)", error->message); mm_info (" Gateway: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -591,9 +591,9 @@ get_ipv6_config (MMBearerQmi *self,
if (qmi_message_wds_get_current_settings_output_get_ipv6_primary_dns_address (output, &array, &error)) { if (qmi_message_wds_get_current_settings_output_get_ipv6_primary_dns_address (output, &array, &error)) {
qmi_inet6_ntop (array, buf, sizeof (buf)); qmi_inet6_ntop (array, buf, sizeof (buf));
dns[dns_idx++] = buf; dns[dns_idx++] = buf;
mm_dbg (" DNS #1: %s", buf); mm_info (" DNS #1: %s", buf);
} else { } else {
mm_dbg (" DNS #1: failed (%s)", error->message); mm_info (" DNS #1: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -601,9 +601,9 @@ get_ipv6_config (MMBearerQmi *self,
if (qmi_message_wds_get_current_settings_output_get_ipv6_secondary_dns_address (output, &array, &error)) { if (qmi_message_wds_get_current_settings_output_get_ipv6_secondary_dns_address (output, &array, &error)) {
qmi_inet6_ntop (array, buf2, sizeof (buf2)); qmi_inet6_ntop (array, buf2, sizeof (buf2));
dns[dns_idx++] = buf2; dns[dns_idx++] = buf2;
mm_dbg (" DNS #2: %s", buf2); mm_info (" DNS #2: %s", buf2);
} else { } else {
mm_dbg (" DNS #2: failed (%s)", error->message); mm_info (" DNS #2: failed (%s)", error->message);
g_clear_error (&error); g_clear_error (&error);
} }
@@ -612,7 +612,7 @@ get_ipv6_config (MMBearerQmi *self,
if (mtu) { if (mtu) {
mm_bearer_ip_config_set_mtu (config, mtu); mm_bearer_ip_config_set_mtu (config, mtu);
mm_dbg (" MTU: %d", mtu); mm_info (" MTU: %d", mtu);
} }
return config; return config;