From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 27 Nov 2020 00:04:19 +0000 (+0900)
Subject: Merge pull request #17478 from yuwata/split-network-internal
X-Git-Tag: v248-rc1~629
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d5eb02134c6420a7b929915df5a1b18ba841911;p=thirdparty%2Fsystemd.git

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

libsystemd-network: split network-internal.c
---

0d5eb02134c6420a7b929915df5a1b18ba841911
diff --cc src/libsystemd-network/dhcp-identifier.c
index ea9c77aa9da,33e5c00b06d..953fef19fa4
--- a/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/network-internal.h
index 5dae5ab306a,c4e89ade9ad..e5b853c0cd7
--- a/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/sd-network/network-util.c
index 7753431fc05,7c32a8ead1c..acf7500970e
--- a/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 8cfd894b5a6,2d05b666cb8..762b15746ff
--- a/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/test-networkd-conf.c
index 0fe81886bda,08ebf30bb90..d068a4644d5
--- a/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"