From 6d76b5d7f0eafd814bbc2b073f1b0a1f317c7748 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Nov 2020 14:51:55 +0100
Subject: [PATCH 1/2] resolved: move mdns event sources close to the fds

---
 src/resolve/resolved-manager.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index 10c2994c2b..396f72c4bc 100644
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -97,13 +97,12 @@ struct Manager {
         /* mDNS */
         int mdns_ipv4_fd;
         int mdns_ipv6_fd;
+        sd_event_source *mdns_ipv4_event_source;
+        sd_event_source *mdns_ipv6_event_source;
 
         /* DNS-SD */
         Hashmap *dnssd_services;
 
-        sd_event_source *mdns_ipv4_event_source;
-        sd_event_source *mdns_ipv6_event_source;
-
         /* dbus */
         sd_bus *bus;
 

From 7130db9155ffd805b050afd3b69b4edb14308df5 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Nov 2020 17:30:32 +0100
Subject: [PATCH 2/2] resolved: allow DNS_PACKET_DATA() argument to be const

---
 src/resolve/resolved-dns-packet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 815999ecc2..9fe278264b 100644
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -82,7 +82,7 @@ struct DnsPacket {
         bool canonical_form:1;
 };
 
-static inline uint8_t* DNS_PACKET_DATA(DnsPacket *p) {
+static inline uint8_t* DNS_PACKET_DATA(const DnsPacket *p) {
         if (_unlikely_(!p))
                 return NULL;