picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7551 from poettering/resolved-unknown-scope 

downgrade resolved log messages about incoming packets from unknown scopes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-12-06 23:30:51 +01:00 committed by GitHub
parent 4dbb344fce 6cae1ebe19
commit a6300ead67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/resolve/resolved-llmnr.c
View File

@ -100,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);
@ -327,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));

2
src/resolve/resolved-mdns.c
View File

@ -121,7 +121,7 @@ static int on_mdns_packet(sd_event_source *s, int fd, uint32_t revents, void *us
scope = manager_find_scope(m, p);
if (!scope) {
log_warning("Got mDNS UDP packet on unknown scope. Ignoring.");
log_debug("Got mDNS UDP packet on unknown scope. Ignoring.");
return 0;
}