Merge pull request #17478 from yuwata/split-network-internal

libsystemd-network: split network-internal.c

diff --cc meson.build
Simple merge

diff --cc src/fuzz/meson.build
Simple merge

diff --cc src/libsystemd-network/dhcp-identifier.c
index ea9c77aa9da43046e2ddd46b9bd5ed2f94063c90,33e5c00b06da39c4ea58b44987fb2ecc1cab2d3d..953fef19fa407582c3b8ab037a06561aed3fe14b
--- 1/src/libsystemd-network/dhcp-identifier.c
--- 2/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@@ -1,6 -1,7 +1,7 @@@
 -/* SPDX-License-Identifier: LGPL-2.1+ */
 +/* SPDX-License-Identifier: LGPL-2.1-or-later */
  
  #include <linux/if_infiniband.h>
+ #include <net/ethernet.h>
  #include <net/if_arp.h>
  
  #include "sd-device.h"

diff --cc src/libsystemd-network/meson.build
Simple merge

diff --cc src/libsystemd-network/network-internal.c
Simple merge

diff --cc src/libsystemd-network/network-internal.h
index 5dae5ab306afefe50bd4bcfbe2454343efd1ed4b,c4e89ade9ad37f5d151d60966f11127d3350a7eb..e5b853c0cd7acec6a8924e79dedc9353b75ed34b
--- 1/src/libsystemd-network/network-internal.h
--- 2/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@@ -1,53 -1,11 +1,11 @@@
 -/* SPDX-License-Identifier: LGPL-2.1+ */
 +/* SPDX-License-Identifier: LGPL-2.1-or-later */
  #pragma once
  
- #include <linux/nl80211.h>
  #include <stdbool.h>
+ #include <stdio.h>
  
- #include "sd-device.h"
  #include "sd-dhcp-lease.h"
  
- #include "conf-parser.h"
- #include "set.h"
- #include "strv.h"
- 
- #define LINK_BRIDGE_PORT_PRIORITY_INVALID 128
- #define LINK_BRIDGE_PORT_PRIORITY_MAX 63
- 
- char *link_get_type_string(unsigned short iftype, sd_device *device);
- bool net_match_config(Set *match_mac,
-                       Set *match_permanent_mac,
-                       char * const *match_paths,
-                       char * const *match_drivers,
-                       char * const *match_iftypes,
-                       char * const *match_names,
-                       char * const *match_property,
-                       char * const *match_wifi_iftype,
-                       char * const *match_ssid,
-                       Set *match_bssid,
-                       sd_device *device,
-                       const struct ether_addr *dev_mac,
-                       const struct ether_addr *dev_permanent_mac,
-                       const char *dev_driver,
-                       unsigned short dev_iftype,
-                       const char *dev_name,
-                       char * const *alternative_names,
-                       enum nl80211_iftype dev_wifi_iftype,
-                       const char *dev_ssid,
-                       const struct ether_addr *dev_bssid);
- 
- CONFIG_PARSER_PROTOTYPE(config_parse_net_condition);
- CONFIG_PARSER_PROTOTYPE(config_parse_hwaddr);
- CONFIG_PARSER_PROTOTYPE(config_parse_hwaddrs);
- CONFIG_PARSER_PROTOTYPE(config_parse_match_strv);
- CONFIG_PARSER_PROTOTYPE(config_parse_match_ifnames);
- CONFIG_PARSER_PROTOTYPE(config_parse_match_property);
- CONFIG_PARSER_PROTOTYPE(config_parse_ifalias);
- CONFIG_PARSER_PROTOTYPE(config_parse_bridge_port_priority);
- 
- int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_t *result);
- const char *net_get_name_persistent(sd_device *device);
- 
  size_t serialize_in_addrs(FILE *f,
                            const struct in_addr *addresses,
                            size_t size,

diff --cc src/libsystemd-network/sd-dhcp6-client.c
Simple merge

diff --cc src/libsystemd/sd-network/network-util.c
index 7753431fc0523e5b9cc5c3d3892627232f1d1a2c,7c32a8ead1c1080f5a104a61787c9ec2f11197a1..acf7500970e382e619a9f4772ee19231920581c8
--- 1/src/libsystemd/sd-network/network-util.c
--- 2/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@@ -1,8 -1,14 +1,14 @@@
 -/* SPDX-License-Identifier: LGPL-2.1+ */
 +/* SPDX-License-Identifier: LGPL-2.1-or-later */
  
+ #include "sd-id128.h"
+ 
  #include "alloc-util.h"
+ #include "arphrd-list.h"
+ #include "device-util.h"
  #include "fd-util.h"
  #include "network-util.h"
+ #include "siphash24.h"
+ #include "sparse-endian.h"
  #include "string-table.h"
  #include "strv.h"
  

diff --cc src/libsystemd/sd-network/network-util.h
index 8cfd894b5a620292e99e09dbb678a5b618243cde,2d05b666cb8b1cd81e5a44bee23b3fe539489f35..762b15746ff4556f0f7b169a3a23cf686ab719a2
--- 1/src/libsystemd/sd-network/network-util.h
--- 2/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@@ -1,6 -1,10 +1,10 @@@
 -/* SPDX-License-Identifier: LGPL-2.1+ */
 +/* SPDX-License-Identifier: LGPL-2.1-or-later */
  #pragma once
  
+ #include <inttypes.h>
+ #include <stdbool.h>
+ 
+ #include "sd-device.h"
  #include "sd-network.h"
  
  #include "macro.h"

diff --cc src/network/meson.build
Simple merge

diff --cc src/network/netdev/bridge.c
Simple merge

diff --cc src/network/netdev/bridge.h
Simple merge

diff --cc src/network/netdev/macsec.c
Simple merge

diff --cc src/network/netdev/netdev.c
Simple merge

diff --cc src/network/networkctl.c
Simple merge

diff --cc src/network/networkd-dhcp4.c
Simple merge

diff --cc src/network/networkd-dhcp6.c
Simple merge

diff --cc src/network/networkd-network-bus.c
Simple merge

diff --cc src/network/networkd-network.c
Simple merge

diff --cc src/network/networkd-network.h
Simple merge

diff --cc src/network/test-networkd-conf.c
index 0fe81886bda1d5ea642773a09d216b7b116c3010,08ebf30bb90e018ca92444e52332632e7e6b2cd1..d068a4644d5e4398f4df27f0849b62130ffec1e4
--- 1/src/network/test-networkd-conf.c
--- 2/src/network/test-networkd-conf.c
+++ b/src/network/test-networkd-conf.c
@@@ -1,6 -1,5 +1,5 @@@
 -/* SPDX-License-Identifier: LGPL-2.1+ */
 +/* SPDX-License-Identifier: LGPL-2.1-or-later */
  
- #include "ether-addr-util.h"
  #include "hexdecoct.h"
  #include "log.h"
  #include "macro.h"

diff --cc src/network/wait-online/manager.c
Simple merge

diff --cc src/resolve/resolved-manager.c
Simple merge

diff --cc src/shared/conf-parser.c
Simple merge

diff --cc src/shared/conf-parser.h
Simple merge

diff --cc src/shared/meson.build
Simple merge

diff --cc src/test/meson.build
Simple merge

diff --cc src/udev/meson.build
Simple merge

diff --cc src/udev/net/link-config.c
Simple merge

diff --cc src/udev/net/link-config.h
Simple merge