From: Yu Watanabe Date: Mon, 16 Aug 2021 03:41:34 +0000 (+0900) Subject: network: rebreak conf parser arguments X-Git-Tag: v250-rc1~824^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=634815762d837e25ed4640cb8a12fa742a13d9ac;p=thirdparty%2Fsystemd.git network: rebreak conf parser arguments --- diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c index b0baa53edcd..1bffbc95865 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -164,16 +164,18 @@ static int netdev_geneve_create(NetDev *netdev) { return r; } -int config_parse_geneve_vni(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_geneve_vni( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Geneve *v = userdata; uint32_t f; int r; @@ -199,16 +201,18 @@ int config_parse_geneve_vni(const char *unit, return 0; } -int config_parse_geneve_address(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_geneve_address( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Geneve *v = userdata; union in_addr_union *addr = data, buffer; int r, f; @@ -236,16 +240,18 @@ int config_parse_geneve_address(const char *unit, return 0; } -int config_parse_geneve_flow_label(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_geneve_flow_label( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Geneve *v = userdata; uint32_t f; int r; @@ -272,16 +278,18 @@ int config_parse_geneve_flow_label(const char *unit, return 0; } -int config_parse_geneve_ttl(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_geneve_ttl( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Geneve *v = userdata; unsigned f; int r; diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index f27a1e43351..cae2ef1a909 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -501,16 +501,18 @@ static int netdev_tunnel_verify(NetDev *netdev, const char *filename) { return 0; } -int config_parse_tunnel_address(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_tunnel_address( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Tunnel *t = userdata; union in_addr_union *addr = data, buffer; int r, f; @@ -555,16 +557,18 @@ int config_parse_tunnel_address(const char *unit, return 0; } -int config_parse_tunnel_key(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_tunnel_key( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + union in_addr_union buffer; Tunnel *t = userdata; uint32_t k; @@ -596,16 +600,18 @@ int config_parse_tunnel_key(const char *unit, return 0; } -int config_parse_ipv6_flowlabel(const char* unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_ipv6_flowlabel( + const char* unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + IPv6FlowLabel *ipv6_flowlabel = data; Tunnel *t = userdata; int k = 0; @@ -635,16 +641,18 @@ int config_parse_ipv6_flowlabel(const char* unit, return 0; } -int config_parse_encap_limit(const char* unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_encap_limit( + const char* unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Tunnel *t = userdata; int k = 0; int r; @@ -673,26 +681,27 @@ int config_parse_encap_limit(const char* unit, return 0; } -int config_parse_6rd_prefix(const char* unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_6rd_prefix( + const char* unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + Tunnel *t = userdata; + union in_addr_union p; + uint8_t l; + int r; assert(filename); assert(lvalue); assert(rvalue); - union in_addr_union p; - uint8_t l; - int r; - r = in_addr_prefix_from_string(rvalue, AF_INET6, &p, &l); if (r < 0) { log_syntax(unit, LOG_WARNING, filename, line, r, "Failed to parse 6rd prefix \"%s\", ignoring: %m", rvalue); diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c index 52d8b3736cc..6829017f808 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c @@ -174,16 +174,18 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli return r; } -int config_parse_vxlan_address(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_vxlan_address( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + VxLan *v = userdata; union in_addr_union *addr = data, buffer; int r, f; @@ -225,16 +227,18 @@ int config_parse_vxlan_address(const char *unit, return 0; } -int config_parse_port_range(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_port_range( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + VxLan *v = userdata; uint16_t low, high; int r; @@ -257,16 +261,18 @@ int config_parse_port_range(const char *unit, return 0; } -int config_parse_flow_label(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_flow_label( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + VxLan *v = userdata; unsigned f; int r; @@ -293,16 +299,18 @@ int config_parse_flow_label(const char *unit, return 0; } -int config_parse_vxlan_ttl(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_vxlan_ttl( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + VxLan *v = userdata; unsigned f; int r; diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c index 2b201e271ee..19c888287c5 100644 --- a/src/network/networkd-dhcp-common.c +++ b/src/network/networkd-dhcp-common.c @@ -460,16 +460,17 @@ int config_parse_section_route_table( return 0; } -int config_parse_iaid(const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { +int config_parse_iaid( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { Network *network = userdata; uint32_t iaid; diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 12fb85bf902..0d0097f0d03 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -1838,7 +1838,8 @@ int config_parse_dhcp_ip_service_type( return 0; } -int config_parse_dhcp_fallback_lease_lifetime(const char *unit, +int config_parse_dhcp_fallback_lease_lifetime( + const char *unit, const char *filename, unsigned line, const char *section, @@ -1848,6 +1849,7 @@ int config_parse_dhcp_fallback_lease_lifetime(const char *unit, const char *rvalue, void *data, void *userdata) { + Network *network = userdata; uint32_t k; diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index f16553a6d9d..0f4b00992fb 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -719,7 +719,8 @@ bool network_has_static_ipv6_configurations(Network *network) { return false; } -int config_parse_stacked_netdev(const char *unit, +int config_parse_stacked_netdev( + const char *unit, const char *filename, unsigned line, const char *section, @@ -729,6 +730,7 @@ int config_parse_stacked_netdev(const char *unit, const char *rvalue, void *data, void *userdata) { + _cleanup_free_ char *name = NULL; NetDevKind kind = ltype; Hashmap **h = data;