diff options
author | Thomas Haller <thaller@redhat.com> | 2014-02-24 11:44:04 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2014-02-24 18:29:25 +0100 |
commit | 184d93ea60647dc82fa4653f3ddb4cbb0380a95c (patch) | |
tree | 7843bc94a40070e8372c361c1bc457a8946e3a22 /src/rdisc/nm-rdisc.c | |
parent | 076ca1e3e2bf0e775e41f87e300a479090523c5a (diff) | |
download | NetworkManager-184d93ea60647dc82fa4653f3ddb4cbb0380a95c.tar.gz |
rdisc: print gateway for routes in rdisc debugging output
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/rdisc/nm-rdisc.c')
-rw-r--r-- | src/rdisc/nm-rdisc.c | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 4aad3e50e7..3373feda64 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -24,6 +24,7 @@ #include "nm-rdisc.h" #include "nm-logging.h" +#include "nm-utils.h" #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__) @@ -103,37 +104,41 @@ config_changed (NMRDisc *rdisc, NMRDiscConfigMap changed) char changedstr[CONFIG_MAP_MAX_STR]; char addrstr[INET6_ADDRSTRLEN]; - config_map_to_string (changed, changedstr); - debug ("(%s): router discovery configuration changed [%s]:", rdisc->ifname, changedstr); - debug (" dhcp-level %s", dhcp_level_to_string (rdisc->dhcp_level)); - for (i = 0; i < rdisc->gateways->len; i++) { - NMRDiscGateway *gateway = &g_array_index (rdisc->gateways, NMRDiscGateway, i); - - inet_ntop (AF_INET6, &gateway->address, addrstr, sizeof (addrstr)); - debug (" gateway %s pref %d exp %u", addrstr, gateway->preference, expiry (gateway)); - } - for (i = 0; i < rdisc->addresses->len; i++) { - NMRDiscAddress *address = &g_array_index (rdisc->addresses, NMRDiscAddress, i); - - inet_ntop (AF_INET6, &address->address, addrstr, sizeof (addrstr)); - debug (" address %s exp %u", addrstr, expiry (address)); - } - for (i = 0; i < rdisc->routes->len; i++) { - NMRDiscRoute *route = &g_array_index (rdisc->routes, NMRDiscRoute, i); - - inet_ntop (AF_INET6, &route->network, addrstr, sizeof (addrstr)); - debug (" route %s/%d pref %d exp %u", addrstr, route->plen, route->preference, expiry (route)); - } - for (i = 0; i < rdisc->dns_servers->len; i++) { - NMRDiscDNSServer *dns_server = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i); - - inet_ntop (AF_INET6, &dns_server->address, addrstr, sizeof (addrstr)); - debug (" dns_server %s exp %u", addrstr, expiry (dns_server)); - } - for (i = 0; i < rdisc->dns_domains->len; i++) { - NMRDiscDNSDomain *dns_domain = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i); - - debug (" dns_domain %s exp %u", dns_domain->domain, expiry (dns_domain)); + if (nm_logging_enabled (LOGL_DEBUG, LOGD_IP6)) { + config_map_to_string (changed, changedstr); + debug ("(%s): router discovery configuration changed [%s]:", rdisc->ifname, changedstr); + debug (" dhcp-level %s", dhcp_level_to_string (rdisc->dhcp_level)); + for (i = 0; i < rdisc->gateways->len; i++) { + NMRDiscGateway *gateway = &g_array_index (rdisc->gateways, NMRDiscGateway, i); + + inet_ntop (AF_INET6, &gateway->address, addrstr, sizeof (addrstr)); + debug (" gateway %s pref %d exp %u", addrstr, gateway->preference, expiry (gateway)); + } + for (i = 0; i < rdisc->addresses->len; i++) { + NMRDiscAddress *address = &g_array_index (rdisc->addresses, NMRDiscAddress, i); + + inet_ntop (AF_INET6, &address->address, addrstr, sizeof (addrstr)); + debug (" address %s exp %u", addrstr, expiry (address)); + } + for (i = 0; i < rdisc->routes->len; i++) { + NMRDiscRoute *route = &g_array_index (rdisc->routes, NMRDiscRoute, i); + + inet_ntop (AF_INET6, &route->network, addrstr, sizeof (addrstr)); + debug (" route %s/%d via %s pref %d exp %u", addrstr, route->plen, + nm_utils_inet6_ntop (&route->gateway, NULL), route->preference, + expiry (route)); + } + for (i = 0; i < rdisc->dns_servers->len; i++) { + NMRDiscDNSServer *dns_server = &g_array_index (rdisc->dns_servers, NMRDiscDNSServer, i); + + inet_ntop (AF_INET6, &dns_server->address, addrstr, sizeof (addrstr)); + debug (" dns_server %s exp %u", addrstr, expiry (dns_server)); + } + for (i = 0; i < rdisc->dns_domains->len; i++) { + NMRDiscDNSDomain *dns_domain = &g_array_index (rdisc->dns_domains, NMRDiscDNSDomain, i); + + debug (" dns_domain %s exp %u", dns_domain->domain, expiry (dns_domain)); + } } } |