From: Yu Watanabe Date: Sun, 7 Nov 2021 20:50:16 +0000 (+0900) Subject: network/netdev: sort netdev kinds X-Git-Tag: v250-rc1~326^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F21269%2Fhead;p=thirdparty%2Fsystemd.git network/netdev: sort netdev kinds --- diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 3e9204c7a5c..b3db55f199d 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -46,81 +46,81 @@ #include "xfrm.h" const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = { - [NETDEV_KIND_BATADV] = &batadv_vtable, - [NETDEV_KIND_BRIDGE] = &bridge_vtable, - [NETDEV_KIND_BOND] = &bond_vtable, - [NETDEV_KIND_VLAN] = &vlan_vtable, - [NETDEV_KIND_MACVLAN] = &macvlan_vtable, - [NETDEV_KIND_MACVTAP] = &macvtap_vtable, - [NETDEV_KIND_IPVLAN] = &ipvlan_vtable, - [NETDEV_KIND_IPVTAP] = &ipvtap_vtable, - [NETDEV_KIND_VXLAN] = &vxlan_vtable, - [NETDEV_KIND_IPIP] = &ipip_vtable, - [NETDEV_KIND_GRE] = &gre_vtable, - [NETDEV_KIND_GRETAP] = &gretap_vtable, - [NETDEV_KIND_IP6GRE] = &ip6gre_vtable, + [NETDEV_KIND_BAREUDP] = &bare_udp_vtable, + [NETDEV_KIND_BATADV] = &batadv_vtable, + [NETDEV_KIND_BOND] = &bond_vtable, + [NETDEV_KIND_BRIDGE] = &bridge_vtable, + [NETDEV_KIND_DUMMY] = &dummy_vtable, + [NETDEV_KIND_ERSPAN] = &erspan_vtable, + [NETDEV_KIND_FOU] = &foutnl_vtable, + [NETDEV_KIND_GENEVE] = &geneve_vtable, + [NETDEV_KIND_GRE] = &gre_vtable, + [NETDEV_KIND_GRETAP] = &gretap_vtable, + [NETDEV_KIND_IFB] = &ifb_vtable, + [NETDEV_KIND_IP6GRE] = &ip6gre_vtable, [NETDEV_KIND_IP6GRETAP] = &ip6gretap_vtable, - [NETDEV_KIND_SIT] = &sit_vtable, - [NETDEV_KIND_VTI] = &vti_vtable, - [NETDEV_KIND_VTI6] = &vti6_vtable, - [NETDEV_KIND_VETH] = &veth_vtable, - [NETDEV_KIND_DUMMY] = &dummy_vtable, - [NETDEV_KIND_TUN] = &tun_vtable, - [NETDEV_KIND_TAP] = &tap_vtable, - [NETDEV_KIND_IP6TNL] = &ip6tnl_vtable, - [NETDEV_KIND_VRF] = &vrf_vtable, - [NETDEV_KIND_VCAN] = &vcan_vtable, - [NETDEV_KIND_GENEVE] = &geneve_vtable, - [NETDEV_KIND_VXCAN] = &vxcan_vtable, - [NETDEV_KIND_WIREGUARD] = &wireguard_vtable, + [NETDEV_KIND_IP6TNL] = &ip6tnl_vtable, + [NETDEV_KIND_IPIP] = &ipip_vtable, + [NETDEV_KIND_IPVLAN] = &ipvlan_vtable, + [NETDEV_KIND_IPVTAP] = &ipvtap_vtable, + [NETDEV_KIND_L2TP] = &l2tptnl_vtable, + [NETDEV_KIND_MACSEC] = &macsec_vtable, + [NETDEV_KIND_MACVLAN] = &macvlan_vtable, + [NETDEV_KIND_MACVTAP] = &macvtap_vtable, [NETDEV_KIND_NETDEVSIM] = &netdevsim_vtable, - [NETDEV_KIND_FOU] = &foutnl_vtable, - [NETDEV_KIND_ERSPAN] = &erspan_vtable, - [NETDEV_KIND_L2TP] = &l2tptnl_vtable, - [NETDEV_KIND_MACSEC] = &macsec_vtable, - [NETDEV_KIND_NLMON] = &nlmon_vtable, - [NETDEV_KIND_XFRM] = &xfrm_vtable, - [NETDEV_KIND_IFB] = &ifb_vtable, - [NETDEV_KIND_BAREUDP] = &bare_udp_vtable, + [NETDEV_KIND_NLMON] = &nlmon_vtable, + [NETDEV_KIND_SIT] = &sit_vtable, + [NETDEV_KIND_TAP] = &tap_vtable, + [NETDEV_KIND_TUN] = &tun_vtable, + [NETDEV_KIND_VCAN] = &vcan_vtable, + [NETDEV_KIND_VETH] = &veth_vtable, + [NETDEV_KIND_VLAN] = &vlan_vtable, + [NETDEV_KIND_VRF] = &vrf_vtable, + [NETDEV_KIND_VTI6] = &vti6_vtable, + [NETDEV_KIND_VTI] = &vti_vtable, + [NETDEV_KIND_VXCAN] = &vxcan_vtable, + [NETDEV_KIND_VXLAN] = &vxlan_vtable, + [NETDEV_KIND_WIREGUARD] = &wireguard_vtable, + [NETDEV_KIND_XFRM] = &xfrm_vtable, }; static const char* const netdev_kind_table[_NETDEV_KIND_MAX] = { - [NETDEV_KIND_BAREUDP] = "bareudp", - [NETDEV_KIND_BATADV] = "batadv", - [NETDEV_KIND_BRIDGE] = "bridge", - [NETDEV_KIND_BOND] = "bond", - [NETDEV_KIND_VLAN] = "vlan", - [NETDEV_KIND_MACVLAN] = "macvlan", - [NETDEV_KIND_MACVTAP] = "macvtap", - [NETDEV_KIND_IPVLAN] = "ipvlan", - [NETDEV_KIND_IPVTAP] = "ipvtap", - [NETDEV_KIND_VXLAN] = "vxlan", - [NETDEV_KIND_IPIP] = "ipip", - [NETDEV_KIND_GRE] = "gre", - [NETDEV_KIND_GRETAP] = "gretap", - [NETDEV_KIND_IP6GRE] = "ip6gre", + [NETDEV_KIND_BAREUDP] = "bareudp", + [NETDEV_KIND_BATADV] = "batadv", + [NETDEV_KIND_BOND] = "bond", + [NETDEV_KIND_BRIDGE] = "bridge", + [NETDEV_KIND_DUMMY] = "dummy", + [NETDEV_KIND_ERSPAN] = "erspan", + [NETDEV_KIND_FOU] = "fou", + [NETDEV_KIND_GENEVE] = "geneve", + [NETDEV_KIND_GRE] = "gre", + [NETDEV_KIND_GRETAP] = "gretap", + [NETDEV_KIND_IFB] = "ifb", + [NETDEV_KIND_IP6GRE] = "ip6gre", [NETDEV_KIND_IP6GRETAP] = "ip6gretap", - [NETDEV_KIND_SIT] = "sit", - [NETDEV_KIND_VETH] = "veth", - [NETDEV_KIND_VTI] = "vti", - [NETDEV_KIND_VTI6] = "vti6", - [NETDEV_KIND_DUMMY] = "dummy", - [NETDEV_KIND_TUN] = "tun", - [NETDEV_KIND_TAP] = "tap", - [NETDEV_KIND_IP6TNL] = "ip6tnl", - [NETDEV_KIND_VRF] = "vrf", - [NETDEV_KIND_VCAN] = "vcan", - [NETDEV_KIND_GENEVE] = "geneve", - [NETDEV_KIND_VXCAN] = "vxcan", - [NETDEV_KIND_WIREGUARD] = "wireguard", + [NETDEV_KIND_IP6TNL] = "ip6tnl", + [NETDEV_KIND_IPIP] = "ipip", + [NETDEV_KIND_IPVLAN] = "ipvlan", + [NETDEV_KIND_IPVTAP] = "ipvtap", + [NETDEV_KIND_L2TP] = "l2tp", + [NETDEV_KIND_MACSEC] = "macsec", + [NETDEV_KIND_MACVLAN] = "macvlan", + [NETDEV_KIND_MACVTAP] = "macvtap", [NETDEV_KIND_NETDEVSIM] = "netdevsim", - [NETDEV_KIND_FOU] = "fou", - [NETDEV_KIND_ERSPAN] = "erspan", - [NETDEV_KIND_L2TP] = "l2tp", - [NETDEV_KIND_MACSEC] = "macsec", - [NETDEV_KIND_NLMON] = "nlmon", - [NETDEV_KIND_XFRM] = "xfrm", - [NETDEV_KIND_IFB] = "ifb", + [NETDEV_KIND_NLMON] = "nlmon", + [NETDEV_KIND_SIT] = "sit", + [NETDEV_KIND_TAP] = "tap", + [NETDEV_KIND_TUN] = "tun", + [NETDEV_KIND_VCAN] = "vcan", + [NETDEV_KIND_VETH] = "veth", + [NETDEV_KIND_VLAN] = "vlan", + [NETDEV_KIND_VRF] = "vrf", + [NETDEV_KIND_VTI6] = "vti6", + [NETDEV_KIND_VTI] = "vti", + [NETDEV_KIND_VXCAN] = "vxcan", + [NETDEV_KIND_VXLAN] = "vxlan", + [NETDEV_KIND_WIREGUARD] = "wireguard", + [NETDEV_KIND_XFRM] = "xfrm", }; DEFINE_STRING_TABLE_LOOKUP(netdev_kind, NetDevKind); diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 76042d9462f..10dff0177fa 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -23,15 +23,15 @@ "-L2TP\0" \ "-L2TPSession\0" \ "-MACsec\0" \ + "-MACsecReceiveAssociation\0" \ "-MACsecReceiveChannel\0" \ "-MACsecTransmitAssociation\0" \ - "-MACsecReceiveAssociation\0" \ - "-MACVTAP\0" \ "-MACVLAN\0" \ - "-Tunnel\0" \ - "-Tun\0" \ - "-Tap\0" \ + "-MACVTAP\0" \ "-Peer\0" \ + "-Tap\0" \ + "-Tun\0" \ + "-Tunnel\0" \ "-VLAN\0" \ "-VRF\0" \ "-VXCAN\0" \ @@ -41,42 +41,42 @@ "-Xfrm\0" typedef enum NetDevKind { - NETDEV_KIND_BRIDGE, + NETDEV_KIND_BAREUDP, + NETDEV_KIND_BATADV, NETDEV_KIND_BOND, - NETDEV_KIND_VLAN, - NETDEV_KIND_MACVLAN, - NETDEV_KIND_MACVTAP, - NETDEV_KIND_IPVLAN, - NETDEV_KIND_IPVTAP, - NETDEV_KIND_VXLAN, - NETDEV_KIND_IPIP, + NETDEV_KIND_BRIDGE, + NETDEV_KIND_DUMMY, + NETDEV_KIND_ERSPAN, + NETDEV_KIND_FOU, + NETDEV_KIND_GENEVE, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP, + NETDEV_KIND_IFB, NETDEV_KIND_IP6GRE, NETDEV_KIND_IP6GRETAP, + NETDEV_KIND_IP6TNL, + NETDEV_KIND_IPIP, + NETDEV_KIND_IPVLAN, + NETDEV_KIND_IPVTAP, + NETDEV_KIND_L2TP, + NETDEV_KIND_MACSEC, + NETDEV_KIND_MACVLAN, + NETDEV_KIND_MACVTAP, + NETDEV_KIND_NETDEVSIM, + NETDEV_KIND_NLMON, NETDEV_KIND_SIT, + NETDEV_KIND_TAP, + NETDEV_KIND_TUN, + NETDEV_KIND_VCAN, NETDEV_KIND_VETH, + NETDEV_KIND_VLAN, + NETDEV_KIND_VRF, NETDEV_KIND_VTI, NETDEV_KIND_VTI6, - NETDEV_KIND_IP6TNL, - NETDEV_KIND_DUMMY, - NETDEV_KIND_TUN, - NETDEV_KIND_TAP, - NETDEV_KIND_VRF, - NETDEV_KIND_VCAN, - NETDEV_KIND_GENEVE, NETDEV_KIND_VXCAN, + NETDEV_KIND_VXLAN, NETDEV_KIND_WIREGUARD, - NETDEV_KIND_NETDEVSIM, - NETDEV_KIND_FOU, - NETDEV_KIND_ERSPAN, - NETDEV_KIND_L2TP, - NETDEV_KIND_MACSEC, - NETDEV_KIND_NLMON, NETDEV_KIND_XFRM, - NETDEV_KIND_IFB, - NETDEV_KIND_BAREUDP, - NETDEV_KIND_BATADV, _NETDEV_KIND_MAX, _NETDEV_KIND_TUNNEL, /* Used by config_parse_stacked_netdev() */ _NETDEV_KIND_INVALID = -EINVAL, diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 1c00b986603..52791f80153 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -77,16 +77,16 @@ static int network_resolve_netdev_one(Network *network, const char *name, NetDev if (netdev->kind != kind && !(kind == _NETDEV_KIND_TUNNEL && IN_SET(netdev->kind, - NETDEV_KIND_IPIP, - NETDEV_KIND_SIT, + NETDEV_KIND_ERSPAN, NETDEV_KIND_GRE, NETDEV_KIND_GRETAP, NETDEV_KIND_IP6GRE, NETDEV_KIND_IP6GRETAP, - NETDEV_KIND_VTI, - NETDEV_KIND_VTI6, NETDEV_KIND_IP6TNL, - NETDEV_KIND_ERSPAN))) + NETDEV_KIND_IPIP, + NETDEV_KIND_SIT, + NETDEV_KIND_VTI, + NETDEV_KIND_VTI6))) return log_warning_errno(SYNTHETIC_ERRNO(EINVAL), "%s: NetDev %s is not a %s, ignoring assignment", network->filename, name, kind_string); @@ -823,10 +823,16 @@ int config_parse_stacked_netdev( assert(rvalue); assert(data); assert(IN_SET(kind, - NETDEV_KIND_VLAN, NETDEV_KIND_MACVLAN, NETDEV_KIND_MACVTAP, - NETDEV_KIND_IPVLAN, NETDEV_KIND_IPVTAP, NETDEV_KIND_VXLAN, - NETDEV_KIND_L2TP, NETDEV_KIND_MACSEC, _NETDEV_KIND_TUNNEL, - NETDEV_KIND_XFRM)); + NETDEV_KIND_IPVLAN, + NETDEV_KIND_IPVTAP, + NETDEV_KIND_L2TP, + NETDEV_KIND_MACSEC, + NETDEV_KIND_MACVLAN, + NETDEV_KIND_MACVTAP, + NETDEV_KIND_VLAN, + NETDEV_KIND_VXLAN, + NETDEV_KIND_XFRM, + _NETDEV_KIND_TUNNEL)); if (!ifname_valid(rvalue)) { log_syntax(unit, LOG_WARNING, filename, line, 0,