summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--src/libsystemd/sd-rtnl/local-addresses.c (renamed from src/nss-myhostname/addresses.c)19
-rw-r--r--src/libsystemd/sd-rtnl/local-addresses.h (renamed from src/nss-myhostname/addresses.h)12
-rw-r--r--src/nss-myhostname/nss-myhostname.c42
-rw-r--r--src/shared/socket-util.h5
5 files changed, 45 insertions, 39 deletions
diff --git a/Makefile.am b/Makefile.am
index b28fa3feb4..50e31dbe2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2320,6 +2320,8 @@ libsystemd_internal_la_SOURCES = \
src/libsystemd/sd-rtnl/rtnl-types.c \
src/libsystemd/sd-rtnl/rtnl-util.h \
src/libsystemd/sd-rtnl/rtnl-util.c \
+ src/libsystemd/sd-rtnl/local-addresses.h \
+ src/libsystemd/sd-rtnl/local-addresses.c \
src/libsystemd/sd-id128/sd-id128.c \
src/libsystemd/sd-daemon/sd-daemon.c \
src/libsystemd/sd-login/sd-login.c \
@@ -4398,9 +4400,7 @@ endif
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
src/nss-myhostname/nss-myhostname.sym \
- src/nss-myhostname/nss-myhostname.c \
- src/nss-myhostname/addresses.h \
- src/nss-myhostname/addresses.c
+ src/nss-myhostname/nss-myhostname.c
libnss_myhostname_la_LDFLAGS = \
$(AM_LDFLAGS) \
diff --git a/src/nss-myhostname/addresses.c b/src/libsystemd/sd-rtnl/local-addresses.c
index d75e850494..dd5ccedc9d 100644
--- a/src/nss-myhostname/addresses.c
+++ b/src/libsystemd/sd-rtnl/local-addresses.c
@@ -23,10 +23,10 @@
#include "sd-rtnl.h"
#include "rtnl-util.h"
#include "macro.h"
-#include "addresses.h"
+#include "local-addresses.h"
static int address_compare(const void *_a, const void *_b) {
- const struct address *a = _a, *b = _b;
+ const struct local_address *a = _a, *b = _b;
/* Order lowest scope first, IPv4 before IPv6, lowest interface index first */
@@ -48,14 +48,16 @@ static int address_compare(const void *_a, const void *_b) {
return 0;
}
-int acquire_addresses(struct address **_list, unsigned *_n_list) {
+int local_addresses(struct local_address **ret) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
- _cleanup_free_ struct address *list = NULL;
+ _cleanup_free_ struct local_address *list = NULL;
size_t n_list = 0, n_allocated = 0;
sd_rtnl_message *m;
int r;
+ assert(ret);
+
r = sd_rtnl_open(&rtnl, 0);
if (r < 0)
return r;
@@ -69,7 +71,7 @@ int acquire_addresses(struct address **_list, unsigned *_n_list) {
return r;
for (m = reply; m; m = sd_rtnl_message_next(m)) {
- struct address *a;
+ struct local_address *a;
unsigned char flags;
uint16_t type;
@@ -139,11 +141,10 @@ int acquire_addresses(struct address **_list, unsigned *_n_list) {
};
if (n_list)
- qsort(list, n_list, sizeof(struct address), address_compare);
+ qsort(list, n_list, sizeof(struct local_address), address_compare);
- *_list = list;
+ *ret = list;
list = NULL;
- *_n_list = n_list;
- return 0;
+ return (int) n_list;
}
diff --git a/src/nss-myhostname/addresses.h b/src/libsystemd/sd-rtnl/local-addresses.h
index 1bfb3579da..cc26fc479b 100644
--- a/src/nss-myhostname/addresses.h
+++ b/src/libsystemd/sd-rtnl/local-addresses.h
@@ -28,16 +28,10 @@
#include "socket-util.h"
-struct address {
+struct local_address {
+ int ifindex;
unsigned char family, scope;
union in_addr_union address;
- int ifindex;
};
-static inline size_t PROTO_ADDRESS_SIZE(int proto) {
- assert(proto == AF_INET || proto == AF_INET6);
-
- return proto == AF_INET6 ? 16 : 4;
-}
-
-int acquire_addresses(struct address **_list, unsigned *_n_list);
+int local_addresses(struct local_address **ret);
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 6551ac9f32..15a35f3022 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <arpa/inet.h>
-#include "addresses.h"
+#include "local-addresses.h"
#include "macro.h"
/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
@@ -99,15 +99,15 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
int32_t *ttlp) {
struct gaih_addrtuple *r_tuple, *r_tuple_prev = NULL;
- _cleanup_free_ struct address *addresses = NULL;
+ _cleanup_free_ struct local_address *addresses = NULL;
_cleanup_free_ char *hn = NULL;
const char *canonical = NULL;
- unsigned n_addresses = 0, n;
+ int n_addresses = 0, lo_ifi;
uint32_t local_address_ipv4;
- struct address *a;
+ struct local_address *a;
size_t l, idx, ms;
char *r_name;
- int lo_ifi;
+ unsigned n;
assert(name);
assert(pat);
@@ -136,8 +136,9 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
return NSS_STATUS_NOTFOUND;
}
- /* If this fails, n_addresses is 0. Which is fine */
- acquire_addresses(&addresses, &n_addresses);
+ n_addresses = local_addresses(&addresses);
+ if (n_addresses < 0)
+ n_addresses = 0;
canonical = hn;
local_address_ipv4 = LOCALADDRESS_IPV4;
@@ -184,7 +185,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
}
/* Fourth, fill actual addresses in, but in backwards order */
- for (a = addresses + n_addresses - 1, n = 0; n < n_addresses; n++, a--) {
+ for (a = addresses + n_addresses - 1, n = 0; (int) n < n_addresses; n++, a--) {
r_tuple = (struct gaih_addrtuple*) (buffer + idx);
r_tuple->next = r_tuple_prev;
r_tuple->name = r_name;
@@ -214,7 +215,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
static enum nss_status fill_in_hostent(
const char *canonical, const char *additional,
int af,
- struct address *addresses, unsigned n_addresses,
+ struct local_address *addresses, unsigned n_addresses,
uint32_t local_address_ipv4,
struct hostent *result,
char *buffer, size_t buflen,
@@ -225,7 +226,7 @@ static enum nss_status fill_in_hostent(
size_t l_canonical, l_additional, idx, ms;
char *r_addr, *r_name, *r_aliases, *r_alias = NULL, *r_addr_list;
size_t alen;
- struct address *a;
+ struct local_address *a;
unsigned n, c;
assert(canonical);
@@ -351,11 +352,11 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
int32_t *ttlp,
char **canonp) {
- _cleanup_free_ struct address *addresses = NULL;
+ _cleanup_free_ struct local_address *addresses = NULL;
const char *canonical, *additional = NULL;
_cleanup_free_ char *hn = NULL;
uint32_t local_address_ipv4;
- unsigned n_addresses = 0;
+ int n_addresses = 0;
assert(name);
assert(host);
@@ -389,7 +390,9 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
return NSS_STATUS_NOTFOUND;
}
- acquire_addresses(&addresses, &n_addresses);
+ n_addresses = local_addresses(&addresses);
+ if (n_addresses < 0)
+ n_addresses = 0;
canonical = hn;
additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL;
@@ -451,10 +454,11 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
const char *canonical = NULL, *additional = NULL;
uint32_t local_address_ipv4 = LOCALADDRESS_IPV4;
- _cleanup_free_ struct address *addresses = NULL;
+ _cleanup_free_ struct local_address *addresses = NULL;
_cleanup_free_ char *hn = NULL;
- unsigned n_addresses = 0, n;
- struct address *a;
+ int n_addresses = 0;
+ struct local_address *a;
+ unsigned n;
assert(addr);
assert(host);
@@ -492,9 +496,11 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
return NSS_STATUS_UNAVAIL;
}
- acquire_addresses(&addresses, &n_addresses);
+ n_addresses = local_addresses(&addresses);
+ if (n_addresses < 0)
+ n_addresses = 0;
- for (a = addresses, n = 0; n < n_addresses; n++, a++) {
+ for (a = addresses, n = 0; (int) n < n_addresses; n++, a++) {
if (af != a->family)
continue;
diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index 25c4a7e4f9..8d521ae1a0 100644
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -118,3 +118,8 @@ int in_addr_prefix_intersect(unsigned family, const union in_addr_union *a, unsi
int in_addr_prefix_next(unsigned family, union in_addr_union *u, unsigned prefixlen);
int in_addr_to_string(unsigned family, const union in_addr_union *u, char **ret);
int in_addr_from_string(unsigned family, const char *s, union in_addr_union *ret);
+
+static inline size_t PROTO_ADDRESS_SIZE(int proto) {
+ assert(proto == AF_INET || proto == AF_INET6);
+ return proto == AF_INET6 ? 16 : 4;
+}