diff options
Diffstat (limited to 'src/network')
28 files changed, 39 insertions, 42 deletions
diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c index 940a718d20..492bb68e32 100644 --- a/src/network/generator/network-generator.c +++ b/src/network/generator/network-generator.c @@ -313,7 +313,7 @@ static int network_set_dhcp_type(Context *context, const char *ifname, const cha t = dracut_dhcp_type_from_string(dhcp_type); if (t < 0) - return -EINVAL; + return t; network = network_get(context, ifname); if (!network) { diff --git a/src/network/generator/network-generator.h b/src/network/generator/network-generator.h index 86bcaec119..5131b20bcc 100644 --- a/src/network/generator/network-generator.h +++ b/src/network/generator/network-generator.h @@ -19,7 +19,7 @@ typedef enum DHCPType { DHCP_TYPE_EITHER6, DHCP_TYPE_IBFT, _DHCP_TYPE_MAX, - _DHCP_TYPE_INVALID = -1, + _DHCP_TYPE_INVALID = -EINVAL, } DHCPType; typedef struct Address Address; diff --git a/src/network/netdev/bareudp.h b/src/network/netdev/bareudp.h index ea80bbf800..8d8863cccc 100644 --- a/src/network/netdev/bareudp.h +++ b/src/network/netdev/bareudp.h @@ -15,7 +15,7 @@ typedef enum BareUDPProtocol { BARE_UDP_PROTOCOL_MPLS_UC = ETH_P_MPLS_UC, BARE_UDP_PROTOCOL_MPLS_MC = ETH_P_MPLS_MC, _BARE_UDP_PROTOCOL_MAX, - _BARE_UDP_PROTOCOL_INVALID = -1 + _BARE_UDP_PROTOCOL_INVALID = -EINVAL, } BareUDPProtocol; struct BareUDP { diff --git a/src/network/netdev/bridge.h b/src/network/netdev/bridge.h index f3276c5c41..459a5eed68 100644 --- a/src/network/netdev/bridge.h +++ b/src/network/netdev/bridge.h @@ -35,7 +35,7 @@ typedef enum MulticastRouter { MULTICAST_ROUTER_PERMANENT = MDB_RTR_TYPE_PERM, MULTICAST_ROUTER_TEMPORARY = MDB_RTR_TYPE_TEMP, _MULTICAST_ROUTER_MAX, - _MULTICAST_ROUTER_INVALID = -1, + _MULTICAST_ROUTER_INVALID = -EINVAL, } MulticastRouter; DEFINE_NETDEV_CAST(BRIDGE, Bridge); diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h index a6f10dfca4..576d82ed6c 100644 --- a/src/network/netdev/fou-tunnel.h +++ b/src/network/netdev/fou-tunnel.h @@ -12,7 +12,7 @@ typedef enum FooOverUDPEncapType { NETDEV_FOO_OVER_UDP_ENCAP_DIRECT = FOU_ENCAP_DIRECT, NETDEV_FOO_OVER_UDP_ENCAP_GUE = FOU_ENCAP_GUE, _NETDEV_FOO_OVER_UDP_ENCAP_MAX, - _NETDEV_FOO_OVER_UDP_ENCAP_INVALID = -1, + _NETDEV_FOO_OVER_UDP_ENCAP_INVALID = -EINVAL, } FooOverUDPEncapType; typedef struct FouTunnel { diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h index b62eb7b76d..1f0f15c2ad 100644 --- a/src/network/netdev/geneve.h +++ b/src/network/netdev/geneve.h @@ -14,7 +14,7 @@ typedef enum GeneveDF { NETDEV_GENEVE_DF_YES = GENEVE_DF_SET, NETDEV_GENEVE_DF_INHERIT = GENEVE_DF_INHERIT, _NETDEV_GENEVE_DF_MAX, - _NETDEV_GENEVE_DF_INVALID = -1 + _NETDEV_GENEVE_DF_INVALID = -EINVAL, } GeneveDF; struct Geneve { diff --git a/src/network/netdev/l2tp-tunnel.h b/src/network/netdev/l2tp-tunnel.h index 048318d6df..a884d2100f 100644 --- a/src/network/netdev/l2tp-tunnel.h +++ b/src/network/netdev/l2tp-tunnel.h @@ -12,14 +12,14 @@ typedef enum L2tpL2specType { NETDEV_L2TP_L2SPECTYPE_NONE = L2TP_L2SPECTYPE_NONE, NETDEV_L2TP_L2SPECTYPE_DEFAULT = L2TP_L2SPECTYPE_DEFAULT, _NETDEV_L2TP_L2SPECTYPE_MAX, - _NETDEV_L2TP_L2SPECTYPE_INVALID = -1, + _NETDEV_L2TP_L2SPECTYPE_INVALID = -EINVAL, } L2tpL2specType; typedef enum L2tpEncapType { NETDEV_L2TP_ENCAPTYPE_UDP = L2TP_ENCAPTYPE_UDP, NETDEV_L2TP_ENCAPTYPE_IP = L2TP_ENCAPTYPE_IP, _NETDEV_L2TP_ENCAPTYPE_MAX, - _NETDEV_L2TP_ENCAPTYPE_INVALID = -1, + _NETDEV_L2TP_ENCAPTYPE_INVALID = -EINVAL, } L2tpEncapType; typedef enum L2tpLocalAddressType { @@ -27,7 +27,7 @@ typedef enum L2tpLocalAddressType { NETDEV_L2TP_LOCAL_ADDRESS_STATIC, NETDEV_L2TP_LOCAL_ADDRESS_DYNAMIC, _NETDEV_L2TP_LOCAL_ADDRESS_MAX, - _NETDEV_L2TP_LOCAL_ADDRESS_INVALID = -1, + _NETDEV_L2TP_LOCAL_ADDRESS_INVALID = -EINVAL, } L2tpLocalAddressType; typedef struct L2tpTunnel L2tpTunnel; diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 468fae591c..c13542ae80 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -85,7 +85,7 @@ typedef enum NetDevKind { NETDEV_KIND_BAREUDP, _NETDEV_KIND_MAX, _NETDEV_KIND_TUNNEL, /* Used by config_parse_stacked_netdev() */ - _NETDEV_KIND_INVALID = -1 + _NETDEV_KIND_INVALID = -EINVAL, } NetDevKind; typedef enum NetDevState { @@ -95,7 +95,7 @@ typedef enum NetDevState { NETDEV_STATE_READY, NETDEV_STATE_LINGER, _NETDEV_STATE_MAX, - _NETDEV_STATE_INVALID = -1, + _NETDEV_STATE_INVALID = -EINVAL, } NetDevState; typedef enum NetDevCreateType { @@ -104,7 +104,7 @@ typedef enum NetDevCreateType { NETDEV_CREATE_STACKED, NETDEV_CREATE_AFTER_CONFIGURED, _NETDEV_CREATE_MAX, - _NETDEV_CREATE_INVALID = -1, + _NETDEV_CREATE_INVALID = -EINVAL, } NetDevCreateType; typedef struct Manager Manager; diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index d58ded757d..35021e9409 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -12,13 +12,13 @@ typedef enum Ip6TnlMode { NETDEV_IP6_TNL_MODE_IPIP6, NETDEV_IP6_TNL_MODE_ANYIP6, _NETDEV_IP6_TNL_MODE_MAX, - _NETDEV_IP6_TNL_MODE_INVALID = -1, + _NETDEV_IP6_TNL_MODE_INVALID = -EINVAL, } Ip6TnlMode; typedef enum IPv6FlowLabel { NETDEV_IPV6_FLOWLABEL_INHERIT = 0xFFFFF + 1, _NETDEV_IPV6_FLOWLABEL_MAX, - _NETDEV_IPV6_FLOWLABEL_INVALID = -1, + _NETDEV_IPV6_FLOWLABEL_INVALID = -EINVAL, } IPv6FlowLabel; typedef struct Tunnel { diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h index 371653cade..12ef46ef9a 100644 --- a/src/network/netdev/vxlan.h +++ b/src/network/netdev/vxlan.h @@ -16,7 +16,7 @@ typedef enum VxLanDF { NETDEV_VXLAN_DF_YES = VXLAN_DF_SET, NETDEV_VXLAN_DF_INHERIT = VXLAN_DF_INHERIT, _NETDEV_VXLAN_DF_MAX, - _NETDEV_VXLAN_DF_INVALID = -1 + _NETDEV_VXLAN_DF_INVALID = -EINVAL, } VxLanDF; struct VxLan { diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index c188320872..b52a5f2e26 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -1754,7 +1754,6 @@ int config_parse_duplicate_address_detection( Network *network = userdata; _cleanup_(address_free_or_set_invalidp) Address *n = NULL; - AddressFamily a; int r; assert(filename); @@ -1783,14 +1782,14 @@ int config_parse_duplicate_address_detection( return 0; } - a = duplicate_address_detection_address_family_from_string(rvalue); + AddressFamily a = duplicate_address_detection_address_family_from_string(rvalue); if (a < 0) { - log_syntax(unit, LOG_WARNING, filename, line, SYNTHETIC_ERRNO(EINVAL), + log_syntax(unit, LOG_WARNING, filename, line, a, "Failed to parse %s=, ignoring: %s", lvalue, rvalue); return 0; } - n->duplicate_address_detection = a; + TAKE_PTR(n); return 0; } diff --git a/src/network/networkd-dhcp-common.h b/src/network/networkd-dhcp-common.h index aa100d0de4..acf80e6255 100644 --- a/src/network/networkd-dhcp-common.h +++ b/src/network/networkd-dhcp-common.h @@ -16,7 +16,7 @@ typedef enum DHCPUseDomains { DHCP_USE_DOMAINS_YES, DHCP_USE_DOMAINS_ROUTE, _DHCP_USE_DOMAINS_MAX, - _DHCP_USE_DOMAINS_INVALID = -1, + _DHCP_USE_DOMAINS_INVALID = -EINVAL, } DHCPUseDomains; typedef enum DHCPOptionDataType { diff --git a/src/network/networkd-dhcp4.h b/src/network/networkd-dhcp4.h index 7500a23c3b..5ec2f88b7e 100644 --- a/src/network/networkd-dhcp4.h +++ b/src/network/networkd-dhcp4.h @@ -14,7 +14,7 @@ typedef enum DHCPClientIdentifier { * https://github.com/systemd/systemd/issues/7828 */ DHCP_CLIENT_ID_DUID_ONLY, _DHCP_CLIENT_ID_MAX, - _DHCP_CLIENT_ID_INVALID = -1, + _DHCP_CLIENT_ID_INVALID = -EINVAL, } DHCPClientIdentifier; int dhcp4_configure(Link *link); diff --git a/src/network/networkd-dhcp6.h b/src/network/networkd-dhcp6.h index 65b35fd1e8..f74476d575 100644 --- a/src/network/networkd-dhcp6.h +++ b/src/network/networkd-dhcp6.h @@ -11,7 +11,7 @@ typedef enum DHCP6ClientStartMode { DHCP6_CLIENT_START_MODE_INFORMATION_REQUEST, DHCP6_CLIENT_START_MODE_SOLICIT, _DHCP6_CLIENT_START_MODE_MAX, - _DHCP6_CLIENT_START_MODE_INVALID = -1, + _DHCP6_CLIENT_START_MODE_INVALID = -EINVAL, } DHCP6ClientStartMode; typedef struct Link Link; diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index c18e4d81d9..4cd430e8ae 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -377,7 +377,6 @@ int config_parse_fdb_ntf_flags( _cleanup_(fdb_entry_free_or_set_invalidp) FdbEntry *fdb_entry = NULL; Network *network = userdata; - NeighborCacheEntryFlags f; int r; assert(filename); @@ -390,9 +389,9 @@ int config_parse_fdb_ntf_flags( if (r < 0) return log_oom(); - f = fdb_ntf_flags_from_string(rvalue); + NeighborCacheEntryFlags f = fdb_ntf_flags_from_string(rvalue); if (f < 0) { - log_syntax(unit, LOG_WARNING, filename, line, SYNTHETIC_ERRNO(EINVAL), + log_syntax(unit, LOG_WARNING, filename, line, f, "FDB failed to parse AssociatedWith=, ignoring assignment: %s", rvalue); return 0; diff --git a/src/network/networkd-fdb.h b/src/network/networkd-fdb.h index 48f4e40b37..dc85a70f8c 100644 --- a/src/network/networkd-fdb.h +++ b/src/network/networkd-fdb.h @@ -22,7 +22,7 @@ typedef enum NeighborCacheEntryFlags { NEIGHBOR_CACHE_ENTRY_FLAGS_MASTER = NTF_MASTER, NEIGHBOR_CACHE_ENTRY_FLAGS_ROUTER = NTF_ROUTER, _NEIGHBOR_CACHE_ENTRY_FLAGS_MAX, - _NEIGHBOR_CACHE_ENTRY_FLAGS_INVALID = -1, + _NEIGHBOR_CACHE_ENTRY_FLAGS_INVALID = -EINVAL, } NeighborCacheEntryFlags; typedef struct FdbEntry { diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 3623b1a00d..8129fd2554 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -33,7 +33,7 @@ typedef enum LinkState { LINK_STATE_FAILED, /* at least one configuration process failed */ LINK_STATE_LINGER, /* RTM_DELLINK for the link has been received */ _LINK_STATE_MAX, - _LINK_STATE_INVALID = -1 + _LINK_STATE_INVALID = -EINVAL, } LinkState; typedef struct Manager Manager; diff --git a/src/network/networkd-lldp-rx.h b/src/network/networkd-lldp-rx.h index 78c522893b..49306eafd0 100644 --- a/src/network/networkd-lldp-rx.h +++ b/src/network/networkd-lldp-rx.h @@ -10,7 +10,7 @@ typedef enum LLDPMode { LLDP_MODE_YES = 1, LLDP_MODE_ROUTERS_ONLY = 2, _LLDP_MODE_MAX, - _LLDP_MODE_INVALID = -1, + _LLDP_MODE_INVALID = -EINVAL, } LLDPMode; int link_lldp_rx_configure(Link *link); diff --git a/src/network/networkd-ndisc.h b/src/network/networkd-ndisc.h index e2cb82b346..20884ce56b 100644 --- a/src/network/networkd-ndisc.h +++ b/src/network/networkd-ndisc.h @@ -14,7 +14,7 @@ typedef enum IPv6TokenAddressGeneration { IPV6_TOKEN_ADDRESS_GENERATION_STATIC, IPV6_TOKEN_ADDRESS_GENERATION_PREFIXSTABLE, _IPV6_TOKEN_ADDRESS_GENERATION_MAX, - _IPV6_TOKEN_ADDRESS_GENERATION_INVALID = -1, + _IPV6_TOKEN_ADDRESS_GENERATION_INVALID = -EINVAL, } IPv6TokenAddressGeneration; typedef enum IPv6AcceptRAStartDHCP6Client { @@ -22,7 +22,7 @@ typedef enum IPv6AcceptRAStartDHCP6Client { IPV6_ACCEPT_RA_START_DHCP6_CLIENT_ALWAYS, IPV6_ACCEPT_RA_START_DHCP6_CLIENT_YES, _IPV6_ACCEPT_RA_START_DHCP6_CLIENT_MAX, - _IPV6_ACCEPT_RA_START_DHCP6_CLIENT_INVALID = -1, + _IPV6_ACCEPT_RA_START_DHCP6_CLIENT_INVALID = -EINVAL, } IPv6AcceptRAStartDHCP6Client; typedef struct NDiscAddress { diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index baa806fca6..288248dfa6 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -35,7 +35,7 @@ typedef enum KeepConfiguration { KEEP_CONFIGURATION_STATIC = 1 << 2, KEEP_CONFIGURATION_YES = KEEP_CONFIGURATION_DHCP | KEEP_CONFIGURATION_STATIC, _KEEP_CONFIGURATION_MAX, - _KEEP_CONFIGURATION_INVALID = -1, + _KEEP_CONFIGURATION_INVALID = -EINVAL, } KeepConfiguration; typedef enum IPv6LinkLocalAddressGenMode { @@ -44,7 +44,7 @@ typedef enum IPv6LinkLocalAddressGenMode { IPV6_LINK_LOCAL_ADDRESSS_GEN_MODE_STABLE_PRIVACY = IN6_ADDR_GEN_MODE_STABLE_PRIVACY, IPV6_LINK_LOCAL_ADDRESSS_GEN_MODE_RANDOM = IN6_ADDR_GEN_MODE_RANDOM, _IPV6_LINK_LOCAL_ADDRESS_GEN_MODE_MAX, - _IPV6_LINK_LOCAL_ADDRESS_GEN_MODE_INVALID = -1 + _IPV6_LINK_LOCAL_ADDRESS_GEN_MODE_INVALID = -EINVAL, } IPv6LinkLocalAddressGenMode; typedef enum ActivationPolicy { @@ -55,7 +55,7 @@ typedef enum ActivationPolicy { ACTIVATION_POLICY_DOWN, ACTIVATION_POLICY_BOUND, _ACTIVATION_POLICY_MAX, - _ACTIVATION_POLICY_INVALID = -1 + _ACTIVATION_POLICY_INVALID = -EINVAL, } ActivationPolicy; typedef struct Manager Manager; diff --git a/src/network/networkd-radv.h b/src/network/networkd-radv.h index 4dfbefef95..73d2f24545 100644 --- a/src/network/networkd-radv.h +++ b/src/network/networkd-radv.h @@ -23,7 +23,7 @@ typedef enum RADVPrefixDelegation { RADV_PREFIX_DELEGATION_DHCP6 = 1 << 1, RADV_PREFIX_DELEGATION_BOTH = RADV_PREFIX_DELEGATION_STATIC | RADV_PREFIX_DELEGATION_DHCP6, _RADV_PREFIX_DELEGATION_MAX, - _RADV_PREFIX_DELEGATION_INVALID = -1, + _RADV_PREFIX_DELEGATION_INVALID = -EINVAL, } RADVPrefixDelegation; typedef struct Prefix { diff --git a/src/network/networkd-sriov.h b/src/network/networkd-sriov.h index dae5ff0306..950d1f9c59 100644 --- a/src/network/networkd-sriov.h +++ b/src/network/networkd-sriov.h @@ -15,7 +15,7 @@ typedef enum SRIOVLinkState { SR_IOV_LINK_STATE_ENABLE = IFLA_VF_LINK_STATE_ENABLE, SR_IOV_LINK_STATE_DISABLE = IFLA_VF_LINK_STATE_DISABLE, _SR_IOV_LINK_STATE_MAX, - _SR_IOV_LINK_STATE_INVALID = -1, + _SR_IOV_LINK_STATE_INVALID = -EINVAL, } SRIOVLinkState; typedef struct SRIOV { diff --git a/src/network/networkd-sysctl.h b/src/network/networkd-sysctl.h index 3568900a1f..cb1db10fe8 100644 --- a/src/network/networkd-sysctl.h +++ b/src/network/networkd-sysctl.h @@ -13,7 +13,7 @@ typedef enum IPv6PrivacyExtensions { IPV6_PRIVACY_EXTENSIONS_PREFER_PUBLIC, IPV6_PRIVACY_EXTENSIONS_YES, /* aka prefer-temporary */ _IPV6_PRIVACY_EXTENSIONS_MAX, - _IPV6_PRIVACY_EXTENSIONS_INVALID = -1, + _IPV6_PRIVACY_EXTENSIONS_INVALID = -EINVAL, } IPv6PrivacyExtensions; int link_set_sysctl(Link *link); diff --git a/src/network/networkd-util.h b/src/network/networkd-util.h index 7b48046c35..cc5ee35558 100644 --- a/src/network/networkd-util.h +++ b/src/network/networkd-util.h @@ -17,7 +17,7 @@ typedef enum AddressFamily { ADDRESS_FAMILY_IPV6 = 1 << 1, ADDRESS_FAMILY_YES = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6, _ADDRESS_FAMILY_MAX, - _ADDRESS_FAMILY_INVALID = -1, + _ADDRESS_FAMILY_INVALID = -EINVAL, } AddressFamily; typedef struct NetworkConfigSection { diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h index f9a9954861..2232189f4f 100644 --- a/src/network/tc/qdisc.h +++ b/src/network/tc/qdisc.h @@ -31,7 +31,7 @@ typedef enum QDiscKind { QDISC_KIND_TBF, QDISC_KIND_TEQL, _QDISC_KIND_MAX, - _QDISC_KIND_INVALID = -1, + _QDISC_KIND_INVALID = -EINVAL, } QDiscKind; typedef struct QDisc { diff --git a/src/network/tc/tc.h b/src/network/tc/tc.h index 7fbd744142..badd5227c6 100644 --- a/src/network/tc/tc.h +++ b/src/network/tc/tc.h @@ -8,7 +8,7 @@ typedef enum TrafficControlKind { TC_KIND_TCLASS, TC_KIND_FILTER, _TC_KIND_MAX, - _TC_KIND_INVALID = -1, + _TC_KIND_INVALID = -EINVAL, } TrafficControlKind; typedef struct TrafficControl { diff --git a/src/network/tc/tclass.h b/src/network/tc/tclass.h index f02a6a734a..8e5e52c401 100644 --- a/src/network/tc/tclass.h +++ b/src/network/tc/tclass.h @@ -13,7 +13,7 @@ typedef enum TClassKind { TCLASS_KIND_HTB, TCLASS_KIND_QFQ, _TCLASS_KIND_MAX, - _TCLASS_KIND_INVALID = -1, + _TCLASS_KIND_INVALID = -EINVAL, } TClassKind; typedef struct TClass { diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c index e820a7a20f..f2d556f099 100644 --- a/src/network/wait-online/link.c +++ b/src/network/wait-online/link.c @@ -130,8 +130,7 @@ int link_update_monitor(Link *l) { s = link_operstate_from_string(operstate); if (s < 0) - ret = log_link_debug_errno(l, SYNTHETIC_ERRNO(EINVAL), - "Failed to parse operational state, ignoring: %m"); + ret = log_link_debug_errno(l, s, "Failed to parse operational state, ignoring: %m"); else l->operational_state = s; } |