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

cli: print IP details for all valid bearer types

Browse Source 
Even DHCP or PPP may have some IP details, like the link-local
address for IPv6 bearers.
This commit is contained in:
Dan Williams
2014-06-13 11:30:49 -05:00
parent 7673a1d3a3
commit 8017628353
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/mmcli-bearer.c
+34 -30
View File
@@ -189,27 +189,29 @@ print_bearer_info (MMBearer *bearer)
(ipv4_config ?
mm_bearer_ip_method_get_string (mm_bearer_ip_config_get_method (ipv4_config)) :
"none"));
if (ipv4_config) {
guint mtu;
if (ipv4_config &&
mm_bearer_ip_config_get_method (ipv4_config) != MM_BEARER_IP_METHOD_UNKNOWN) {
const gchar **dns = mm_bearer_ip_config_get_dns (ipv4_config);
guint i, mtu;
if (mm_bearer_ip_config_get_method (ipv4_config) == MM_BEARER_IP_METHOD_STATIC) {
const gchar **dns;
guint i;
g_print (" | address: '%s'\n"
" | prefix: '%u'\n"
" | gateway: '%s'\n",
VALIDATE_UNKNOWN (mm_bearer_ip_config_get_address (ipv4_config)),
mm_bearer_ip_config_get_prefix (ipv4_config),
VALIDATE_UNKNOWN (mm_bearer_ip_config_get_gateway (ipv4_config)));
dns = mm_bearer_ip_config_get_dns (ipv4_config);
g_print (" | address: '%s'\n"
" | prefix: '%u'\n"
" | gateway: '%s'\n"
" | DNS: '%s'",
VALIDATE_UNKNOWN (mm_bearer_ip_config_get_address (ipv4_config)),
mm_bearer_ip_config_get_prefix (ipv4_config),
VALIDATE_UNKNOWN (mm_bearer_ip_config_get_gateway (ipv4_config)),
VALIDATE_UNKNOWN (dns[0]));
if (dns && dns[0]) {
g_print (
" | DNS: '%s'", dns[0]);
/* Additional DNS addresses */
for (i = 1; dns[i]; i++)
g_print (", '%s'", dns[i]);
g_print ("\n");
} else {
g_print (
" | DNS: none");
}
g_print ("\n");
mtu = mm_bearer_ip_config_get_mtu (ipv4_config);
if (mtu)
@@ -222,27 +224,29 @@ print_bearer_info (MMBearer *bearer)
(ipv6_config ?
mm_bearer_ip_method_get_string (mm_bearer_ip_config_get_method (ipv6_config)) :
"none"));
if (ipv6_config) {
guint mtu;
if (ipv6_config &&
mm_bearer_ip_config_get_method (ipv6_config) != MM_BEARER_IP_METHOD_UNKNOWN) {
const gchar **dns = mm_bearer_ip_config_get_dns (ipv6_config);
guint i, mtu;
if (mm_bearer_ip_config_get_method (ipv6_config) == MM_BEARER_IP_METHOD_STATIC) {
const gchar **dns;
guint i;
g_print (" | address: '%s'\n"
" | prefix: '%u'\n"
" | gateway: '%s'\n",
VALIDATE_UNKNOWN(mm_bearer_ip_config_get_address (ipv6_config)),
mm_bearer_ip_config_get_prefix (ipv6_config),
VALIDATE_UNKNOWN(mm_bearer_ip_config_get_gateway (ipv6_config)));
dns = mm_bearer_ip_config_get_dns (ipv6_config);
g_print (" | address: '%s'\n"
" | prefix: '%u'\n"
" | gateway: '%s'\n"
" | DNS: '%s'",
VALIDATE_UNKNOWN(mm_bearer_ip_config_get_address (ipv6_config)),
mm_bearer_ip_config_get_prefix (ipv6_config),
VALIDATE_UNKNOWN(mm_bearer_ip_config_get_gateway (ipv6_config)),
VALIDATE_UNKNOWN(dns[0]));
if (dns && dns[0]) {
g_print (
" | DNS: '%s'", dns[0]);
/* Additional DNS addresses */
for (i = 1; dns[i]; i++)
g_print (", '%s'", dns[i]);
g_print ("\n");
} else {
g_print (
" | DNS: none");
}
g_print ("\n");
mtu = mm_bearer_ip_config_get_mtu (ipv6_config);
if (mtu)