Merge pull request #8025 from sourcejedi/pid1_journal_or2

[thirdparty/systemd.git] / src / resolve / resolved-llmnr.c

diff --git a/src/resolve/resolved-llmnr.c b/src/resolve/resolved-llmnr.c
index 0cf45835720d22271fe1d72ee222317adeb7a9b5..59499c9c0b8d8f1063c5e788443ab6a092fa8a38 100644 (file)
--- a/src/resolve/resolved-llmnr.c
+++ b/src/resolve/resolved-llmnr.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -99,10 +100,16 @@ static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *u
         if (r <= 0)
                 return r;
 
+        if (manager_our_packet(m, p))
+                return 0;
+
         scope = manager_find_scope(m, p);
-        if (!scope)
-                log_warning("Got LLMNR UDP packet on unknown scope. Ignoring.");
-        else if (dns_packet_validate_reply(p) > 0) {
+        if (!scope) {
+                log_debug("Got LLMNR UDP packet on unknown scope. Ignoring.");
+                return 0;
+        }
+
+        if (dns_packet_validate_reply(p) > 0) {
                 log_debug("Got LLMNR UDP reply packet for id %u", DNS_PACKET_ID(p));
 
                 dns_scope_check_conflicts(scope, p);
@@ -326,7 +333,7 @@ static int on_llmnr_stream_packet(DnsStream *s) {
 
         scope = manager_find_scope(s->manager, s->read_packet);
         if (!scope)
-                log_warning("Got LLMNR TCP packet on unknown scope. Ignoring.");
+                log_debug("Got LLMNR TCP packet on unknown scope. Ignoring.");
         else if (dns_packet_validate_query(s->read_packet) > 0) {
                 log_debug("Got LLMNR TCP query packet for id %u", DNS_PACKET_ID(s->read_packet));