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

nss-myhostname: move local address listing logic into shared, so that we can make use of it from machined

Browse Source
This commit is contained in:
Lennart Poettering
2014-07-10 21:01:25 +02:00
parent 947127ff62
commit e80af1bddd
5 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nss-myhostname/addresses.c
-149
View File
@@ -1,149 +0,0 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2008-2011 Lennart Poettering
Copyright 2014 Tom Gundersen
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "sd-rtnl.h"
#include "rtnl-util.h"
#include "macro.h"
#include "addresses.h"
static int address_compare(const void *_a, const void *_b) {
const struct address *a = _a, *b = _b;
/* Order lowest scope first, IPv4 before IPv6, lowest interface index first */
if (a->scope < b->scope)
return -1;
if (a->scope > b->scope)
return 1;
if (a->family == AF_INET && b->family == AF_INET6)
return -1;
if (a->family == AF_INET6 && b->family == AF_INET)
return 1;
if (a->ifindex < b->ifindex)
return -1;
if (a->ifindex > b->ifindex)
return 1;
return 0;
}
int acquire_addresses(struct address **_list, unsigned *_n_list) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
_cleanup_free_ struct address *list = NULL;
size_t n_list = 0, n_allocated = 0;
sd_rtnl_message *m;
int r;
r = sd_rtnl_open(&rtnl, 0);
if (r < 0)
return r;
r = sd_rtnl_message_new_addr(rtnl, &req, RTM_GETADDR, 0, AF_UNSPEC);
if (r < 0)
return r;
r = sd_rtnl_call(rtnl, req, 0, &reply);
if (r < 0)
return r;
for (m = reply; m; m = sd_rtnl_message_next(m)) {
struct address *a;
unsigned char flags;
uint16_t type;
r = sd_rtnl_message_get_errno(m);
if (r < 0)
return r;
r = sd_rtnl_message_get_type(m, &type);
if (r < 0)
return r;
if (type != RTM_NEWADDR)
continue;
r = sd_rtnl_message_addr_get_flags(m, &flags);
if (r < 0)
return r;
if (flags & IFA_F_DEPRECATED)
continue;
if (!GREEDY_REALLOC(list, n_allocated, n_list+1))
return -ENOMEM;
a = list + n_list;
r = sd_rtnl_message_addr_get_scope(m, &a->scope);
if (r < 0)
return r;
if (a->scope == RT_SCOPE_HOST || a->scope == RT_SCOPE_NOWHERE)
continue;
r = sd_rtnl_message_addr_get_family(m, &a->family);
if (r < 0)
return r;
switch (a->family) {
case AF_INET:
r = sd_rtnl_message_read_in_addr(m, IFA_LOCAL, &a->address.in);
if (r < 0) {
r = sd_rtnl_message_read_in_addr(m, IFA_ADDRESS, &a->address.in);
if (r < 0)
continue;
}
break;
case AF_INET6:
r = sd_rtnl_message_read_in6_addr(m, IFA_LOCAL, &a->address.in6);
if (r < 0) {
r = sd_rtnl_message_read_in6_addr(m, IFA_ADDRESS, &a->address.in6);
if (r < 0)
continue;
}
break;
default:
continue;
}
r = sd_rtnl_message_addr_get_ifindex(m, &a->ifindex);
if (r < 0)
return r;
n_list++;
};
if (n_list)
qsort(list, n_list, sizeof(struct address), address_compare);
*_list = list;
list = NULL;
*_n_list = n_list;
return 0;
}
src/nss-myhostname/addresses.h
-43
View File
@@ -1,43 +0,0 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2008-2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <inttypes.h>
#include <sys/types.h>
#include <assert.h>
#include <sys/socket.h>
#include "socket-util.h"
struct address {
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);
src/nss-myhostname/nss-myhostname.c
+24 -18
View File
@@ -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;