sd-dns-resolver: move header to src/systemd

This also adds missing license header.

Follow-up for ee2108dcd5f62593a3081b57cc92b3535d8096fa.

diff --git a/src/libsystemd-network/ndisc-option.h b/src/libsystemd-network/ndisc-option.h
index 8517f68dfba7492902d11da3c916a84c48909e22..8a24574d4a485267ef4ca79e02e213d792a08632 100644 (file)
--- a/src/libsystemd-network/ndisc-option.h
+++ b/src/libsystemd-network/ndisc-option.h
@@ -5,6 +5,7 @@
 #include <netinet/ip6.h>
 
 #include "sd-dns-resolver.h"
+#include "sd-forward.h"
 
 #include "time-util.h"
 

diff --git a/src/systemd/meson.build b/src/systemd/meson.build
index 613806c2f9a388591d5912bfd07313440edcaaf7..c3d2c1befb71a804454d64bcebcc7e5794afa564 100644 (file)
--- a/src/systemd/meson.build
+++ b/src/systemd/meson.build
@@ -35,6 +35,7 @@ _not_installed_headers = [
         'sd-dhcp6-lease.h',
         'sd-dhcp6-option.h',
         'sd-dhcp6-protocol.h',
+        'sd-dns-resolver.h',
         'sd-ipv4acd.h',
         'sd-ipv4ll.h',
         'sd-lldp-rx.h',

diff --git a/src/libsystemd-network/sd-dns-resolver.h b/src/systemd/sd-dns-resolver.h
similarity index 68%
rename from src/libsystemd-network/sd-dns-resolver.h
rename to src/systemd/sd-dns-resolver.h
index 02f39bc90bb573aed5345776db555e597377e0e8..a1537e8a3026f2ec2f68e191abe6f2c073459082 100644 (file)
--- a/src/libsystemd-network/sd-dns-resolver.h
+++ b/src/systemd/sd-dns-resolver.h
@@ -1,16 +1,33 @@
-#ifndef SD_DNS_RESOLVER_H
-#define SD_DNS_RESOLVER_H
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#ifndef foosddnsresolverhfoo
+#define foosddnsresolverhfoo
 
-#include "_sd-common.h"
+/***
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
 
-#include "sd-forward.h"
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <https://www.gnu.org/licenses/>.
+***/
+
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
+struct in_addr;
+struct in6_addr;
+
 typedef struct sd_dns_resolver sd_dns_resolver;
 
 /* https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#alpn-protocol-ids */
-typedef enum sd_dns_alpn_flags {
+__extension__ typedef enum sd_dns_alpn_flags {
         /* There isn't really an alpn reserved for Do53 service, but designated resolvers may or may not offer
          * Do53 service, so we should probably have a flag to represent this capability. Unfortunately DNR
          * does not indicate the status to us. */
@@ -38,4 +55,4 @@ _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_dns_resolver, sd_dns_resolver_unref);
 
 _SD_END_DECLARATIONS;
 
-#endif /* SD_DNS_RESOLVER_H */
+#endif