804319344b
On Tue, Feb 10, 2015 at 08:10:43PM +0100, Lennart Poettering wrote: > Hmm, I think it would be nicer to use be32toh() here instead, since it > ensures the macro is (to a limited degree) typesafe. > > Any chance you could rework that? From: Paul Martin <paul.martin@codethink.co.uk> Date: Wed, 11 Feb 2015 11:47:16 +0000 Subject: [PATCH] networkd dhcpv4 logging endian fix On a big-endian host, systemd-networkd prints out IPv4 network addresses byte reversed: Feb 10 16:43:32 hostname systemd-networkd[151]: eth0 : DHCPv4 address 158.1.24.10/16 via 1.1.24.10 The address obtained is 10.24.1.158/16 and the route is 10.24.0.0/16 dev eth0 src 10.24.1.187 The macro ADDRESS_FMT_VAL() unpacks a "struct in_addr" in a little-endian specific manner. This patch forces the passed address into host order, then unpacks it. On an x86 later than i486, compiled with -O2, the only extra overhead is a single bswap instruction.
162 lines
5.4 KiB
C
162 lines
5.4 KiB
C
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2013 Tom Gundersen <teg@jklm.no>
|
|
|
|
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/>.
|
|
***/
|
|
|
|
#pragma once
|
|
|
|
#include <endian.h>
|
|
|
|
#include "networkd.h"
|
|
|
|
typedef enum LinkState {
|
|
LINK_STATE_PENDING,
|
|
LINK_STATE_ENSLAVING,
|
|
LINK_STATE_SETTING_ADDRESSES,
|
|
LINK_STATE_SETTING_ROUTES,
|
|
LINK_STATE_CONFIGURED,
|
|
LINK_STATE_UNMANAGED,
|
|
LINK_STATE_FAILED,
|
|
LINK_STATE_LINGER,
|
|
_LINK_STATE_MAX,
|
|
_LINK_STATE_INVALID = -1
|
|
} LinkState;
|
|
|
|
struct Link {
|
|
Manager *manager;
|
|
|
|
int n_ref;
|
|
|
|
int ifindex;
|
|
char *ifname;
|
|
char *state_file;
|
|
struct ether_addr mac;
|
|
uint32_t mtu;
|
|
struct udev_device *udev_device;
|
|
|
|
unsigned flags;
|
|
uint8_t kernel_operstate;
|
|
|
|
Network *network;
|
|
|
|
LinkState state;
|
|
LinkOperationalState operstate;
|
|
|
|
unsigned link_messages;
|
|
unsigned enslaving;
|
|
|
|
LIST_HEAD(Address, addresses);
|
|
|
|
sd_dhcp_client *dhcp_client;
|
|
sd_dhcp_lease *dhcp_lease;
|
|
char *lease_file;
|
|
uint16_t original_mtu;
|
|
unsigned dhcp4_messages;
|
|
bool dhcp4_configured;
|
|
|
|
sd_ipv4ll *ipv4ll;
|
|
bool ipv4ll_address;
|
|
bool ipv4ll_route;
|
|
|
|
bool static_configured;
|
|
|
|
LIST_HEAD(Address, pool_addresses);
|
|
|
|
sd_dhcp_server *dhcp_server;
|
|
|
|
sd_icmp6_nd *icmp6_router_discovery;
|
|
sd_dhcp6_client *dhcp6_client;
|
|
|
|
sd_lldp *lldp;
|
|
char *lldp_file;
|
|
};
|
|
|
|
Link *link_unref(Link *link);
|
|
Link *link_ref(Link *link);
|
|
int link_get(Manager *m, int ifindex, Link **ret);
|
|
int link_add(Manager *manager, sd_rtnl_message *message, Link **ret);
|
|
void link_drop(Link *link);
|
|
|
|
int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata);
|
|
int link_route_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata);
|
|
|
|
void link_enter_failed(Link *link);
|
|
int link_initialized(Link *link, struct udev_device *device);
|
|
|
|
void link_client_handler(Link *link);
|
|
|
|
int link_update(Link *link, sd_rtnl_message *message);
|
|
int link_rtnl_process_address(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata);
|
|
|
|
int link_save(Link *link);
|
|
|
|
int link_carrier_reset(Link *link);
|
|
bool link_has_carrier(Link *link);
|
|
|
|
int link_set_mtu(Link *link, uint32_t mtu);
|
|
int link_set_hostname(Link *link, const char *hostname);
|
|
|
|
int ipv4ll_configure(Link *link);
|
|
int dhcp4_configure(Link *link);
|
|
int icmp6_configure(Link *link);
|
|
|
|
bool link_lldp_enabled(Link *link);
|
|
bool link_ipv4ll_enabled(Link *link);
|
|
bool link_ipv6ll_enabled(Link *link);
|
|
bool link_dhcp4_server_enabled(Link *link);
|
|
bool link_dhcp4_enabled(Link *link);
|
|
bool link_dhcp6_enabled(Link *link);
|
|
|
|
const char* link_state_to_string(LinkState s) _const_;
|
|
LinkState link_state_from_string(const char *s) _pure_;
|
|
|
|
extern const sd_bus_vtable link_vtable[];
|
|
|
|
int link_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
|
|
int link_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
|
|
int link_send_changed(Link *link, const char *property, ...) _sentinel_;
|
|
|
|
DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref);
|
|
#define _cleanup_link_unref_ _cleanup_(link_unrefp)
|
|
|
|
/* Macros which append INTERFACE= to the message */
|
|
|
|
#define log_link_full(link, level, error, fmt, ...) \
|
|
log_object_internal(level, error, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
|
|
|
|
#define log_link_debug(link, ...) log_link_full(link, LOG_DEBUG, 0, ##__VA_ARGS__)
|
|
#define log_link_info(link, ...) log_link_full(link, LOG_INFO, 0, ##__VA_ARGS__)
|
|
#define log_link_notice(link, ...) log_link_full(link, LOG_NOTICE, 0, ##__VA_ARGS__)
|
|
#define log_link_warning(link, ...) log_link_full(link, LOG_WARNING, 0, ##__VA_ARGS__)
|
|
#define log_link_error(link, ...) log_link_full(link, LOG_ERR, 0, ##__VA_ARGS__)
|
|
|
|
#define log_link_debug_errno(link, error, ...) log_link_full(link, LOG_DEBUG, error, ##__VA_ARGS__)
|
|
#define log_link_info_errno(link, error, ...) log_link_full(link, LOG_INFO, error, ##__VA_ARGS__)
|
|
#define log_link_notice_errno(link, error, ...) log_link_full(link, LOG_NOTICE, error, ##__VA_ARGS__)
|
|
#define log_link_warning_errno(link, error, ...) log_link_full(link, LOG_WARNING, error, ##__VA_ARGS__)
|
|
#define log_link_error_errno(link, error, ...) log_link_full(link, LOG_ERR, error, ##__VA_ARGS__)
|
|
|
|
#define log_link_struct(link, level, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
|
|
|
|
#define ADDRESS_FMT_VAL(address) \
|
|
be32toh((address).s_addr) >> 24, \
|
|
(be32toh((address).s_addr) >> 16) & 0xFFu, \
|
|
(be32toh((address).s_addr) >> 8) & 0xFFu, \
|
|
be32toh((address).s_addr) & 0xFFu
|