From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 20 Oct 2023 15:26:38 +0000 (+0900)
Subject: dhcp: split out dhcp-network.h from dhcp-internal.h
X-Git-Tag: v255-rc1~173^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bcbb61458af5a257ddfc36d0f8d01e1ba1bb213;p=thirdparty%2Fsystemd.git

dhcp: split out dhcp-network.h from dhcp-internal.h
---

diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h
index b027b6faf05..2972a808f9e 100644
--- a/src/libsystemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/dhcp-internal.h
@@ -5,17 +5,13 @@
   Copyright © 2013 Intel Corporation. All rights reserved.
 ***/
 
-#include <linux/if_packet.h>
-#include <net/ethernet.h>
 #include <stdint.h>
 
 #include "sd-dhcp-client.h"
 
 #include "dhcp-client-internal.h"
 #include "dhcp-protocol.h"
-#include "ether-addr-util.h"
 #include "network-common.h"
-#include "socket-util.h"
 
 typedef struct sd_dhcp_option {
         unsigned n_ref;
@@ -32,22 +28,6 @@ typedef struct DHCPServerData {
 
 typedef struct sd_dhcp_client sd_dhcp_client;
 
-int dhcp_network_bind_raw_socket(
-                int ifindex,
-                union sockaddr_union *link,
-                uint32_t xid,
-                const struct hw_addr_data *hw_addr,
-                const struct hw_addr_data *bcast_addr,
-                uint16_t arp_type,
-                uint16_t port,
-                bool so_priority_set,
-                int so_priority);
-int dhcp_network_bind_udp_socket(int ifindex, be32_t address, uint16_t port, int ip_service_type);
-int dhcp_network_send_raw_socket(int s, const union sockaddr_union *link,
-                                 const void *packet, size_t len);
-int dhcp_network_send_udp_socket(int s, be32_t address, uint16_t port,
-                                 const void *packet, size_t len);
-
 int dhcp_option_append(DHCPMessage *message, size_t size, size_t *offset, uint8_t overload,
                        uint8_t code, size_t optlen, const void *optval);
 int dhcp_option_find_option(uint8_t *options, size_t length, uint8_t wanted_code, size_t *ret_offset);
diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index 9137efa3ee1..3d3809c96b3 100644
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -13,9 +13,9 @@
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
 
-#include "dhcp-internal.h"
+#include "dhcp-network.h"
+#include "dhcp-protocol.h"
 #include "fd-util.h"
-#include "socket-util.h"
 #include "unaligned.h"
 
 static int _bind_raw_socket(
diff --git a/src/libsystemd-network/dhcp-network.h b/src/libsystemd-network/dhcp-network.h
new file mode 100644
index 00000000000..eb9dab44533
--- /dev/null
+++ b/src/libsystemd-network/dhcp-network.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "ether-addr-util.h"
+#include "socket-util.h"
+
+int dhcp_network_bind_raw_socket(
+                int ifindex,
+                union sockaddr_union *link,
+                uint32_t xid,
+                const struct hw_addr_data *hw_addr,
+                const struct hw_addr_data *bcast_addr,
+                uint16_t arp_type,
+                uint16_t port,
+                bool so_priority_set,
+                int so_priority);
+int dhcp_network_bind_udp_socket(
+                int ifindex,
+                be32_t address,
+                uint16_t port,
+                int ip_service_type);
+int dhcp_network_send_raw_socket(
+                int s,
+                const union sockaddr_union *link,
+                const void *packet,
+                size_t len);
+int dhcp_network_send_udp_socket(
+                int s,
+                be32_t address,
+                uint16_t port,
+                const void *packet,
+                size_t len);
diff --git a/src/libsystemd-network/fuzz-dhcp-client.c b/src/libsystemd-network/fuzz-dhcp-client.c
index 18f9f3dffe7..3e98b683eca 100644
--- a/src/libsystemd-network/fuzz-dhcp-client.c
+++ b/src/libsystemd-network/fuzz-dhcp-client.c
@@ -7,6 +7,7 @@
 #include "sd-dhcp-client.c"
 
 #include "alloc-util.h"
+#include "dhcp-network.h"
 #include "fuzz.h"
 
 int dhcp_network_bind_raw_socket(
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index cd32a7247a5..c8aa021ee06 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -10,6 +10,7 @@
 #include "dhcp-lease-internal.h"
 #include "extract-word.h"
 #include "hexdecoct.h"
+#include "in-addr-util.h"
 #include "log.h"
 #include "network-internal.h"
 #include "parse-util.h"
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 011b173e88d..dc61470afc9 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -18,6 +18,7 @@
 #include "dhcp-identifier.h"
 #include "dhcp-internal.h"
 #include "dhcp-lease-internal.h"
+#include "dhcp-network.h"
 #include "dhcp-protocol.h"
 #include "dns-domain.h"
 #include "ether-addr-util.h"
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 22a03203a8a..814021a2caf 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "dhcp-internal.h"
+#include "dhcp-network.h"
 #include "dhcp-server-internal.h"
 #include "dns-domain.h"
 #include "fd-util.h"
diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 912d4493f54..f8baf2d46d9 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -19,6 +19,7 @@
 #include "alloc-util.h"
 #include "dhcp-identifier.h"
 #include "dhcp-internal.h"
+#include "dhcp-network.h"
 #include "dhcp-protocol.h"
 #include "ether-addr-util.h"
 #include "fd-util.h"