diff options
| author | Thomas Haller <thaller@redhat.com> | 2013-10-30 22:11:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2013-12-09 17:21:22 +0100 |
| commit | 6f2cfe263eabd452ad4efeb979ca9ef1db0578d7 (patch) | |
| tree | 44d7fce164e5d0936edad7d59760e110bb3d01b3 /src/dns-manager | |
| parent | 41f8114359404ae2cf14724d84eccfc378e9317c (diff) | |
| download | NetworkManager-6f2cfe263eabd452ad4efeb979ca9ef1db0578d7.tar.gz | |
all: refactor to make use of nm_utils_inet[46]_ntop functions
https://bugzilla.gnome.org/show_bug.cgi?id=711684
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/dns-manager')
| -rw-r--r-- | src/dns-manager/nm-dns-dnsmasq.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 8e54f28da5..2df8626039 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -30,6 +30,7 @@ #include <glib/gi18n.h> #include "nm-dns-dnsmasq.h" +#include "nm-utils.h" #include "nm-logging.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" @@ -71,7 +72,7 @@ find_dnsmasq (void) static gboolean add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split) { - char buf[INET_ADDRSTRLEN + 1]; + char buf[INET_ADDRSTRLEN]; in_addr_t addr; int nnameservers, i_nameserver, n, i; gboolean added = FALSE; @@ -86,9 +87,7 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split) for (i_nameserver = 0; i_nameserver < nnameservers; i_nameserver++) { addr = nm_ip4_config_get_nameserver (ip4, i_nameserver); - memset (&buf[0], 0, sizeof (buf)); - if (!inet_ntop (AF_INET, &addr, buf, sizeof (buf))) - return FALSE; + nm_utils_inet4_ntop (addr, buf); /* searches are preferred over domains */ n = nm_ip4_config_get_num_searches (ip4); @@ -126,10 +125,8 @@ add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split) /* If no searches or domains, just add the namservers */ if (!added) { for (i = 0; i < nnameservers; i++) { - memset (&buf[0], 0, sizeof (buf)); addr = nm_ip4_config_get_nameserver (ip4, i); - if (inet_ntop (AF_INET, &addr, buf, sizeof (buf))) - g_string_append_printf (str, "server=%s\n", buf); + g_string_append_printf (str, "server=%s\n", nm_utils_inet4_ntop (addr, NULL)); } } |