From 47efffc22badb20124dca5ed8c3b52911d71fc31 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 10 Jul 2014 20:12:07 +0200 Subject: nss-myhostname: following the usual naming scheme for .c/.h files --- src/nss-myhostname/addresses.c | 149 ++++++++++++++++++++++++++++++++++++ src/nss-myhostname/addresses.h | 43 +++++++++++ src/nss-myhostname/ifconf.h | 44 ----------- src/nss-myhostname/netlink.c | 149 ------------------------------------ src/nss-myhostname/nss-myhostname.c | 8 +- 5 files changed, 196 insertions(+), 197 deletions(-) create mode 100644 src/nss-myhostname/addresses.c create mode 100644 src/nss-myhostname/addresses.h delete mode 100644 src/nss-myhostname/ifconf.h delete mode 100644 src/nss-myhostname/netlink.c (limited to 'src/nss-myhostname') diff --git a/src/nss-myhostname/addresses.c b/src/nss-myhostname/addresses.c new file mode 100644 index 0000000000..d75e850494 --- /dev/null +++ b/src/nss-myhostname/addresses.c @@ -0,0 +1,149 @@ +/*-*- 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 . +***/ + +#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; +} diff --git a/src/nss-myhostname/addresses.h b/src/nss-myhostname/addresses.h new file mode 100644 index 0000000000..1bfb3579da --- /dev/null +++ b/src/nss-myhostname/addresses.h @@ -0,0 +1,43 @@ +/*-*- 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 . +***/ + +#include +#include +#include +#include + +#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); diff --git a/src/nss-myhostname/ifconf.h b/src/nss-myhostname/ifconf.h deleted file mode 100644 index 92f03b261a..0000000000 --- a/src/nss-myhostname/ifconf.h +++ /dev/null @@ -1,44 +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 . -***/ - -#include -#include -#include -#include - -#include "socket-util.h" - -struct address { - unsigned char family; - union in_addr_union address; - unsigned char scope; - 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 ifconf_acquire_addresses(struct address **_list, unsigned *_n_list); diff --git a/src/nss-myhostname/netlink.c b/src/nss-myhostname/netlink.c deleted file mode 100644 index e9518e3213..0000000000 --- a/src/nss-myhostname/netlink.c +++ /dev/null @@ -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 . -***/ - -#include "sd-rtnl.h" -#include "rtnl-util.h" -#include "macro.h" -#include "ifconf.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 ifconf_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; -} diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 9320e69ebd..6551ac9f32 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -30,7 +30,7 @@ #include #include -#include "ifconf.h" +#include "addresses.h" #include "macro.h" /* Ensure that glibc's assert is used. We cannot use assert from macro.h, as @@ -137,7 +137,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( } /* If this fails, n_addresses is 0. Which is fine */ - ifconf_acquire_addresses(&addresses, &n_addresses); + acquire_addresses(&addresses, &n_addresses); canonical = hn; local_address_ipv4 = LOCALADDRESS_IPV4; @@ -389,7 +389,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r( return NSS_STATUS_NOTFOUND; } - ifconf_acquire_addresses(&addresses, &n_addresses); + acquire_addresses(&addresses, &n_addresses); canonical = hn; additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL; @@ -492,7 +492,7 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r( return NSS_STATUS_UNAVAIL; } - ifconf_acquire_addresses(&addresses, &n_addresses); + acquire_addresses(&addresses, &n_addresses); for (a = addresses, n = 0; n < n_addresses; n++, a++) { if (af != a->family) -- cgit v1.2.3