diff options
author | Thomas Haller <thaller@redhat.com> | 2022-03-17 10:10:04 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2022-03-17 10:10:41 +0100 |
commit | 63d68e7f42b7377b34cfa58fb4b7994df3f3a98b (patch) | |
tree | 76192295bc1cfc4c4ae5ca325447fb9116511e0e | |
parent | 593d08db81f2c52ddd7bde6c1b4381f9fbfef875 (diff) | |
download | NetworkManager-63d68e7f42b7377b34cfa58fb4b7994df3f3a98b.tar.gz |
connectivity: minor cleanup resolve_cb() to use nm_utils_addr_family_to_size()
And change code so that clang-format produces nicer alignment.
-rw-r--r-- | src/core/nm-connectivity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c index c08ee62c1a..8bfe21d97e 100644 --- a/src/core/nm-connectivity.c +++ b/src/core/nm-connectivity.c @@ -745,14 +745,14 @@ resolve_cb(GObject *object, GAsyncResult *res, gpointer user_data) continue; address_buf = g_variant_get_fixed_array(address, &len, 1); - if ((addr_family == AF_INET && len != sizeof(struct in_addr)) - || (addr_family == AF_INET6 && len != sizeof(struct in6_addr))) + if (len != nm_utils_addr_family_to_size(addr_family)) continue; - host_entry = g_strdup_printf("%s:%s:%s", + host_entry = g_strdup_printf("%s:%s:%s", cb_data->concheck.con_config->host, cb_data->concheck.con_config->port ?: "80", nm_utils_inet_ntop(addr_family, address_buf, str_addr)); + cb_data->concheck.hosts = curl_slist_append(cb_data->concheck.hosts, host_entry); _LOG2T("adding '%s' to curl resolve list", host_entry); } |