1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00

sd-netlink: don't export internal type-system details

The kernel bonding layer allows passing an array of ARP IP targets as
bond-configuration. Due to the weird implementation of arrays in netlink
(which we haven't figure out a generic way to support, yet), we usually
hard-code the supported array-sizes. However, this should not be exported
from sd-netlink.

Instead, make sure the caller just uses it's current hack of enumerating
the types, and the sd-netlink core will have it's own list of supported
array-sizes (to be removed in future extensions, btw!). If either does not
match, we will just return a normal error.

Note that we provide 2 constants for ARP_IP_TARGETS_MAX now. However, both
have very different reasons:
 - the constant in netdev-bond.c is used to warn the user that the given
   number of targets might not be supported by the kernel (even though the
   kernel might increase that number at _any_ time)
 - the constant in sd-netlink is solely used due to us missing a proper
   array implementation. Once that's supported in the type-system, it can
   be removed without notice

Last but not least, this patch turns the log_error() into a log_warning().
Given that the previous condition was off-by-one, anyway, it never hit at
the right time. Thus, it was probably of no real use.
This commit is contained in:
David Herrmann 2015-06-24 13:27:34 +02:00
parent 846a6b3d89
commit dd906398dd
4 changed files with 31 additions and 26 deletions

View File

@ -39,6 +39,28 @@
#include "netlink-types.h"
#include "missing.h"
/* Maximum ARP IP target defined in kernel */
#define BOND_MAX_ARP_TARGETS 16
typedef enum {
BOND_ARP_TARGETS_0,
BOND_ARP_TARGETS_1,
BOND_ARP_TARGETS_2,
BOND_ARP_TARGETS_3,
BOND_ARP_TARGETS_4,
BOND_ARP_TARGETS_5,
BOND_ARP_TARGETS_6,
BOND_ARP_TARGETS_7,
BOND_ARP_TARGETS_8,
BOND_ARP_TARGETS_9,
BOND_ARP_TARGETS_10,
BOND_ARP_TARGETS_11,
BOND_ARP_TARGETS_12,
BOND_ARP_TARGETS_13,
BOND_ARP_TARGETS_14,
BOND_ARP_TARGETS_MAX = BOND_MAX_ARP_TARGETS,
} BondArpTargets;
struct NLType {
uint16_t type;
size_t size;

View File

@ -90,25 +90,3 @@ typedef enum NLUnionLinkInfoData {
const char *nl_union_link_info_data_to_string(NLUnionLinkInfoData p) _const_;
NLUnionLinkInfoData nl_union_link_info_data_from_string(const char *p) _pure_;
/* Maximum ARP IP target defined in kernel */
#define BOND_MAX_ARP_TARGETS 16
typedef enum BondArpTargets {
BOND_ARP_TARGETS_0,
BOND_ARP_TARGETS_1,
BOND_ARP_TARGETS_2,
BOND_ARP_TARGETS_3,
BOND_ARP_TARGETS_4,
BOND_ARP_TARGETS_5,
BOND_ARP_TARGETS_6,
BOND_ARP_TARGETS_7,
BOND_ARP_TARGETS_8,
BOND_ARP_TARGETS_9,
BOND_ARP_TARGETS_10,
BOND_ARP_TARGETS_11,
BOND_ARP_TARGETS_12,
BOND_ARP_TARGETS_13,
BOND_ARP_TARGETS_14,
BOND_ARP_TARGETS_MAX = BOND_MAX_ARP_TARGETS,
} BondArpTargets;

View File

@ -25,7 +25,6 @@
#include "conf-parser.h"
#include "sd-netlink.h"
#include "netlink-types.h"
#include "networkd-netdev-bond.h"
#include "missing.h"
@ -372,11 +371,11 @@ int config_parse_arp_ip_target_address(const char *unit,
b->n_arp_ip_targets ++;
buffer = NULL;
if (b->n_arp_ip_targets > BOND_ARP_TARGETS_MAX)
break;
}
if (b->n_arp_ip_targets > NETDEV_BOND_ARP_TARGETS_MAX)
log_syntax(unit, LOG_WARNING, filename, line, EINVAL, "More than the maximum number of kernel-supported ARP ip targets specified: %d > %d", b->n_arp_ip_targets, NETDEV_BOND_ARP_TARGETS_MAX);
return 0;
}

View File

@ -25,6 +25,12 @@ typedef struct Bond Bond;
#include "networkd-netdev.h"
/*
* Maximum number of targets supported by the kernel for a single
* bond netdev.
*/
#define NETDEV_BOND_ARP_TARGETS_MAX 16
typedef enum BondMode {
NETDEV_BOND_MODE_BALANCE_RR,
NETDEV_BOND_MODE_ACTIVE_BACKUP,